Skip to content

Commit

Permalink
[BZ #2625]
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ulrich Drepper committed May 1, 2006
1 parent 001631a commit 39450ec
Show file tree
Hide file tree
Showing 10 changed files with 90 additions and 5 deletions.
13 changes: 13 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions iconvdata/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions iconvdata/TESTS
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions iconvdata/gconv-modules
Original file line number Diff line number Diff line change
Expand Up @@ -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
32 changes: 32 additions & 0 deletions iconvdata/mik.c
Original file line number Diff line number Diff line change
@@ -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>



14 changes: 14 additions & 0 deletions iconvdata/testdata/MIK
Original file line number Diff line number Diff line change
@@ -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 { | } ~ 
� � � � � � � � � � � � � � � �
� � � � � � � � � � � � � � � �
� � � � � � � � � � � � � � � �
� � � � � � � � � � � � � � � �
� � � � � � � � � � � � � � � �
� � � � � � � � � � � � � � � �
� � � � � � � � � � � � � � � �
� � � � � � � � � � � � � � � �
14 changes: 14 additions & 0 deletions iconvdata/testdata/MIK..UTF8
Original file line number Diff line number Diff line change
@@ -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 { | } ~ 
А Б В Г Д Е Ж З И Й К Л М Н О П
Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я
а б в г д е ж з и й к л м н о п
р с т у ф х ц ч ш щ ъ ы ь э ю я
└ ┴ ┬ ├ ─ ┼ ╣ ║ ╚ ╔ ╩ ╦ ╠ ═ ╬ ┐
░ ▒ ▓ │ ┤ № § ╗ ╝ ┘ ┌ █ ▄ ▌ ▐ ▀
α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩
≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■  
1 change: 1 addition & 0 deletions iconvdata/tst-tables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ cat <<EOF |
TSCII
PT154
RK1048
MIK
#
# Multibyte encodings come here
#
Expand Down
6 changes: 6 additions & 0 deletions localedata/ChangeLog
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
4 changes: 2 additions & 2 deletions localedata/locales/ru_RU
Original file line number Diff line number Diff line change
Expand Up @@ -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>"
Expand All @@ -93,7 +93,7 @@ END LC_MONETARY

LC_NUMERIC
decimal_point "<U002C>"
thousands_sep "<U002E>"
thousands_sep "<U2002>"
grouping 3;3
END LC_NUMERIC

Expand Down

0 comments on commit 39450ec

Please sign in to comment.