688N/A###############################################################################
1064N/A# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
688N/A#
688N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
688N/A#
688N/A
1370N/Adiff --git a/nls/iso8859-1/Compose.pre b/nls/iso8859-1/Compose.pre
1370N/Aindex c726ecf..da43183 100644
1370N/A--- a/nls/iso8859-1/Compose.pre
1370N/A+++ b/nls/iso8859-1/Compose.pre
1064N/A@@ -11,6 +11,7 @@ XCOMM Special Character
688N/A <Multi_key> <apostrophe> <space> : "'" apostrophe
688N/A <Multi_key> <space> <apostrophe> : "'" apostrophe
688N/A <Multi_key> <A> <T> : "@" at
688N/A+<Multi_key> <A> <A> : "@" at
688N/A <Multi_key> <parenleft> <parenleft> : "[" bracketleft
688N/A <Multi_key> <slash> <slash> : "\\" backslash
688N/A <Multi_key> <slash> <less> : "\\" backslash
1064N/A@@ -193,7 +194,8 @@ XCOMM Accented Alphabet
688N/A <Multi_key> <diaeresis> <A> : "\304" Adiaeresis
688N/A <Multi_key> <A> <asterisk> : "\305" Aring
688N/A <Multi_key> <asterisk> <A> : "\305" Aring
688N/A-<Multi_key> <A> <A> : "\305" Aring
688N/A+XCOMM Conflicts with <A> <A> -> "@" above
688N/A+XCOMM <Multi_key> <A> <A> : "\305" Aring
688N/A <Multi_key> <A> <O> : "\305" Aring
688N/A <Multi_key> <A> <E> : "\306" AE
688N/A <Multi_key> <a> <grave> : "\340" agrave
1064N/A@@ -394,7 +396,7 @@ XCOMM Special Character
688N/A XCOMM These are for us_intl, that does not have diaeresis, etc
688N/A <dead_acute> <space> : "'" apostrophe
688N/A <dead_acute> <dead_acute> : "\264" acute
688N/A-<dead_diaeresis> <space> : "\"" quotedbl
688N/A+<dead_diaeresis> <space> : "\250" diaeresis
688N/A <dead_diaeresis> <dead_diaeresis> : "\250" diaeresis
688N/A <dead_doubleacute> <space> : "\"" quotedbl
688N/A <dead_abovering> <space> : "\260" degree
1064N/A@@ -471,7 +473,6 @@ XCOMM Useful for portuguese language
688N/A <dead_acute> <C> : "\307" Ccedilla
688N/A <dead_acute> <c> : "\347" ccedilla
688N/A XCOMM
688N/A-#ifdef USE_CTRL_SHIFT_T_SEQS
688N/A XCOMM Ctrl<T> Means <Compose>
688N/A XCOMM Special Character
688N/A Ctrl<T> <plus> <plus> : "#" numbersign
1370N/A@@ -658,7 +659,6 @@ Ctrl<T> <A> <diaeresis> : "\304" Adiaeresis
688N/A Ctrl<T> <diaeresis> <A> : "\304" Adiaeresis
688N/A Ctrl<T> <A> <asterisk> : "\305" Aring
688N/A Ctrl<T> <asterisk> <A> : "\305" Aring
688N/A-Ctrl<T> <A> <A> : "\305" Aring
688N/A Ctrl<T> <A> <O> : "\305" Aring
688N/A Ctrl<T> <A> <E> : "\306" AE
688N/A Ctrl<T> <a> <grave> : "\340" agrave
1370N/A@@ -839,5 +839,70 @@ Ctrl<T> <y> <quotedbl> : "\377" ydiaeresis
688N/A Ctrl<T> <quotedbl> <y> : "\377" ydiaeresis
688N/A Ctrl<T> <y> <diaeresis> : "\377" ydiaeresis
688N/A Ctrl<T> <diaeresis> <y> : "\377" ydiaeresis
688N/A-#endif /* USE_CTRL_SHIFT_T_SEQS */
688N/A XCOMM End of Sequence Definition
688N/A+XCOMM Corrected dead key accent keysyms for Danish
688N/A+<SunFA_Acute> <A> : "\301" Aacute
688N/A+<SunFA_Acute> <E> : "\311" Eacute
688N/A+<SunFA_Acute> <I> : "\315" Iacute
688N/A+<SunFA_Acute> <O> : "\323" Oacute
688N/A+<SunFA_Acute> <U> : "\332" Uacute
688N/A+<SunFA_Acute> <Y> : "\335" Yacute
688N/A+<SunFA_Acute> <a> : "\341" aacute
688N/A+<SunFA_Acute> <apostrophe> : "\264" acute
688N/A+<SunFA_Acute> <e> : "\351" eacute
688N/A+<SunFA_Acute> <i> : "\355" iacute
688N/A+<SunFA_Acute> <o> : "\363" oacute
688N/A+<SunFA_Acute> <space> : "'" apostrophe
688N/A+<SunFA_Acute> <u> : "\372" uacute
688N/A+<SunFA_Acute> <y> : "\375" yacute
688N/A+<SunFA_Circum> <slash> : "|" bar
688N/A+<SunFA_Circum> <0> : "\260" degree
688N/A+<SunFA_Circum> <1> : "\271" onesuperior
688N/A+<SunFA_Circum> <2> : "\262" twosuperior
688N/A+<SunFA_Circum> <3> : "\263" threesuperior
688N/A+<SunFA_Circum> <A> : "\302" Acircumflex
688N/A+<SunFA_Circum> <E> : "\312" Ecircumflex
688N/A+<SunFA_Circum> <I> : "\316" Icircumflex
688N/A+<SunFA_Circum> <O> : "\324" Ocircumflex
688N/A+<SunFA_Circum> <U> : "\333" Ucircumflex
688N/A+<SunFA_Circum> <a> : "\342" acircumflex
688N/A+<SunFA_Circum> <e> : "\352" ecircumflex
688N/A+<SunFA_Circum> <exclam> : "\246" brokenbar
688N/A+<SunFA_Circum> <i> : "\356" icircumflex
688N/A+<SunFA_Circum> <minus> : "\257" macron
688N/A+<SunFA_Circum> <o> : "\364" ocircumflex
688N/A+<SunFA_Circum> <period> : "\267" periodcentered
688N/A+<SunFA_Circum> <space> : "^" asciicircum
688N/A+<SunFA_Circum> <u> : "\373" ucircumflex
688N/A+<SunFA_Circum> <underscore> : "\257" macron
688N/A+<SunFA_Diaeresis> <A> : "\304" Adiaeresis
688N/A+<SunFA_Diaeresis> <E> : "\313" Ediaeresis
688N/A+<SunFA_Diaeresis> <I> : "\317" Idiaeresis
688N/A+<SunFA_Diaeresis> <O> : "\326" Odiaeresis
688N/A+<SunFA_Diaeresis> <U> : "\334" Udiaeresis
688N/A+<SunFA_Diaeresis> <a> : "\344" adiaeresis
688N/A+<SunFA_Diaeresis> <e> : "\353" ediaeresis
688N/A+<SunFA_Diaeresis> <i> : "\357" idiaeresis
688N/A+<SunFA_Diaeresis> <o> : "\366" odiaeresis
688N/A+<SunFA_Diaeresis> <quotedbl> : "\250" diaeresis
688N/A+<SunFA_Diaeresis> <space> : "\250" diaeresis
688N/A+<SunFA_Diaeresis> <u> : "\374" udiaeresis
688N/A+<SunFA_Diaeresis> <y> : "\377" ydiaeresis
688N/A+<SunFA_Grave> <A> : "\300" Agrave
688N/A+<SunFA_Grave> <E> : "\310" Egrave
688N/A+<SunFA_Grave> <I> : "\314" Igrave
688N/A+<SunFA_Grave> <O> : "\322" Ograve
688N/A+<SunFA_Grave> <U> : "\331" Ugrave
688N/A+<SunFA_Grave> <a> : "\340" agrave
688N/A+<SunFA_Grave> <e> : "\350" egrave
688N/A+<SunFA_Grave> <i> : "\354" igrave
688N/A+<SunFA_Grave> <o> : "\362" ograve
688N/A+<SunFA_Grave> <space> : "`" grave
688N/A+<SunFA_Grave> <u> : "\371" ugrave
688N/A+<SunFA_Tilde> <A> : "\303" Atilde
688N/A+<SunFA_Tilde> <N> : "\321" Ntilde
688N/A+<SunFA_Tilde> <O> : "\325" Otilde
688N/A+<SunFA_Tilde> <a> : "\343" atilde
688N/A+<SunFA_Tilde> <n> : "\361" ntilde
688N/A+<SunFA_Tilde> <o> : "\365" otilde
688N/A+<SunFA_Tilde> <space> : "~" asciitilde