[BZ #2625]

2006-05-01  Alexander Shopov  <ash@contact.bg>
	[BZ #2625]
	* iconvdata/Makefile (modules): Added MIK.
	(distribute): Added mik.c.
	(gen-8bit-gap-modules): Added mik.
	* iconvdata/TESTS: Added MIK.
	* iconvdata/gconv-modules: Added MIK.
	* iconvdata/tst-tables.sh: Added MIK.
	* iconvdata/mik.c: New file.
	* iconvdata/testdata/MIK: New file.
	* iconvdata/testdata/MIK..UTF8: New file.

diff --git a/ChangeLog b/ChangeLog
index 2e4ae279f7326bf6b4797458d3a2a1ce03135af4..f4c013dea850d2be269817781431b76262269f02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-01  Alexander Shopov  <ash@contact.bg>
+
+       [BZ #2625]
+       * iconvdata/Makefile (modules): Added MIK.
+       (distribute): Added mik.c.
+       (gen-8bit-gap-modules): Added mik.
+       * iconvdata/TESTS: Added MIK.
+       * iconvdata/gconv-modules: Added MIK.
+       * iconvdata/tst-tables.sh: Added MIK.
+       * iconvdata/mik.c: New file.
+       * iconvdata/testdata/MIK: New file.
+       * iconvdata/testdata/MIK..UTF8: New file.
+
 2006-04-30  Ulrich Drepper  <drepper@redhat.com>
 
        * elf/dl-load.c (_dl_map_object_from_fd): Move state change

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 1d3259179a309013546593bc4768ded4b2a2cf8e..c7d5801c6cdd485e6fad4d86d6bd9d0c3ea9c4c2 100644 (file)
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -58,7 +58,7 @@ modules       := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5             \
           IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148       \
           IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971       \
           IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804             \
-          IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1
+          IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -196,7 +196,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
              ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h   \
              ibm12712.c ibm12712.h ibm16804.c ibm16804.h                   \
              ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h   \
-             ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c
+             ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -237,7 +237,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273         \
                        iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
                        iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t    \
                        georgian-ps georgian-academy iso-ir-209 mac-sami   \
-                       iso8859-11 ibm866nav pt154 rk1048
+                       iso8859-11 ibm866nav pt154 rk1048 mik
 
 gen-special-modules := iso8859-7jp
 

diff --git a/iconvdata/TESTS b/iconvdata/TESTS
index 933c447096785e9f1c25ffd3e6ee89d986789470..b70e5051f08e602320b93b54736fbf8e3178baf7 100644 (file)
--- a/iconvdata/TESTS
+++ b/iconvdata/TESTS
@@ -165,3 +165,4 @@ IBM1388                     IBM1388                 N       UTF8
 IBM1390                        IBM1390                 N       UTF8
 IBM1399                        IBM1399                 N       UTF8
 ISO_11548-1            ISO_11548-1             -       UTF8
+MIK                    MIK                     Y       UTF8

diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 421dc6739a1ef3b979d22aafc6f4956ec95a13c0..852c7b94a61d6d0a2d5607b45826c5070f60a72e 100644 (file)
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1903,3 +1903,7 @@ alias     ISO/TR_11548-1/         ISO_11548-1//
 alias  ISO11548-1//            ISO_11548-1//
 module ISO_11548-1//           INTERNAL                ISO_11548-1     1
 module INTERNAL                ISO_11548-1//           ISO_11548-1     1
+
+#      from                    to                      module          cost
+module MIK//                   INTERNAL                MIK             1
+module INTERNAL                MIK//                   MIK             1

diff --git a/iconvdata/mik.c b/iconvdata/mik.c
new file mode 100644 (file)
index 0000000..00a7fb3
--- /dev/null
+++ b/iconvdata/mik.c
@@ -0,0 +1,32 @@
+/* Conversion from and to MIK.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Alexander Shopov <ash@contact.bg>, 2006.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <mik.h>
+
+#define CHARSET_NAME   "MIK//"
+#define HAS_HOLES      0       /* All 256 character are defined.  */
+
+#include <8bit-gap.c>
+
+
+

diff --git a/iconvdata/testdata/MIK b/iconvdata/testdata/MIK
new file mode 100644 (file)
index 0000000..b3a5bf4
--- /dev/null
+++ b/iconvdata/testdata/MIK
@@ -0,0 +1,14 @@
+   ! " # $ % & ' ( ) * + , - . /
+ 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
+ @ A B C D E F G H I J K L M N O
+ P Q R S T U V W X Y Z [ \ ] ^ _
+ ` a b c d e f g h i j k l m n o
+ p q r s t u v w x y z { | } ~ \7f
+ \80 \81 \82 \83 \84 \85 \86 \87 \88 \89 \8a \8b \8c \8d \8e \8f
+ \90 \91 \92 \93 \94 \95 \96 \97 \98 \99 \9a \9b \9c \9d \9e \9f
+   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯
+ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿
+ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï
+ Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß
+ à á â ã ä å æ ç è é ê ë ì í î ï
+ ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ

diff --git a/iconvdata/testdata/MIK..UTF8 b/iconvdata/testdata/MIK..UTF8
new file mode 100644 (file)
index 0000000..d47d559
--- /dev/null
+++ b/iconvdata/testdata/MIK..UTF8
@@ -0,0 +1,14 @@
+  ! " # $ % & ' ( ) * + , - . /
+0 1 2 3 4 5 6 7 8 9 : ; < = > ?
+@ A B C D E F G H I J K L M N O
+P Q R S T U V W X Y Z [ \ ] ^ _
+` a b c d e f g h i j k l m n o
+p q r s t u v w x y z { | } ~ \7f
+А Б В Г Д Е Ж З И Й К Л М Н О П
+Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я
+а б в г д е ж з и й к л м н о п
+р с т у ф х ц ч ш щ ъ ы ь э ю я
+└ ┴ ┬ ├ ─ ┼ ╣ ║ ╚ ╔ ╩ ╦ ╠ ═ ╬ ┐
+░ ▒ ▓ │ ┤ № § ╗ ╝ ┘ ┌ █ ▄ ▌ ▐ ▀
+α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩
+≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■  

diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index 2c1c9d04d92db8795214650296e1d9646130ddc4..506adbcd7c26e1317b742828f8bdf3a94ee9ff6a 100755 (executable)
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -207,6 +207,7 @@ cat <<EOF |
   TSCII
   PT154
   RK1048
+  MIK
   #
   # Multibyte encodings come here
   #

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 588a87dddc53050989f6bd7a83b5ade09689679d..4ddeb354b8b54336979e2931e57c822d1f0eecc8 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-01  Ulrich Drepper  <drepper@redhat.com>
+
+       [BZ #352]
+       * locales/ru_RU: Use U2002 for thousands_sep and
+       mon_throusands_sep.
+
 2006-05-01  Alexander Shopov  <ash@contact.bg>
 
        [BZ #2625]

diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 0308c5b79aa89236d47983915d352eaa5d61cd50..7c0f291d0f340490c7d798bb564ed816613fef54 100644 (file)
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -77,7 +77,7 @@ LC_MONETARY
 int_curr_symbol           "<U0052><U0055><U0042><U0020>"
 currency_symbol           "<U0440><U0443><U0431>"
 mon_decimal_point         "<U002E>"
-mon_thousands_sep         "<U0020>"
+mon_thousands_sep         "<U2002>"
 mon_grouping              3;3
 positive_sign             ""
 negative_sign             "<U002D>"
@@ -93,7 +93,7 @@ END LC_MONETARY
 
 LC_NUMERIC
 decimal_point             "<U002C>"
-thousands_sep             "<U002E>"
+thousands_sep             "<U2002>"
 grouping                  3;3
 END LC_NUMERIC