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-1/Compose.pre nls/iso8859-1/Compose.pre |
24 diff -urp -x '*~' -x '*.orig' nls/iso8859-1/Compose.pre nls/iso8859-1/Compose.pre |
25 --- nls/iso8859-1/Compose.pre 2009-03-24 22:23:13.000000000 -0700 |
25 --- nls/iso8859-1/Compose.pre 2010-09-03 22:52:38.000000000 -0700 |
26 +++ nls/iso8859-1/Compose.pre 2009-03-25 01:20:57.486198000 -0700 |
26 +++ nls/iso8859-1/Compose.pre 2010-11-21 18:48:06.890258020 -0800 |
27 @@ -13,6 +13,7 @@ XCOMM Special Character |
27 @@ -11,6 +11,7 @@ XCOMM Special Character |
28 <Multi_key> <apostrophe> <space> : "'" apostrophe |
28 <Multi_key> <apostrophe> <space> : "'" apostrophe |
29 <Multi_key> <space> <apostrophe> : "'" apostrophe |
29 <Multi_key> <space> <apostrophe> : "'" apostrophe |
30 <Multi_key> <A> <T> : "@" at |
30 <Multi_key> <A> <T> : "@" at |
31 +<Multi_key> <A> <A> : "@" at |
31 +<Multi_key> <A> <A> : "@" at |
32 <Multi_key> <parenleft> <parenleft> : "[" bracketleft |
32 <Multi_key> <parenleft> <parenleft> : "[" bracketleft |
33 <Multi_key> <slash> <slash> : "\\" backslash |
33 <Multi_key> <slash> <slash> : "\\" backslash |
34 <Multi_key> <slash> <less> : "\\" backslash |
34 <Multi_key> <slash> <less> : "\\" backslash |
35 @@ -195,7 +196,8 @@ XCOMM Accented Alphabet |
35 @@ -193,7 +194,8 @@ XCOMM Accented Alphabet |
36 <Multi_key> <diaeresis> <A> : "\304" Adiaeresis |
36 <Multi_key> <diaeresis> <A> : "\304" Adiaeresis |
37 <Multi_key> <A> <asterisk> : "\305" Aring |
37 <Multi_key> <A> <asterisk> : "\305" Aring |
38 <Multi_key> <asterisk> <A> : "\305" Aring |
38 <Multi_key> <asterisk> <A> : "\305" Aring |
39 -<Multi_key> <A> <A> : "\305" Aring |
39 -<Multi_key> <A> <A> : "\305" Aring |
40 +XCOMM Conflicts with <A> <A> -> "@" above |
40 +XCOMM Conflicts with <A> <A> -> "@" above |
41 +XCOMM <Multi_key> <A> <A> : "\305" Aring |
41 +XCOMM <Multi_key> <A> <A> : "\305" Aring |
42 <Multi_key> <A> <O> : "\305" Aring |
42 <Multi_key> <A> <O> : "\305" Aring |
43 <Multi_key> <A> <E> : "\306" AE |
43 <Multi_key> <A> <E> : "\306" AE |
44 <Multi_key> <a> <grave> : "\340" agrave |
44 <Multi_key> <a> <grave> : "\340" agrave |
45 @@ -396,7 +398,7 @@ XCOMM Special Character |
45 @@ -394,7 +396,7 @@ XCOMM Special Character |
46 XCOMM These are for us_intl, that does not have diaeresis, etc |
46 XCOMM These are for us_intl, that does not have diaeresis, etc |
47 <dead_acute> <space> : "'" apostrophe |
47 <dead_acute> <space> : "'" apostrophe |
48 <dead_acute> <dead_acute> : "\264" acute |
48 <dead_acute> <dead_acute> : "\264" acute |
49 -<dead_diaeresis> <space> : "\"" quotedbl |
49 -<dead_diaeresis> <space> : "\"" quotedbl |
50 +<dead_diaeresis> <space> : "\250" diaeresis |
50 +<dead_diaeresis> <space> : "\250" diaeresis |
51 <dead_diaeresis> <dead_diaeresis> : "\250" diaeresis |
51 <dead_diaeresis> <dead_diaeresis> : "\250" diaeresis |
52 <dead_doubleacute> <space> : "\"" quotedbl |
52 <dead_doubleacute> <space> : "\"" quotedbl |
53 <dead_abovering> <space> : "\260" degree |
53 <dead_abovering> <space> : "\260" degree |
54 @@ -473,7 +475,6 @@ XCOMM Useful for portuguese language |
54 @@ -471,7 +473,6 @@ XCOMM Useful for portuguese language |
55 <dead_acute> <C> : "\307" Ccedilla |
55 <dead_acute> <C> : "\307" Ccedilla |
56 <dead_acute> <c> : "\347" ccedilla |
56 <dead_acute> <c> : "\347" ccedilla |
57 XCOMM |
57 XCOMM |
58 -#ifdef USE_CTRL_SHIFT_T_SEQS |
58 -#ifdef USE_CTRL_SHIFT_T_SEQS |
59 XCOMM Ctrl<T> Means <Compose> |
59 XCOMM Ctrl<T> Means <Compose> |
60 XCOMM Special Character |
60 XCOMM Special Character |
61 Ctrl<T> <plus> <plus> : "#" numbersign |
61 Ctrl<T> <plus> <plus> : "#" numbersign |
62 @@ -660,7 +661,6 @@ Ctrl<T> <A> <diaeresis> : "\304" Adiae |
62 @@ -658,7 +659,6 @@ Ctrl<T> <A> <diaeresis> : "\304" Adiae |
63 Ctrl<T> <diaeresis> <A> : "\304" Adiaeresis |
63 Ctrl<T> <diaeresis> <A> : "\304" Adiaeresis |
64 Ctrl<T> <A> <asterisk> : "\305" Aring |
64 Ctrl<T> <A> <asterisk> : "\305" Aring |
65 Ctrl<T> <asterisk> <A> : "\305" Aring |
65 Ctrl<T> <asterisk> <A> : "\305" Aring |
66 -Ctrl<T> <A> <A> : "\305" Aring |
66 -Ctrl<T> <A> <A> : "\305" Aring |
67 Ctrl<T> <A> <O> : "\305" Aring |
67 Ctrl<T> <A> <O> : "\305" Aring |
68 Ctrl<T> <A> <E> : "\306" AE |
68 Ctrl<T> <A> <E> : "\306" AE |
69 Ctrl<T> <a> <grave> : "\340" agrave |
69 Ctrl<T> <a> <grave> : "\340" agrave |
70 @@ -841,5 +841,70 @@ Ctrl<T> <y> <quotedbl> : "\377" ydiaer |
70 @@ -839,5 +839,70 @@ Ctrl<T> <y> <quotedbl> : "\377" ydiaer |
71 Ctrl<T> <quotedbl> <y> : "\377" ydiaeresis |
71 Ctrl<T> <quotedbl> <y> : "\377" ydiaeresis |
72 Ctrl<T> <y> <diaeresis> : "\377" ydiaeresis |
72 Ctrl<T> <y> <diaeresis> : "\377" ydiaeresis |
73 Ctrl<T> <diaeresis> <y> : "\377" ydiaeresis |
73 Ctrl<T> <diaeresis> <y> : "\377" ydiaeresis |
74 -#endif /* USE_CTRL_SHIFT_T_SEQS */ |
74 -#endif /* USE_CTRL_SHIFT_T_SEQS */ |
75 XCOMM End of Sequence Definition |
75 XCOMM End of Sequence Definition |