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/iso8859-5 | |
| 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/iso8859-5')
| -rw-r--r-- | libX11/nls/iso8859-5/Compose.pre | 28 | ||||
| -rw-r--r-- | libX11/nls/iso8859-5/XI18N_OBJS | 16 | ||||
| -rw-r--r-- | libX11/nls/iso8859-5/XLC_LOCALE.pre | 144 |
3 files changed, 94 insertions, 94 deletions
diff --git a/libX11/nls/iso8859-5/Compose.pre b/libX11/nls/iso8859-5/Compose.pre index 8c802fbbe..01ee440fe 100644 --- a/libX11/nls/iso8859-5/Compose.pre +++ b/libX11/nls/iso8859-5/Compose.pre @@ -1,14 +1,14 @@ -XCOMM
-XCOMM ISO 8859-5 Compose Sequence
-XCOMM
-XCOMM Sequence Definition
-XCOMM
-XCOMM
-XCOMM This file currently has no entries. It appears that a compose file (even
-XCOMM just an empty one) is required for the appropriate keysyms to work for
-XCOMM this encoding.
-XCOMM
-XCOMM <Multi_key> Means <Compose>
-XCOMM Special Character
-
-XCOMM End of Sequence Definition
+XCOMM +XCOMM ISO 8859-5 Compose Sequence +XCOMM +XCOMM Sequence Definition +XCOMM +XCOMM +XCOMM This file currently has no entries. It appears that a compose file (even +XCOMM just an empty one) is required for the appropriate keysyms to work for +XCOMM this encoding. +XCOMM +XCOMM <Multi_key> Means <Compose> +XCOMM Special Character + +XCOMM End of Sequence Definition diff --git a/libX11/nls/iso8859-5/XI18N_OBJS b/libX11/nls/iso8859-5/XI18N_OBJS index daac7d36c..f20902a61 100644 --- a/libX11/nls/iso8859-5/XI18N_OBJS +++ b/libX11/nls/iso8859-5/XI18N_OBJS @@ -1,8 +1,8 @@ -# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
-#
-# XI18N objects table for euro locales
-#
-XLC common/xlibi18n _XlcGenericLoader # XLC_open
-XIM common/xiiimp _XimpLocalOpenIM # XIM_open
-XOM common/xomGeneric _XomGenericOpenOM # XOM_open
-
+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME +# +# XI18N objects table for euro locales +# +XLC common/xlibi18n _XlcGenericLoader # XLC_open +XIM common/xiiimp _XimpLocalOpenIM # XIM_open +XOM common/xomGeneric _XomGenericOpenOM # XOM_open + diff --git a/libX11/nls/iso8859-5/XLC_LOCALE.pre b/libX11/nls/iso8859-5/XLC_LOCALE.pre index 70606c5ec..5a78709ac 100644 --- a/libX11/nls/iso8859-5/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-5/XLC_LOCALE.pre @@ -1,72 +1,72 @@ -XCOMM XLocale Database Sample for iso8859-5.
-XCOMM
-
-XCOMM
-XCOMM XLC_FONTSET category
-XCOMM
-XLC_FONTSET
-XCOMM fs0 class
-fs0 {
- charset {
- name ISO8859-1:GL
- }
- font {
- primary ISO8859-5:GL
- substitute ISO8859-1:GL
- vertical_rotate all
- }
-}
-XCOMM fs1 class
-fs1 {
- charset {
- name ISO8859-5:GR
- }
- font {
- primary ISO8859-5:GR
- }
-}
-END XLC_FONTSET
-
-XCOMM
-XCOMM XLC_XLOCALE category
-XCOMM
-XLC_XLOCALE
-
-encoding_name ISO8859-5
-mb_cur_max 1
-state_depend_encoding False
-#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
- wc_encoding \x00000000
- ct_encoding ISO8859-5:GL; ISO8859-1:GL
-}
-
-
-XCOMM cs1 class
-cs1 {
- side GR:Default
- length 1
-#if WCHAR32
- wc_encoding \x30000000
-#else
- wc_encoding \x00008080
-#endif
- ct_encoding ISO8859-5:GR
-}
-
-END XLC_XLOCALE
+XCOMM XLocale Database Sample for iso8859-5. +XCOMM + +XCOMM +XCOMM XLC_FONTSET category +XCOMM +XLC_FONTSET +XCOMM fs0 class +fs0 { + charset { + name ISO8859-1:GL + } + font { + primary ISO8859-5:GL + substitute ISO8859-1:GL + vertical_rotate all + } +} +XCOMM fs1 class +fs1 { + charset { + name ISO8859-5:GR + } + font { + primary ISO8859-5:GR + } +} +END XLC_FONTSET + +XCOMM +XCOMM XLC_XLOCALE category +XCOMM +XLC_XLOCALE + +encoding_name ISO8859-5 +mb_cur_max 1 +state_depend_encoding False +#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 + wc_encoding \x00000000 + ct_encoding ISO8859-5:GL; ISO8859-1:GL +} + + +XCOMM cs1 class +cs1 { + side GR:Default + length 1 +#if WCHAR32 + wc_encoding \x30000000 +#else + wc_encoding \x00008080 +#endif + ct_encoding ISO8859-5:GR +} + +END XLC_XLOCALE |