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/vi_VN.viscii | |
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/vi_VN.viscii')
-rw-r--r-- | libX11/nls/vi_VN.viscii/Compose.pre | 270 | ||||
-rw-r--r-- | libX11/nls/vi_VN.viscii/XI18N_OBJS | 14 | ||||
-rw-r--r-- | libX11/nls/vi_VN.viscii/XLC_LOCALE.pre | 158 |
3 files changed, 221 insertions, 221 deletions
diff --git a/libX11/nls/vi_VN.viscii/Compose.pre b/libX11/nls/vi_VN.viscii/Compose.pre index 7f4338712..59cdb83ce 100644 --- a/libX11/nls/vi_VN.viscii/Compose.pre +++ b/libX11/nls/vi_VN.viscii/Compose.pre @@ -1,135 +1,135 @@ -XCOMM 1998/12/18 Le Hong Boi $
-XCOMM
-XCOMM TCVN 5712-2 Compose Sequences
-XCOMM
-XCOMM Sequence Definition
-XCOMM
-XCOMM dead key accent keysyms
-XCOMM Special Character
-<dead_grave> <space> : "`" grave
-<dead_hook> <space> : " " space
-<dead_tilde> <space> : "~" asciitilde
-<dead_acute> <space> : "'" apostrophe
-<dead_acute> <apostrophe> : "\264" acute
-XCOMM Accented Alphabet
-<dead_grave> <A> : "\300" Agrave
-<dead_grave> <a> : "\340" agrave
-<dead_hook> <A> : "\304" Ahook
-<dead_hook> <a> : "\344" ahook
-<dead_tilde> <A> : "\303" Atilde
-<dead_tilde> <a> : "\343" atilde
-<dead_acute> <A> : "\301" Aacute
-<dead_acute> <a> : "\341" aacute
-<dead_belowdot> <A> : "\200" Abelowdot
-<dead_belowdot> <a> : "\325" abelowdot
-<dead_grave> <Abreve> : "\202" Abrevegrave
-<dead_grave> <abreve> : "\242" abrevegrave
-<dead_hook> <Abreve> : "\002" Abrevehook
-<dead_hook> <abreve> : "\306" abrevehook
-<dead_tilde> <Abreve> : "\005" Abrevetilde
-<dead_tilde> <abreve> : "\307" abrevetilde
-<dead_acute> <Abreve> : "\201" Abreveacute
-<dead_acute> <abreve> : "\241" abreveacute
-<dead_belowdot> <Abreve> : "\203" Abrevebelowdot
-<dead_belowdot> <abreve> : "\243" abrevebelowdot
-<dead_grave> <Acircumflex> : "\205" Acircumflexgrave
-<dead_grave> <acircumflex> : "\245" acircumflexgrave
-<dead_hook> <Acircumflex> : "\206" Acircumflexhook
-<dead_hook> <acircumflex> : "\246" acircumflexhook
-<dead_tilde> <Acircumflex> : "\006" Acircumflextilde
-<dead_tilde> <acircumflex> : "\347" acircumflextilde
-<dead_acute> <Acircumflex> : "\204" Acircumflexacute
-<dead_acute> <acircumflex> : "\244" acircumflexacute
-<dead_belowdot> <Acircumflex> : "\207" Acircumflexbelowdot
-<dead_belowdot> <acircumflex> : "\247" acircumflexbelowdot
-<dead_grave> <E> : "\310" Egrave
-<dead_grave> <e> : "\350" egrave
-<dead_hook> <E> : "\313" Ehook
-<dead_hook> <e> : "\353" ehook
-<dead_tilde> <E> : "\210" Etilde
-<dead_tilde> <e> : "\250" etilde
-<dead_acute> <E> : "\311" Eacute
-<dead_acute> <e> : "\351" eacute
-<dead_belowdot> <E> : "\211" Ebelowdot
-<dead_belowdot> <e> : "\251" ebelowdot
-<dead_grave> <Ecircumflex> : "\213" Ecircumflexgrave
-<dead_grave> <ecircumflex> : "\253" ecircumflexgrave
-<dead_hook> <Ecircumflex> : "\214" Ecircumflexhook
-<dead_hook> <ecircumflex> : "\254" ecircumflexhook
-<dead_tilde> <Ecircumflex> : "\215" Ecircumflextilde
-<dead_tilde> <ecircumflex> : "\255" ecircumflextilde
-<dead_acute> <Ecircumflex> : "\212" Ecircumflexacute
-<dead_acute> <ecircumflex> : "\252" ecircumflexacute
-<dead_belowdot> <Ecircumflex> : "\216" Ecircumflexbelowdot
-<dead_belowdot> <ecircumflex> : "\256" ecircumflexbelowdot
-<dead_grave> <I> : "\314" Igrave
-<dead_grave> <i> : "\354" igrave
-<dead_hook> <I> : "\233" Ihook
-<dead_hook> <i> : "\357" ihook
-<dead_tilde> <I> : "\316" Itilde
-<dead_tilde> <i> : "\356" itilde
-<dead_acute> <I> : "\315" Iacute
-<dead_acute> <i> : "\355" iacute
-<dead_belowdot> <I> : "\230" Ibelowdot
-<dead_belowdot> <i> : "\270" ibelowdot
-<dead_grave> <O> : "\322" Ograve
-<dead_grave> <o> : "\362" ograve
-<dead_hook> <O> : "\231" Ohook
-<dead_hook> <o> : "\366" ohook
-<dead_tilde> <O> : "\240" Otilde
-<dead_tilde> <o> : "\365" otilde
-<dead_acute> <O> : "\323" Oacute
-<dead_acute> <o> : "\363" oacute
-<dead_belowdot> <O> : "\232" Obelowdot
-<dead_belowdot> <o> : "\367" obelowdot
-<dead_grave> <Ocircumflex> : "\220" Ocircumflexgrave
-<dead_grave> <ocircumflex> : "\260" ocircumflexgrave
-<dead_hook> <Ocircumflex> : "\221" Ocircumflexhook
-<dead_hook> <ocircumflex> : "\261" ocircumflexhook
-<dead_tilde> <Ocircumflex> : "\222" Ocircumflextilde
-<dead_tilde> <ocircumflex> : "\262" ocircumflextilde
-<dead_acute> <Ocircumflex> : "\217" Ocircumflexacute
-<dead_acute> <ocircumflex> : "\257" ocircumflexacute
-<dead_belowdot> <Ocircumflex> : "\223" Ocircumflexbelowdot
-<dead_belowdot> <ocircumflex> : "\265" ocircumflexbelowdot
-<dead_grave> <Ohorn> : "\226" Ohorngrave
-<dead_grave> <ohorn> : "\266" ohorngrave
-<dead_hook> <Ohorn> : "\227" Ohornhook
-<dead_hook> <ohorn> : "\267" ohornhook
-<dead_tilde> <Ohorn> : "\263" Ohorntilde
-<dead_tilde> <ohorn> : "\336" ohorntilde
-<dead_acute> <Ohorn> : "\225" Ohornacute
-<dead_acute> <ohorn> : "\276" ohornacute
-<dead_belowdot> <Ohorn> : "\224" Ohornbelowdot
-<dead_belowdot> <ohorn> : "\376" ohornbelowdot
-<dead_grave> <U> : "\331" Ugrave
-<dead_grave> <u> : "\371" ugrave
-<dead_hook> <U> : "\234" Uhook
-<dead_hook> <u> : "\374" uhook
-<dead_tilde> <U> : "\235" Utilde
-<dead_tilde> <u> : "\373" utilde
-<dead_acute> <U> : "\332" Uacute
-<dead_acute> <u> : "\372" uacute
-<dead_belowdot> <U> : "\236" Ubelowdot
-<dead_belowdot> <u> : "\370" ubelowdot
-<dead_grave> <Uhorn> : "\273" Uhorngrave
-<dead_grave> <uhorn> : "\327" uhorngrave
-<dead_hook> <Uhorn> : "\274" Uhornhook
-<dead_hook> <uhorn> : "\330" uhornhook
-<dead_tilde> <Uhorn> : "\377" Uhorntilde
-<dead_tilde> <uhorn> : "\346" uhorntilde
-<dead_acute> <Uhorn> : "\272" Uhornacute
-<dead_acute> <uhorn> : "\321" uhornacute
-<dead_belowdot> <Uhorn> : "\271" Uhornbelowdot
-<dead_belowdot> <uhorn> : "\361" uhornbelowdot
-<dead_grave> <Y> : "\237" Ygrave
-<dead_grave> <y> : "\317" ygrave
-<dead_hook> <Y> : "\024" Yhook
-<dead_hook> <y> : "\326" yhook
-<dead_tilde> <Y> : "\031" Ytilde
-<dead_tilde> <y> : "\333" ytilde
-<dead_acute> <Y> : "\335" Yacute
-<dead_acute> <y> : "\375" yacute
-<dead_belowdot> <Y> : "\036" Ybelowdot
-<dead_belowdot> <y> : "\334" ybelowdot
-XCOMM End of Sequence Definition
+XCOMM 1998/12/18 Le Hong Boi $ +XCOMM +XCOMM TCVN 5712-2 Compose Sequences +XCOMM +XCOMM Sequence Definition +XCOMM +XCOMM dead key accent keysyms +XCOMM Special Character +<dead_grave> <space> : "`" grave +<dead_hook> <space> : " " space +<dead_tilde> <space> : "~" asciitilde +<dead_acute> <space> : "'" apostrophe +<dead_acute> <apostrophe> : "\264" acute +XCOMM Accented Alphabet +<dead_grave> <A> : "\300" Agrave +<dead_grave> <a> : "\340" agrave +<dead_hook> <A> : "\304" Ahook +<dead_hook> <a> : "\344" ahook +<dead_tilde> <A> : "\303" Atilde +<dead_tilde> <a> : "\343" atilde +<dead_acute> <A> : "\301" Aacute +<dead_acute> <a> : "\341" aacute +<dead_belowdot> <A> : "\200" Abelowdot +<dead_belowdot> <a> : "\325" abelowdot +<dead_grave> <Abreve> : "\202" Abrevegrave +<dead_grave> <abreve> : "\242" abrevegrave +<dead_hook> <Abreve> : "\002" Abrevehook +<dead_hook> <abreve> : "\306" abrevehook +<dead_tilde> <Abreve> : "\005" Abrevetilde +<dead_tilde> <abreve> : "\307" abrevetilde +<dead_acute> <Abreve> : "\201" Abreveacute +<dead_acute> <abreve> : "\241" abreveacute +<dead_belowdot> <Abreve> : "\203" Abrevebelowdot +<dead_belowdot> <abreve> : "\243" abrevebelowdot +<dead_grave> <Acircumflex> : "\205" Acircumflexgrave +<dead_grave> <acircumflex> : "\245" acircumflexgrave +<dead_hook> <Acircumflex> : "\206" Acircumflexhook +<dead_hook> <acircumflex> : "\246" acircumflexhook +<dead_tilde> <Acircumflex> : "\006" Acircumflextilde +<dead_tilde> <acircumflex> : "\347" acircumflextilde +<dead_acute> <Acircumflex> : "\204" Acircumflexacute +<dead_acute> <acircumflex> : "\244" acircumflexacute +<dead_belowdot> <Acircumflex> : "\207" Acircumflexbelowdot +<dead_belowdot> <acircumflex> : "\247" acircumflexbelowdot +<dead_grave> <E> : "\310" Egrave +<dead_grave> <e> : "\350" egrave +<dead_hook> <E> : "\313" Ehook +<dead_hook> <e> : "\353" ehook +<dead_tilde> <E> : "\210" Etilde +<dead_tilde> <e> : "\250" etilde +<dead_acute> <E> : "\311" Eacute +<dead_acute> <e> : "\351" eacute +<dead_belowdot> <E> : "\211" Ebelowdot +<dead_belowdot> <e> : "\251" ebelowdot +<dead_grave> <Ecircumflex> : "\213" Ecircumflexgrave +<dead_grave> <ecircumflex> : "\253" ecircumflexgrave +<dead_hook> <Ecircumflex> : "\214" Ecircumflexhook +<dead_hook> <ecircumflex> : "\254" ecircumflexhook +<dead_tilde> <Ecircumflex> : "\215" Ecircumflextilde +<dead_tilde> <ecircumflex> : "\255" ecircumflextilde +<dead_acute> <Ecircumflex> : "\212" Ecircumflexacute +<dead_acute> <ecircumflex> : "\252" ecircumflexacute +<dead_belowdot> <Ecircumflex> : "\216" Ecircumflexbelowdot +<dead_belowdot> <ecircumflex> : "\256" ecircumflexbelowdot +<dead_grave> <I> : "\314" Igrave +<dead_grave> <i> : "\354" igrave +<dead_hook> <I> : "\233" Ihook +<dead_hook> <i> : "\357" ihook +<dead_tilde> <I> : "\316" Itilde +<dead_tilde> <i> : "\356" itilde +<dead_acute> <I> : "\315" Iacute +<dead_acute> <i> : "\355" iacute +<dead_belowdot> <I> : "\230" Ibelowdot +<dead_belowdot> <i> : "\270" ibelowdot +<dead_grave> <O> : "\322" Ograve +<dead_grave> <o> : "\362" ograve +<dead_hook> <O> : "\231" Ohook +<dead_hook> <o> : "\366" ohook +<dead_tilde> <O> : "\240" Otilde +<dead_tilde> <o> : "\365" otilde +<dead_acute> <O> : "\323" Oacute +<dead_acute> <o> : "\363" oacute +<dead_belowdot> <O> : "\232" Obelowdot +<dead_belowdot> <o> : "\367" obelowdot +<dead_grave> <Ocircumflex> : "\220" Ocircumflexgrave +<dead_grave> <ocircumflex> : "\260" ocircumflexgrave +<dead_hook> <Ocircumflex> : "\221" Ocircumflexhook +<dead_hook> <ocircumflex> : "\261" ocircumflexhook +<dead_tilde> <Ocircumflex> : "\222" Ocircumflextilde +<dead_tilde> <ocircumflex> : "\262" ocircumflextilde +<dead_acute> <Ocircumflex> : "\217" Ocircumflexacute +<dead_acute> <ocircumflex> : "\257" ocircumflexacute +<dead_belowdot> <Ocircumflex> : "\223" Ocircumflexbelowdot +<dead_belowdot> <ocircumflex> : "\265" ocircumflexbelowdot +<dead_grave> <Ohorn> : "\226" Ohorngrave +<dead_grave> <ohorn> : "\266" ohorngrave +<dead_hook> <Ohorn> : "\227" Ohornhook +<dead_hook> <ohorn> : "\267" ohornhook +<dead_tilde> <Ohorn> : "\263" Ohorntilde +<dead_tilde> <ohorn> : "\336" ohorntilde +<dead_acute> <Ohorn> : "\225" Ohornacute +<dead_acute> <ohorn> : "\276" ohornacute +<dead_belowdot> <Ohorn> : "\224" Ohornbelowdot +<dead_belowdot> <ohorn> : "\376" ohornbelowdot +<dead_grave> <U> : "\331" Ugrave +<dead_grave> <u> : "\371" ugrave +<dead_hook> <U> : "\234" Uhook +<dead_hook> <u> : "\374" uhook +<dead_tilde> <U> : "\235" Utilde +<dead_tilde> <u> : "\373" utilde +<dead_acute> <U> : "\332" Uacute +<dead_acute> <u> : "\372" uacute +<dead_belowdot> <U> : "\236" Ubelowdot +<dead_belowdot> <u> : "\370" ubelowdot +<dead_grave> <Uhorn> : "\273" Uhorngrave +<dead_grave> <uhorn> : "\327" uhorngrave +<dead_hook> <Uhorn> : "\274" Uhornhook +<dead_hook> <uhorn> : "\330" uhornhook +<dead_tilde> <Uhorn> : "\377" Uhorntilde +<dead_tilde> <uhorn> : "\346" uhorntilde +<dead_acute> <Uhorn> : "\272" Uhornacute +<dead_acute> <uhorn> : "\321" uhornacute +<dead_belowdot> <Uhorn> : "\271" Uhornbelowdot +<dead_belowdot> <uhorn> : "\361" uhornbelowdot +<dead_grave> <Y> : "\237" Ygrave +<dead_grave> <y> : "\317" ygrave +<dead_hook> <Y> : "\024" Yhook +<dead_hook> <y> : "\326" yhook +<dead_tilde> <Y> : "\031" Ytilde +<dead_tilde> <y> : "\333" ytilde +<dead_acute> <Y> : "\335" Yacute +<dead_acute> <y> : "\375" yacute +<dead_belowdot> <Y> : "\036" Ybelowdot +<dead_belowdot> <y> : "\334" ybelowdot +XCOMM End of Sequence Definition diff --git a/libX11/nls/vi_VN.viscii/XI18N_OBJS b/libX11/nls/vi_VN.viscii/XI18N_OBJS index 6422fa7ed..5f4b3b604 100644 --- a/libX11/nls/vi_VN.viscii/XI18N_OBJS +++ b/libX11/nls/vi_VN.viscii/XI18N_OBJS @@ -1,7 +1,7 @@ -# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
-#
-# XI18N objects table for vi_VN.viscii locale
-#
-XLC common/xlcDef _XlcDefaultLoader # XLC_open
-XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
-XOM common/xomGeneric _XomGenericOpenOM # XOM_open
+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME +# +# XI18N objects table for vi_VN.viscii locale +# +XLC common/xlcDef _XlcDefaultLoader # XLC_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister +XOM common/xomGeneric _XomGenericOpenOM # XOM_open diff --git a/libX11/nls/vi_VN.viscii/XLC_LOCALE.pre b/libX11/nls/vi_VN.viscii/XLC_LOCALE.pre index 9df54f809..9df03005c 100644 --- a/libX11/nls/vi_VN.viscii/XLC_LOCALE.pre +++ b/libX11/nls/vi_VN.viscii/XLC_LOCALE.pre @@ -1,79 +1,79 @@ -XCOMM XLocale Database Sample for vi_VN.VISCII
-XCOMM
-
-XCOMM
-XCOMM XLC_FONTSET category
-XCOMM
-XLC_FONTSET
-XCOMM fs0 class (7 bit ASCII)
-fs0 {
- charset {
- name ISO8859-1:GL
- }
- font {
- primary VISCII1.1-1:GL
- substitute ISO8859-1:GL
- }
-}
-XCOMM fs1 class
-fs1 {
- charset VISCII1.1-1:GR
- font VISCII1.1-1:GR
-}
-END XLC_FONTSET
-
-XCOMM
-XCOMM XLC_CHARSET_DEFINE category
-XCOMM
-XLC_CHARSET_DEFINE
-csd0 {
- charset_name VISCII1.1-1
- side GR
- length 1
- string_encoding False
- sequence \x1b%/1
-}
-END XLC_CHARSET_DEFINE
-
-XCOMM
-XCOMM XLC_XLOCALE category
-XCOMM
-XLC_XLOCALE
-
-encoding_name VISCII1.1-1
-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
-#endif
-
-XCOMM cs0 class
-cs0 {
- side GL:Default
- length 1
- wc_encoding \x00000000
- ct_encoding VISCII1.1-1: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 VISCII1.1-1:GR
-}
-
-END XLC_XLOCALE
+XCOMM XLocale Database Sample for vi_VN.VISCII +XCOMM + +XCOMM +XCOMM XLC_FONTSET category +XCOMM +XLC_FONTSET +XCOMM fs0 class (7 bit ASCII) +fs0 { + charset { + name ISO8859-1:GL + } + font { + primary VISCII1.1-1:GL + substitute ISO8859-1:GL + } +} +XCOMM fs1 class +fs1 { + charset VISCII1.1-1:GR + font VISCII1.1-1:GR +} +END XLC_FONTSET + +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name VISCII1.1-1 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + +XCOMM +XCOMM XLC_XLOCALE category +XCOMM +XLC_XLOCALE + +encoding_name VISCII1.1-1 +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 +#endif + +XCOMM cs0 class +cs0 { + side GL:Default + length 1 + wc_encoding \x00000000 + ct_encoding VISCII1.1-1: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 VISCII1.1-1:GR +} + +END XLC_XLOCALE |