1 ############################################################################### |
1 ############################################################################### |
2 # Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. |
3 # |
3 # |
4 # Permission is hereby granted, free of charge, to any person obtaining a |
4 # Permission is hereby granted, free of charge, to any person obtaining a |
5 # copy of this software and associated documentation files (the "Software"), |
5 # copy of this software and associated documentation files (the "Software"), |
6 # to deal in the Software without restriction, including without limitation |
6 # to deal in the Software without restriction, including without limitation |
7 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
7 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 # DEALINGS IN THE SOFTWARE. |
21 # DEALINGS IN THE SOFTWARE. |
22 # |
22 # |
23 |
23 |
24 diff -urp -x '*~' -x '*.orig' nls/iso8859-15/Compose.pre nls/iso8859-15/Compose.pre |
24 diff -urp -x '*~' -x '*.orig' nls/iso8859-15/Compose.pre nls/iso8859-15/Compose.pre |
25 --- nls/iso8859-15/Compose.pre 2009-04-06 10:49:37.000000000 -0700 |
25 --- nls/iso8859-15/Compose.pre 2010-09-03 22:52:38.000000000 -0700 |
26 +++ nls/iso8859-15/Compose.pre 2009-04-08 00:22:46.717715000 -0700 |
26 +++ nls/iso8859-15/Compose.pre 2010-11-21 18:48:18.747788946 -0800 |
27 @@ -11,7 +11,7 @@ XCOMM Special Character |
27 @@ -9,7 +9,7 @@ XCOMM Special Character |
28 <Multi_key> <plus> <plus> : "#" numbersign |
28 <Multi_key> <plus> <plus> : "#" numbersign |
29 <Multi_key> <apostrophe> <space> : "'" apostrophe |
29 <Multi_key> <apostrophe> <space> : "'" apostrophe |
30 <Multi_key> <space> <apostrophe> : "'" apostrophe |
30 <Multi_key> <space> <apostrophe> : "'" apostrophe |
31 -<Multi_key> <A> <T> : "@" at |
31 -<Multi_key> <A> <T> : "@" at |
32 +<Multi_key> <A> <A> : "@" at |
32 +<Multi_key> <A> <A> : "@" at |
33 <Multi_key> <parenleft> <parenleft> : "[" bracketleft |
33 <Multi_key> <parenleft> <parenleft> : "[" bracketleft |
34 <Multi_key> <slash> <slash> : "\\" backslash |
34 <Multi_key> <slash> <slash> : "\\" backslash |
35 <Multi_key> <slash> <less> : "\\" backslash |
35 <Multi_key> <slash> <less> : "\\" backslash |
36 @@ -181,7 +181,8 @@ XCOMM Accented Alphabet |
36 @@ -179,7 +179,8 @@ XCOMM Accented Alphabet |
37 <Multi_key> <diaeresis> <A> : "\304" Adiaeresis |
37 <Multi_key> <diaeresis> <A> : "\304" Adiaeresis |
38 <Multi_key> <A> <asterisk> : "\305" Aring |
38 <Multi_key> <A> <asterisk> : "\305" Aring |
39 <Multi_key> <asterisk> <A> : "\305" Aring |
39 <Multi_key> <asterisk> <A> : "\305" Aring |
40 -<Multi_key> <A> <A> : "\305" Aring |
40 -<Multi_key> <A> <A> : "\305" Aring |
41 +XCOMM Conflicts with existing Solaris <A> <A> mapping to "@" above |
41 +XCOMM Conflicts with existing Solaris <A> <A> mapping to "@" above |
42 +XCOMM <Multi_key> <A> <A> : "\305" Aring |
42 +XCOMM <Multi_key> <A> <A> : "\305" Aring |
43 <Multi_key> <A> <O> : "\305" Aring |
43 <Multi_key> <A> <O> : "\305" Aring |
44 <Multi_key> <A> <E> : "\306" AE |
44 <Multi_key> <A> <E> : "\306" AE |
45 <Multi_key> <a> <grave> : "\340" agrave |
45 <Multi_key> <a> <grave> : "\340" agrave |
46 @@ -383,6 +384,19 @@ XCOMM Accented Alphabet |
46 @@ -381,6 +382,19 @@ XCOMM Accented Alphabet |
47 <Multi_key> <z> <less> : "\270" zcaron |
47 <Multi_key> <z> <less> : "\270" zcaron |
48 <Multi_key> <less> <z> : "\270" zcaron |
48 <Multi_key> <less> <z> : "\270" zcaron |
49 XCOMM |
49 XCOMM |
50 +XCOMM |
50 +XCOMM |
51 +XCOMM Additional sequences for switch from 8859-1 to 8859-15 |
51 +XCOMM Additional sequences for switch from 8859-1 to 8859-15 |
61 +<Multi_key> <Z> <v> : "\264" Zcaron |
61 +<Multi_key> <Z> <v> : "\264" Zcaron |
62 + |
62 + |
63 XCOMM dead key accent keysyms |
63 XCOMM dead key accent keysyms |
64 XCOMM Special Character |
64 XCOMM Special Character |
65 <dead_circumflex> <slash> : "|" bar |
65 <dead_circumflex> <slash> : "|" bar |
66 @@ -392,12 +406,7 @@ XCOMM Special Character |
66 @@ -390,12 +404,7 @@ XCOMM Special Character |
67 <dead_tilde> <dead_tilde> : "~" asciitilde |
67 <dead_tilde> <dead_tilde> : "~" asciitilde |
68 <dead_grave> <space> : "`" grave |
68 <dead_grave> <space> : "`" grave |
69 <dead_grave> <dead_grave> : "`" grave |
69 <dead_grave> <dead_grave> : "`" grave |
70 -XCOMM These are for us_intl, that does not have diaeresis, etc |
70 -XCOMM These are for us_intl, that does not have diaeresis, etc |
71 <dead_acute> <space> : "'" apostrophe |
71 <dead_acute> <space> : "'" apostrophe |
74 -<dead_diaeresis> <dead_diaeresis> : "\"" quotedbl |
74 -<dead_diaeresis> <dead_diaeresis> : "\"" quotedbl |
75 -<dead_doubleacute> <space> : "\"" quotedbl |
75 -<dead_doubleacute> <space> : "\"" quotedbl |
76 <dead_circumflex> <0> : "\260" degree |
76 <dead_circumflex> <0> : "\260" degree |
77 <dead_circumflex> <1> : "\271" onesuperior |
77 <dead_circumflex> <1> : "\271" onesuperior |
78 <dead_circumflex> <2> : "\262" twosuperior |
78 <dead_circumflex> <2> : "\262" twosuperior |
79 @@ -475,4 +484,415 @@ XCOMM Accented Alphabet |
79 @@ -473,4 +482,415 @@ XCOMM Accented Alphabet |
80 XCOMM Useful for portuguese language |
80 XCOMM Useful for portuguese language |
81 <dead_acute> <C> : "\307" Ccedilla |
81 <dead_acute> <C> : "\307" Ccedilla |
82 <dead_acute> <c> : "\347" ccedilla |
82 <dead_acute> <c> : "\347" ccedilla |
83 +XCOMM |
83 +XCOMM |
84 +XCOMM Ctrl<T> Means <Compose> |
84 +XCOMM Ctrl<T> Means <Compose> |