[Firebird-checkins] CVS: firebird2/src/intl cs_narrow.c,1.3,1.4 lc_ascii.c,1.3,1.4 lc_latin1.c,1.3,1.4 lc_narrow.c,1.3,1.4 ld.c,1.3,1.4

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/firebird2/src/intl
In directory usw-pr-cvs1:/tmp/cvs-serv9580

Modified Files:
	cs_narrow.c lc_ascii.c lc_latin1.c lc_narrow.c ld.c 
Log Message:
ported changed from fb1.


Index: cs_narrow.c
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/cs_narrow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- cs_narrow.c	9 Apr 2002 23:25:13 -0000	1.3
+++ cs_narrow.c	29 Jun 2002 17:37:21 -0000	1.4
@@ -62,6 +62,15 @@
 	CHARSET_RETURN;
 }
 
+CHARSET_ENTRY (CS_iso_latin2)
+{
+#include "../intl/cs_latin2.h"
+
+    common_8bit_init (csptr, CS_LATIN2, "LATIN2", to_unicode_map,
+                      from_unicode_mapping_array, from_unicode_map);
+    CHARSET_RETURN;
+}
+
 CHARSET_ENTRY(CS_dos_437)
 {
 #include "../intl/cs_437.h"

Index: lc_ascii.c
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/lc_ascii.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- lc_ascii.c	9 Apr 2002 23:25:13 -0000	1.3
+++ lc_ascii.c	29 Jun 2002 17:37:21 -0000	1.4
@@ -102,6 +102,16 @@
 
 #include "../intl/undef.h"
 
+TEXTTYPE_ENTRY (LATIN2_cp_init)
+{
+    static CONST ASCII	POSIX[] = "C.ISO8859_2";
+
+    FAMILY_ASCII (parm1, LATIN2_cp_init, CS_LATIN2, CC_C); 
+    
+    TEXTTYPE_RETURN;
+}
+
+#include "../intl/undef.h"
 
 TEXTTYPE_ENTRY(DOS852_c0_init)
 {

Index: lc_latin1.c
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/lc_latin1.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- lc_latin1.c	9 Apr 2002 23:25:13 -0000	1.3
+++ lc_latin1.c	29 Jun 2002 17:37:21 -0000	1.4
@@ -313,6 +313,18 @@
 
 #include "../intl/undef.h"
 
+TEXTTYPE_ENTRY (WIN1250_c5_init)
+{
+    static CONST ASCII      POSIX[] = "PXW_HUN.WIN1250";
+    
+#include "../intl/anhun.h"
+    
+    FAMILY2 (parm1, WIN1250_c5_init, CS_WIN1250, CC_HUNGARY);
+ 
+    TEXTTYPE_RETURN;
+}                           
+
+#include "../intl/undef.h"
 
 TEXTTYPE_ENTRY(WIN1251_c1_init)
 {

Index: lc_narrow.c
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/lc_narrow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- lc_narrow.c	9 Apr 2002 23:25:13 -0000	1.3
+++ lc_narrow.c	29 Jun 2002 17:37:21 -0000	1.4
@@ -784,6 +784,7 @@
 {
 	switch (IB_CHARSET_ID) {
 	case CS_LATIN1:
+    case CS_LATIN2:
 	case CS_ANSI:
 		return (!(((ch % 128) < 32) || (ch == 127)));
 	case CS_DOS_437:

Index: ld.c
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/ld.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- ld.c	9 Apr 2002 23:25:13 -0000	1.3
+++ ld.c	29 Jun 2002 17:37:21 -0000	1.4
@@ -83,8 +83,10 @@
 EXTERN_texttype(CYRL_c1_init);
 EXTERN_texttype(CYRL_c2_init);
 
+/* Latin 1 character set */
 EXTERN_texttype(LATIN1_cp_init);
 
+/* Latin 1 collations */
 EXTERN_texttype(LAT139_init);
 EXTERN_texttype(LAT140_init);
 EXTERN_texttype(LAT141_init);
@@ -100,11 +102,20 @@
 EXTERN_texttype(LAT153_init);
 EXTERN_texttype(LAT154_init);
 
+/* Latin 2 character set */
+EXTERN_texttype (LATIN2_cp_init);
+
+/* latin 2 collations */
+EXTERN_texttype (ISO88592_c1_init);
+
+
+
 EXTERN_texttype(WIN1250_c0_init);
 EXTERN_texttype(WIN1250_c1_init);
 EXTERN_texttype(WIN1250_c2_init);
 EXTERN_texttype(WIN1250_c3_init);
 EXTERN_texttype(WIN1250_c4_init);
+EXTERN_texttype(WIN1250_c5_init);
 
 EXTERN_texttype(WIN1251_c0_init);
 EXTERN_texttype(WIN1251_c1_init);
@@ -147,6 +158,7 @@
 EXTERN_texttype(JIS230_init);
 
 EXTERN_charset(CS_iso_latin1);
+EXTERN_charset(CS_iso_latin2);
 EXTERN_charset(CS_win1250);
 EXTERN_charset(CS_win1251);
 EXTERN_charset(CS_win1252);
@@ -291,6 +303,7 @@
 	    DRIVER (CS_DOS_850, DOS160_init);
 	    DRIVER (CS_DOS_865, DOS107_init);
 	    DRIVER (CS_LATIN1,  LATIN1_cp_init);
+	    DRIVER (CS_LATIN2,  LATIN2_cp_init);
 	    DRIVER (CS_UNICODE_FSS, UNI201_init);
 	    DRIVER (CS_SJIS,    JIS220_init);
 	    DRIVER (CS_EUCJ,    JIS230_init);