i18n: Add support for Serbian specific compose table entries.

Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: James Cloos <cloos@jhcloos.com>

5 files changed, 142 insertions, 6 deletions

diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 2b2d2e76..fc6beb29 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -387,7 +387,7 @@ en_US.UTF-8/Compose:		si_LK.UTF-8
 en_US.UTF-8/Compose:		sk_SK.UTF-8
 en_US.UTF-8/Compose:		sl_SI.UTF-8
 en_US.UTF-8/Compose:		sq_AL.UTF-8
-en_US.UTF-8/Compose:		sr_CS.UTF-8
+sr_CS.UTF-8/Compose:		sr_CS.UTF-8
 en_US.UTF-8/Compose:		sr_ME.UTF-8
 en_US.UTF-8/Compose:		sr_RS.UTF-8
 en_US.UTF-8/Compose:		sr_YU.UTF-8
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 418ab1c7..3d11b6ef 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -1002,11 +1002,11 @@ sr@cyrillic:					sr_RS.UTF-8
 sr_YU@cyrillic:					sr_RS.UTF-8
 sr_YU.utf8:					sr_RS.UTF-8
 sr_YU.UTF-8@cyrillic:				sr_RS.UTF-8
-sr_CS:						sr_RS.UTF-8
-sr@Latn:					sr_RS.UTF-8@latin
-sr_CS@Latn:					sr_RS.UTF-8@latin
-sr_CS.utf8:					sr_RS.UTF-8
-sr_CS.UTF-8@Latn:				sr_RS.UTF-8@latin
+sr_CS:						sr_CS.UTF-8
+sr@Latn:					sr_CS.UTF-8@latin
+sr_CS@Latn:					sr_CS.UTF-8@latin
+sr_CS.utf8:					sr_CS.UTF-8
+sr_CS.UTF-8@Latn:				sr_CS.UTF-8@latin
 sr_RS:						sr_RS.UTF-8
 sr@latin:					sr_RS.UTF-8@latin
 sr_RS@latin:				sr_RS.UTF-8@latin
diff --git a/nls/sr_CS.UTF-8/Compose.pre b/nls/sr_CS.UTF-8/Compose.pre
new file mode 100644
index 00000000..119e23ec
--- /dev/null
+++ b/nls/sr_CS.UTF-8/Compose.pre
@@ -0,0 +1,128 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
+
+# Serbian accented Cyrillic
+# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
+# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
+# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
+# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
+# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
+#
+# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
+# ́ - U+0301   <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
+# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
+# ̏ - U+030F  <dead_diaeresis>, <dead_doubleacute>
+# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
+<dead_grave> <Cyrillic_a>         : "а̀"
+<combining_grave> <Cyrillic_a>    : "а̀"
+<Multi_key> <grave> <Cyrillic_a>  : "а̀"
+<dead_grave> <Cyrillic_A>         : "А̀"
+<combining_grave> <Cyrillic_A>    : "А̀"
+<Multi_key> <grave> <Cyrillic_A>  : "А̀"
+<dead_grave> <Cyrillic_e>         : "ѐ"
+<combining_grave> <Cyrillic_e>    : "ѐ"
+<Multi_key> <grave> <Cyrillic_e>  : "ѐ"
+<dead_grave> <Cyrillic_E>         : "Ѐ"
+<combining_grave> <Cyrillic_E>    : "Ѐ"
+<Multi_key> <grave> <Cyrillic_E>  : "Ѐ"
+<dead_grave> <Cyrillic_i>         : "ѝ"
+<combining_grave> <Cyrillic_i>    : "ѝ"
+<Multi_key> <grave> <Cyrillic_i>  : "ѝ"
+<dead_grave> <Cyrillic_I>         : "Ѝ"
+<combining_grave> <Cyrillic_I>    : "Ѝ"
+<Multi_key> <grave> <Cyrillic_I>  : "Ѝ"
+<dead_grave> <Cyrillic_o>         : "о̀"
+<combining_grave> <Cyrillic_o>    : "о̀"
+<Multi_key> <grave> <Cyrillic_o>  : "о̀"
+<dead_grave> <Cyrillic_O>         : "О̀"
+<combining_grave> <Cyrillic_O>    : "О̀"
+<Multi_key> <grave> <Cyrillic_O>  : "О̀"
+<dead_grave> <Cyrillic_u>         : "у̀"
+<combining_grave> <Cyrillic_u>    : "у̀"
+<Multi_key> <grave> <Cyrillic_u>  : "у̀"
+<dead_grave> <Cyrillic_U>         : "У̀"
+<combining_grave> <Cyrillic_U>    : "У̀"
+<Multi_key> <grave> <Cyrillic_U>  : "У̀"
+# ́ - dugouzlazni, U+0301   <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
+<dead_acute> <Cyrillic_a>              : "а́"
+<combining_acute> <Cyrillic_a>         : "а́"
+<Multi_key> <acute> <Cyrillic_a>       : "а́"
+<Multi_key> <apostrophe> <Cyrillic_a>  : "а́"
+<dead_acute> <Cyrillic_A>              : "А́"
+<combining_acute> <Cyrillic_A>         : "А́"
+<Multi_key> <acute> <Cyrillic_A>       : "А́"
+<Multi_key> <apostrophe> <Cyrillic_A>  : "А́"
+<dead_acute> <Cyrillic_e>              : "е́"
+<combining_acute> <Cyrillic_e>         : "е́"
+<Multi_key> <acute> <Cyrillic_e>       : "е́"
+<Multi_key> <apostrophe> <Cyrillic_e>  : "е́"
+<dead_acute> <Cyrillic_E>              : "Е́"
+<combining_acute> <Cyrillic_E>         : "Е́"
+<Multi_key> <acute> <Cyrillic_E>       : "Е́"
+<Multi_key> <apostrophe> <Cyrillic_E>  : "Е́"
+<dead_acute> <Cyrillic_i>              : "и́"
+<combining_acute> <Cyrillic_i>         : "и́"
+<Multi_key> <acute> <Cyrillic_i>       : "и́"
+<Multi_key> <apostrophe> <Cyrillic_i>  : "и́"
+<dead_acute> <Cyrillic_I>              : "И́"
+<combining_acute> <Cyrillic_I>         : "И́"
+<Multi_key> <acute> <Cyrillic_I>       : "И́"
+<Multi_key> <apostrophe> <Cyrillic_I>  : "И́"
+<dead_acute> <Cyrillic_o>              : "о́"
+<combining_acute> <Cyrillic_o>         : "о́"
+<Multi_key> <acute> <Cyrillic_o>       : "о́"
+<Multi_key> <apostrophe> <Cyrillic_o>  : "о́"
+<dead_acute> <Cyrillic_O>              : "О́"
+<combining_acute> <Cyrillic_O>         : "О́"
+<Multi_key> <acute> <Cyrillic_O>       : "О́"
+<Multi_key> <apostrophe> <Cyrillic_O>  : "О́"
+<dead_acute>             <Cyrillic_u>  : "у́"
+<combining_acute>        <Cyrillic_u>  : "у́"
+<Multi_key> <acute>      <Cyrillic_u>  : "у́"
+<Multi_key> <apostrophe> <Cyrillic_u>  : "у́"
+<dead_acute>             <Cyrillic_U>  : "У́"
+<combining_acute>        <Cyrillic_U>  : "У́"
+<Multi_key> <acute>      <Cyrillic_U>  : "У́"
+<Multi_key> <apostrophe> <Cyrillic_U>  : "У́"
+# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
+<dead_circumflex> <Cyrillic_a>          : "а̂"
+<Multi_key> <asciicircum> <Cyrillic_a>  : "а̂"
+<dead_circumflex> <Cyrillic_A>          : "А̂"
+<Multi_key> <asciicircum> <Cyrillic_A>  : "А̂"
+<dead_circumflex> <Cyrillic_e>          : "е̂"
+<Multi_key> <asciicircum> <Cyrillic_e>  : "е̂"
+<dead_circumflex> <Cyrillic_E>          : "Е̂"
+<Multi_key> <asciicircum> <Cyrillic_E>  : "Е̂"
+<dead_circumflex> <Cyrillic_i>          : "и̂"
+<Multi_key> <asciicircum> <Cyrillic_i>  : "и̂"
+<dead_circumflex> <Cyrillic_I>          : "И̂"
+<Multi_key> <asciicircum> <Cyrillic_I>  : "И̂"
+<dead_circumflex> <Cyrillic_o>          : "о̂"
+<Multi_key> <asciicircum> <Cyrillic_o>  : "о̂"
+<dead_circumflex> <Cyrillic_O>          : "О̂"
+<Multi_key> <asciicircum> <Cyrillic_O>  : "О̂"
+<dead_circumflex> <Cyrillic_u>          : "у̂"
+<Multi_key> <asciicircum> <Cyrillic_u>  : "у̂"
+<dead_circumflex> <Cyrillic_U>          : "У̂"
+<Multi_key> <asciicircum> <Cyrillic_U>  : "У̂"
+# ̏ - kratkosilazni, U+030F  <dead_diaeresis>, <dead_doubleacute>
+# there's no appropriate dead_doublegrave, so we use these two dead keys
+<dead_diaeresis>   <Cyrillic_a>  : "а̏"
+<dead_doubleacute> <Cyrillic_a>  : "а̏"
+<dead_diaeresis>   <Cyrillic_A>  : "А̏"
+<dead_doubleacute> <Cyrillic_A>  : "А̏"
+<dead_diaeresis>   <Cyrillic_e>  : "е̏"
+<dead_doubleacute> <Cyrillic_e>  : "е̏"
+<dead_diaeresis>   <Cyrillic_E>  : "Е̏"
+<dead_doubleacute> <Cyrillic_E>  : "Е̏"
+<dead_diaeresis>   <Cyrillic_i>  : "и̏"
+<dead_doubleacute> <Cyrillic_i>  : "и̏"
+<dead_diaeresis>   <Cyrillic_I>  : "И̏"
+<dead_doubleacute> <Cyrillic_I>  : "И̏"
+<dead_diaeresis>   <Cyrillic_o>  : "о̏"
+<dead_doubleacute> <Cyrillic_o>  : "о̏"
+<dead_diaeresis>   <Cyrillic_O>  : "О̏"
+<dead_doubleacute> <Cyrillic_O>  : "О̏"
+<dead_diaeresis>   <Cyrillic_u>  : "у̏"
+<dead_doubleacute> <Cyrillic_u>  : "у̏"
+<dead_diaeresis>   <Cyrillic_U>  : "У̏"
+<dead_doubleacute> <Cyrillic_U>  : "У̏"
diff --git a/nls/sr_CS.UTF-8/XI18N_OBJS b/nls/sr_CS.UTF-8/XI18N_OBJS
new file mode 100644
index 00000000..f201bf43
--- /dev/null
+++ b/nls/sr_CS.UTF-8/XI18N_OBJS
@@ -0,0 +1,8 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for euro locales
+#
+XLC	common/xlcUTF8Load	_XlcUtf8Loader	        # XLC_open
+XOM	common/xomLTRTTB	_XomGenericOpenOM	# XOM_open
+XIM	common/xiiimp		_SwitchOpenIM		# XIM_open
+XIM	common/xiiimp		_XimpLocalOpenIM	# XIM_open
diff --git a/nls/sr_CS.UTF-8/XLC_LOCALE.pre b/nls/sr_CS.UTF-8/XLC_LOCALE.pre
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/nls/sr_CS.UTF-8/XLC_LOCALE.pre