diff options
author | marha <marha@users.sourceforge.net> | 2012-11-19 10:38:33 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:38:33 +0100 |
commit | 24635abae6008bef13e30d798b3f33abab412770 (patch) | |
tree | e799fbde24e0fd935af76b0bc48d30ef69f75d54 /libX11/nls/ja.JIS/XLC_LOCALE.pre | |
parent | e0844ae8b5ef87049537a7e0ebff81acc2695256 (diff) | |
parent | 6ce1d8f0f8c23e186175a7c84c21d7bfbe168dc5 (diff) | |
download | vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.gz vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.bz2 vcxsrv-24635abae6008bef13e30d798b3f33abab412770.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
Changed file permissions
dos -> unix
Conflicts:
libX11/include/X11/Xregion.h
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/StrKeysym.c
libX11/src/Window.c
libX11/src/xkb/XKBBind.c
libX11/src/xkb/XKBGetMap.c
libX11/src/xkb/XKBSetGeom.c
libX11/src/xkb/XKBUse.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libXdmcp/Key.c
libXdmcp/Write.c
libxcb/src/xcb_windefs.h
xkbcomp/keycodes.c
xkbcomp/xkbpath.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
xorg-server/xkeyboard-config/rules/bin/ml_s.sh
xorg-server/xkeyboard-config/rules/bin/mln_s.sh
xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'libX11/nls/ja.JIS/XLC_LOCALE.pre')
-rw-r--r-- | libX11/nls/ja.JIS/XLC_LOCALE.pre | 248 |
1 files changed, 124 insertions, 124 deletions
diff --git a/libX11/nls/ja.JIS/XLC_LOCALE.pre b/libX11/nls/ja.JIS/XLC_LOCALE.pre index 8fc4d056c..4b771aca2 100644 --- a/libX11/nls/ja.JIS/XLC_LOCALE.pre +++ b/libX11/nls/ja.JIS/XLC_LOCALE.pre @@ -1,124 +1,124 @@ -XCOMM
-XCOMM XLocale Database Sample for ja_JP.jis
-XCOMM
-
-XCOMM
-XCOMM XLC_FONTSET category
-XCOMM
-XLC_FONTSET
-XCOMM fs0 class (7 bit ASCII)
-fs0 {
- charset {
- name ISO8859-1:GL
- }
- font {
- primary ISO8859-1:GL
- substitute JISX0201.1976-0:GL
- vertical_rotate all
- }
-}
-XCOMM fs1 class (Kanji)
-fs1 {
- charset {
- name JISX0208.1983-0:GL
- }
- font {
- primary JISX0208.1983-0:GL
- substitute JISX0208.1990-0:GL
- }
-}
-XCOMM fs2 class (Half Kana)
-fs2 {
- charset {
- name JISX0201.1976-0:GR
- }
- font {
- primary JISX0201.1976-0:GR
- substitute JISX0201.1976-0:GR
- vertical_rotate all
- }
-}
-XCOMM fs3 class (Supplementary Kanji)
-XCOMM fs3 {
-XCOMM charset {
-XCOMM name JISX0212.1990-0:GL
-XCOMM }
-XCOMM font {
-XCOMM primary JISX0212.1990-0:GL
-XCOMM }
-XCOMM }
-END XLC_FONTSET
-
-XCOMM
-XCOMM XLC_XLOCALE category
-XCOMM
-XLC_XLOCALE
-
-encoding_name ja.jis
-mb_cur_max 5
-state_depend_encoding True
-#if WCHAR32
-wc_encoding_mask \x30000000
-wc_shift_bits 7
-#else
-wc_encoding_mask \x00008080
-wc_shift_bits 8
-#endif
-
-#ifndef X_LOCALE
-use_stdc_env True
-force_convert_to_mb True
-#endif
-
-XCOMM cs0 class
-cs0 {
- side GL:Default
- length 1
- mb_encoding <LSL> \x1b \x28 \x4a;\
- <LSL> \x1b \x28 \x42
- wc_encoding \x00000000
- ct_encoding ISO8859-1:GL; JISX0201.1976-0:GL
-}
-
-XCOMM cs1 class
-cs1 {
- side GL
- length 2
- mb_encoding <LSL> \x1b \x24 \x42;\
- <LSL> \x1b \x24 \x40
-#if WCHAR32
- wc_encoding \x30000000
-#else
- wc_encoding \x00008080
-#endif
- ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
- JISX0208.1983-1:GL; JISX0208.1983-1:GR
-}
-
-XCOMM cs2 class
-cs2 {
- side GL
- length 1
- mb_encoding <LSL> \x1b \x28 \x49
-#if WCHAR32
- wc_encoding \x10000000
-#else
- wc_encoding \x00000080
-#endif
- ct_encoding JISX0201.1976-0:GR
-}
-
-XCOMM cs3 class
-XCOMM cs3 {
-XCOMM side GL
-XCOMM length 2
-XCOMM mb_encoding <LSL> \x1b \x24 \x28 \x44
-XCOMM #if WCHAR32
-XCOMM wc_encoding \x20000000
-XCOMM #else
-XCOMM wc_encoding \x00008000
-XCOMM #endif
-XCOMM ct_encoding JISX0212.1990-0:GL; JISX0212.1990-0:GR
-XCOMM }
-
-END XLC_XLOCALE
+XCOMM +XCOMM XLocale Database Sample for ja_JP.jis +XCOMM + +XCOMM +XCOMM XLC_FONTSET category +XCOMM +XLC_FONTSET +XCOMM fs0 class (7 bit ASCII) +fs0 { + charset { + name ISO8859-1:GL + } + font { + primary ISO8859-1:GL + substitute JISX0201.1976-0:GL + vertical_rotate all + } +} +XCOMM fs1 class (Kanji) +fs1 { + charset { + name JISX0208.1983-0:GL + } + font { + primary JISX0208.1983-0:GL + substitute JISX0208.1990-0:GL + } +} +XCOMM fs2 class (Half Kana) +fs2 { + charset { + name JISX0201.1976-0:GR + } + font { + primary JISX0201.1976-0:GR + substitute JISX0201.1976-0:GR + vertical_rotate all + } +} +XCOMM fs3 class (Supplementary Kanji) +XCOMM fs3 { +XCOMM charset { +XCOMM name JISX0212.1990-0:GL +XCOMM } +XCOMM font { +XCOMM primary JISX0212.1990-0:GL +XCOMM } +XCOMM } +END XLC_FONTSET + +XCOMM +XCOMM XLC_XLOCALE category +XCOMM +XLC_XLOCALE + +encoding_name ja.jis +mb_cur_max 5 +state_depend_encoding True +#if WCHAR32 +wc_encoding_mask \x30000000 +wc_shift_bits 7 +#else +wc_encoding_mask \x00008080 +wc_shift_bits 8 +#endif + +#ifndef X_LOCALE +use_stdc_env True +force_convert_to_mb True +#endif + +XCOMM cs0 class +cs0 { + side GL:Default + length 1 + mb_encoding <LSL> \x1b \x28 \x4a;\ + <LSL> \x1b \x28 \x42 + wc_encoding \x00000000 + ct_encoding ISO8859-1:GL; JISX0201.1976-0:GL +} + +XCOMM cs1 class +cs1 { + side GL + length 2 + mb_encoding <LSL> \x1b \x24 \x42;\ + <LSL> \x1b \x24 \x40 +#if WCHAR32 + wc_encoding \x30000000 +#else + wc_encoding \x00008080 +#endif + ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;\ + JISX0208.1983-1:GL; JISX0208.1983-1:GR +} + +XCOMM cs2 class +cs2 { + side GL + length 1 + mb_encoding <LSL> \x1b \x28 \x49 +#if WCHAR32 + wc_encoding \x10000000 +#else + wc_encoding \x00000080 +#endif + ct_encoding JISX0201.1976-0:GR +} + +XCOMM cs3 class +XCOMM cs3 { +XCOMM side GL +XCOMM length 2 +XCOMM mb_encoding <LSL> \x1b \x24 \x28 \x44 +XCOMM #if WCHAR32 +XCOMM wc_encoding \x20000000 +XCOMM #else +XCOMM wc_encoding \x00008000 +XCOMM #endif +XCOMM ct_encoding JISX0212.1990-0:GL; JISX0212.1990-0:GR +XCOMM } + +END XLC_XLOCALE |