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/ja_JP.UTF-8/XI18N_OBJS nls/ja_JP.UTF-8/XI18N_OBJS |
24 diff -urp -x '*~' -x '*.orig' nls/ja_JP.UTF-8/XI18N_OBJS nls/ja_JP.UTF-8/XI18N_OBJS |
25 --- nls/ja_JP.UTF-8/XI18N_OBJS 2008-10-07 10:18:18.000000000 -0700 |
25 --- nls/ja_JP.UTF-8/XI18N_OBJS 2010-01-14 17:11:36.000000000 -0800 |
26 +++ nls/ja_JP.UTF-8/XI18N_OBJS 2009-04-08 00:26:30.954518000 -0700 |
26 +++ nls/ja_JP.UTF-8/XI18N_OBJS 2010-06-07 15:49:51.158931189 -0700 |
27 @@ -5,5 +5,8 @@ |
27 @@ -4,5 +4,8 @@ |
28 # $XFree86$ |
28 # |
29 # |
29 # |
30 XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open |
30 XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open |
31 -XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister |
31 -XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister |
32 +XIM common/xiiimp _SwitchOpenIM # XIM_open |
32 +XIM common/xiiimp _SwitchOpenIM # XIM_open |
33 +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_regiser XIM_unregister |
33 +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_regiser XIM_unregister |
34 +XIM common/ximlocal _XimpLocalOpenIM # XIM_open |
34 +XIM common/ximlocal _XimpLocalOpenIM # XIM_open |
35 +XIM common/ximp40 _Ximp_OpenIM # XIM_open |
35 +XIM common/ximp40 _Ximp_OpenIM # XIM_open |
36 XOM common/xomGeneric _XomGenericOpenOM # XOM_open |
36 XOM common/xomGeneric _XomGenericOpenOM # XOM_open |
37 diff -urp -x '*~' -x '*.orig' nls/ja_JP.UTF-8/XLC_LOCALE.pre nls/ja_JP.UTF-8/XLC_LOCALE.pre |
37 diff -urp -x '*~' -x '*.orig' nls/ja_JP.UTF-8/XLC_LOCALE.pre nls/ja_JP.UTF-8/XLC_LOCALE.pre |
38 --- nls/ja_JP.UTF-8/XLC_LOCALE.pre 2008-10-07 10:18:18.000000000 -0700 |
38 --- nls/ja_JP.UTF-8/XLC_LOCALE.pre 2010-01-14 17:11:36.000000000 -0800 |
39 +++ nls/ja_JP.UTF-8/XLC_LOCALE.pre 2009-04-08 00:26:30.954835000 -0700 |
39 +++ nls/ja_JP.UTF-8/XLC_LOCALE.pre 2010-06-07 15:49:51.159344368 -0700 |
40 @@ -18,7 +18,7 @@ fs0 { |
40 @@ -17,7 +17,7 @@ fs0 { |
41 name ISO8859-1:GL |
41 name ISO8859-1:GL |
42 } |
42 } |
43 font { |
43 font { |
44 - primary ISO8859-1:GL |
44 - primary ISO8859-1:GL |
45 + primary JISX0201.1976-0:GL;ISO8859-1:GL |
45 + primary JISX0201.1976-0:GL;ISO8859-1:GL |
46 vertical_rotate all |
46 vertical_rotate all |
47 } |
47 } |
48 } |
48 } |
49 @@ -42,18 +42,29 @@ fs2 { |
49 @@ -41,18 +41,29 @@ fs2 { |
50 } |
50 } |
51 } |
51 } |
52 |
52 |
53 -XCOMM fs3 class (Korean Character) |
53 -XCOMM fs3 class (Korean Character) |
54 +XCOMM fs3 class (Supplementary Kanji) |
54 +XCOMM fs3 class (Supplementary Kanji) |
79 +XCOMM fs5 class (Chinese Han Character) |
79 +XCOMM fs5 class (Chinese Han Character) |
80 +fs5 { |
80 +fs5 { |
81 charset { |
81 charset { |
82 name GB2312.1980-0:GL |
82 name GB2312.1980-0:GL |
83 } |
83 } |
84 @@ -61,8 +72,8 @@ fs4 { |
84 @@ -60,8 +71,8 @@ fs4 { |
85 primary GB2312.1980-0:GL |
85 primary GB2312.1980-0:GL |
86 } |
86 } |
87 } |
87 } |
88 -XCOMM fs5 class (Half Kana) |
88 -XCOMM fs5 class (Half Kana) |
89 -fs5 { |
89 -fs5 { |
90 +XCOMM fs6 class (Half Kana) |
90 +XCOMM fs6 class (Half Kana) |
91 +fs6 { |
91 +fs6 { |
92 charset { |
92 charset { |
93 name JISX0201.1976-0:GR |
93 name JISX0201.1976-0:GR |
94 } |
94 } |
95 @@ -76,12 +87,13 @@ XCOMM other fonts are picked up before i |
95 @@ -75,12 +86,13 @@ XCOMM other fonts are picked up before i |
96 XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all |
96 XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all |
97 XCOMM in ISO8859-X ranges. |
97 XCOMM in ISO8859-X ranges. |
98 |
98 |
99 -XCOMM fs6 class |
99 -XCOMM fs6 class |
100 -fs6 { |
100 -fs6 { |
106 font { |
106 font { |
107 + load_option delay_nocheck |
107 + load_option delay_nocheck |
108 primary ISO10646-1 |
108 primary ISO10646-1 |
109 } |
109 } |
110 } |
110 } |
111 @@ -101,7 +113,7 @@ XCOMM cs0 class |
111 @@ -100,7 +112,7 @@ XCOMM cs0 class |
112 cs0 { |
112 cs0 { |
113 side GL:Default |
113 side GL:Default |
114 length 1 |
114 length 1 |
115 - ct_encoding ISO8859-1:GL |
115 - ct_encoding ISO8859-1:GL |
116 + ct_encoding ISO8859-1:GL;JISX0201.1976-0:GL |
116 + ct_encoding ISO8859-1:GL;JISX0201.1976-0:GL |
117 } |
117 } |
118 |
118 |
119 XCOMM cs1 class |
119 XCOMM cs1 class |
120 @@ -120,29 +132,36 @@ cs2 { |
120 @@ -119,29 +131,36 @@ cs2 { |
121 } |
121 } |
122 |
122 |
123 XCOMM cs3 class |
123 XCOMM cs3 class |
124 -cs3 { |
124 -cs3 { |
125 - side GL |
125 - side GL |