2013-01-30 10:34 UTC+0100 Viktor Szakats (harbour syenar.net)

- src/codepage/cphuutf.c - deleted now obsolete sample * src/codepage/Makefile - src/codepage/cpeswinm.c - src/codepage/cprukoi.c - src/codepage/cpruwin.c - src/codepage/cpuakoi.c - src/codepage/cpuawin.c + src/codepage/cpesmwin.c + src/codepage/cpru1251.c + src/codepage/cprukoi8.c + src/codepage/cpua1251.c + src/codepage/cpuakoi8.c * src/codepage/cpcs852c.c * src/codepage/cpde850m.c * src/codepage/cpdk865.c * src/codepage/cpel437.c * src/codepage/cpes850c.c * src/codepage/cpes850m.c * src/codepage/cpfr850m.c * src/codepage/cpit850m.c * src/codepage/cpnl850.c * src/codepage/cpnl850m.c * src/codepage/cpsk852c.c * src/codepage/cpsv850.c * src/codepage/cpsv850m.c * src/codepage/cpbg866.c * src/codepage/cpbgiso.c * src/codepage/cpbgmik.c * src/codepage/cpbgwin.c * src/codepage/cpcsiso.c * src/codepage/cpcskamc.c * src/codepage/cpcswin.c * src/codepage/cpde850.c * src/codepage/cpdeiso.c * src/codepage/cpdewin.c * src/codepage/cpel737.c * src/codepage/cpeliso.c * src/codepage/cpelwin.c * src/codepage/cpes850.c * src/codepage/cpesiso.c * src/codepage/cpeswin.c * src/codepage/cpfi850.c * src/codepage/cpfr850.c * src/codepage/cpfriso.c * src/codepage/cpfrwin.c * src/codepage/cphe862.c * src/codepage/cphewin.c * src/codepage/cphr646.c * src/codepage/cphr852.c * src/codepage/cphriso.c * src/codepage/cphrwin.c * src/codepage/cphu852.c * src/codepage/cphu852c.c * src/codepage/cphuiso.c * src/codepage/cphuwin.c * src/codepage/cpis850.c * src/codepage/cpis861.c * src/codepage/cpit437.c * src/codepage/cpit850.c * src/codepage/cpitisb.c * src/codepage/cpitiso.c * src/codepage/cpitwin.c * src/codepage/cplt775.c * src/codepage/cpltwin.c * src/codepage/cpno865.c * src/codepage/cppl852.c * src/codepage/cppliso.c * src/codepage/cpplwin.c * src/codepage/cppt850.c * src/codepage/cppt860.c * src/codepage/cpptiso.c * src/codepage/cpro852.c * src/codepage/cproiso.c * src/codepage/cprowin.c * src/codepage/cpru866.c * src/codepage/cpruiso.c * src/codepage/cpskiso.c * src/codepage/cpskkamc.c * src/codepage/cpskwin.c * src/codepage/cpsl646.c * src/codepage/cpsl852.c * src/codepage/cpsliso.c * src/codepage/cpslwin.c * src/codepage/cpsr646.c * src/codepage/cpsrwin.c * src/codepage/cpsv437c.c * src/codepage/cpsviso.c * src/codepage/cpsvwin.c * src/codepage/cptr857.c * src/codepage/cptriso.c * src/codepage/cptrwin.c * src/codepage/cpua1125.c * src/codepage/cpua866.c + converted all 8-bit encoded CPs to UTF-8 * renamed all cp filenames to match internal CP ID ; NOTE: CP646C aka 'Serbian ISO-646C (Cyrillic YUSCII)' was not converted, and I have no idea what to do with it. Do it if you know this. ; Verify them. I was getting all sorts of initialization failures with non-UTF8 ones, after converting all of them, I'm getting one for 'SR646'. ; If this settles, it offers interesting new possiblities, because most of the "CP" modules now essentially differ only in HB_CP_UNITB setting for a given country/language (=culture). ; Now all files inside Harbour repo can ONLY be either 7-bit ASCII or UTF-8. Nothing. Else. Mark all UTF-8 files with (this won't be necessary with GIT): 'svn propset svn:mime-type "text/plain; charset=UTF-8"'
2013-01-30 09:53:50 +00:00
parent d2d3e74952
commit bc70e15c92
76 changed files with 339 additions and 215 deletions
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,120 @@
     * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
 */

+2013-01-30 10:34 UTC+0100 Viktor Szakats (harbour syenar.net)
+  - src/codepage/cphuutf.c
+    - deleted now obsolete sample
+
+  * src/codepage/Makefile
+  - src/codepage/cpeswinm.c
+  - src/codepage/cprukoi.c
+  - src/codepage/cpruwin.c
+  - src/codepage/cpuakoi.c
+  - src/codepage/cpuawin.c
+  + src/codepage/cpesmwin.c
+  + src/codepage/cpru1251.c
+  + src/codepage/cprukoi8.c
+  + src/codepage/cpua1251.c
+  + src/codepage/cpuakoi8.c
+  * src/codepage/cpcs852c.c
+  * src/codepage/cpde850m.c
+  * src/codepage/cpdk865.c
+  * src/codepage/cpel437.c
+  * src/codepage/cpes850c.c
+  * src/codepage/cpes850m.c
+  * src/codepage/cpfr850m.c
+  * src/codepage/cpit850m.c
+  * src/codepage/cpnl850.c
+  * src/codepage/cpnl850m.c
+  * src/codepage/cpsk852c.c
+  * src/codepage/cpsv850.c
+  * src/codepage/cpsv850m.c
+  * src/codepage/cpbg866.c
+  * src/codepage/cpbgiso.c
+  * src/codepage/cpbgmik.c
+  * src/codepage/cpbgwin.c
+  * src/codepage/cpcsiso.c
+  * src/codepage/cpcskamc.c
+  * src/codepage/cpcswin.c
+  * src/codepage/cpde850.c
+  * src/codepage/cpdeiso.c
+  * src/codepage/cpdewin.c
+  * src/codepage/cpel737.c
+  * src/codepage/cpeliso.c
+  * src/codepage/cpelwin.c
+  * src/codepage/cpes850.c
+  * src/codepage/cpesiso.c
+  * src/codepage/cpeswin.c
+  * src/codepage/cpfi850.c
+  * src/codepage/cpfr850.c
+  * src/codepage/cpfriso.c
+  * src/codepage/cpfrwin.c
+  * src/codepage/cphe862.c
+  * src/codepage/cphewin.c
+  * src/codepage/cphr646.c
+  * src/codepage/cphr852.c
+  * src/codepage/cphriso.c
+  * src/codepage/cphrwin.c
+  * src/codepage/cphu852.c
+  * src/codepage/cphu852c.c
+  * src/codepage/cphuiso.c
+  * src/codepage/cphuwin.c
+  * src/codepage/cpis850.c
+  * src/codepage/cpis861.c
+  * src/codepage/cpit437.c
+  * src/codepage/cpit850.c
+  * src/codepage/cpitisb.c
+  * src/codepage/cpitiso.c
+  * src/codepage/cpitwin.c
+  * src/codepage/cplt775.c
+  * src/codepage/cpltwin.c
+  * src/codepage/cpno865.c
+  * src/codepage/cppl852.c
+  * src/codepage/cppliso.c
+  * src/codepage/cpplwin.c
+  * src/codepage/cppt850.c
+  * src/codepage/cppt860.c
+  * src/codepage/cpptiso.c
+  * src/codepage/cpro852.c
+  * src/codepage/cproiso.c
+  * src/codepage/cprowin.c
+  * src/codepage/cpru866.c
+  * src/codepage/cpruiso.c
+  * src/codepage/cpskiso.c
+  * src/codepage/cpskkamc.c
+  * src/codepage/cpskwin.c
+  * src/codepage/cpsl646.c
+  * src/codepage/cpsl852.c
+  * src/codepage/cpsliso.c
+  * src/codepage/cpslwin.c
+  * src/codepage/cpsr646.c
+  * src/codepage/cpsrwin.c
+  * src/codepage/cpsv437c.c
+  * src/codepage/cpsviso.c
+  * src/codepage/cpsvwin.c
+  * src/codepage/cptr857.c
+  * src/codepage/cptriso.c
+  * src/codepage/cptrwin.c
+  * src/codepage/cpua1125.c
+  * src/codepage/cpua866.c
+    + converted all 8-bit encoded CPs to UTF-8
+    * renamed all cp filenames to match internal CP ID
+    ; NOTE: CP646C aka 'Serbian ISO-646C (Cyrillic YUSCII)'
+            was not converted, and I have no idea what to do
+            with it. Do it if you know this.
+    ; Verify them.
+      I was getting all sorts of initialization failures
+      with non-UTF8 ones, after converting all of them,
+      I'm getting one for 'SR646'.
+    ; If this settles, it offers interesting new possiblities,
+      because most of the "CP" modules now essentially differ
+      only in HB_CP_UNITB setting for a given country/language (=culture).
+
+  ; Now all files inside Harbour repo can ONLY be either
+    7-bit ASCII or UTF-8. Nothing. Else.
+    Mark all UTF-8 files with (this won't be necessary with GIT):
+      'svn propset svn:mime-type "text/plain; charset=UTF-8"'
+
 2013-01-30 09:35 UTC+0100 Viktor Szakats (harbour syenar.net)
  * src/codepage/cpcs852.c
  * src/codepage/cpsk852.c
--- a/harbour/src/codepage/Makefile
+++ b/harbour/src/codepage/Makefile
@@ -32,8 +32,8 @@ C_SOURCES := \
   cpes850c.c \
   cpes850m.c \
   cpesiso.c \
+   cpesmwin.c \
   cpeswin.c \
-   cpeswinm.c \
   cpfi850.c \
   cpfr850.c \
   cpfr850m.c \
@@ -72,10 +72,10 @@ C_SOURCES := \
   cpro852.c \
   cproiso.c \
   cprowin.c \
+   cpru1251.c \
   cpru866.c \
   cpruiso.c \
-   cprukoi.c \
-   cpruwin.c \
+   cprukoi8.c \
   cpsk852.c \
   cpsk852c.c \
   cpskiso.c \
@@ -97,9 +97,9 @@ C_SOURCES := \
   cptriso.c \
   cptrwin.c \
   cpua1125.c \
+   cpua1251.c \
   cpua866.c \
-   cpuakoi.c \
-   cpuawin.c \
+   cpuakoi8.c \
   \
   uc1125.c \
   uc1250.c \
--- a/harbour/src/codepage/cpbg866.c
+++ b/harbour/src/codepage/cpbg866.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Bulgarian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "€<EFBFBD>‚ƒ„…†‡ˆ‰Š‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™š›œ<EFBFBD>žŸ"
-#define HB_CP_LOWER     " ¡¢£¤¥¦§¨©ª«¬®¯àáâãäåæçèéêëìíîï"
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpbgiso.c
+++ b/harbour/src/codepage/cpbgiso.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Bulgarian ISO-8859-5"
 #define HB_CP_UNITB     HB_UNITB_8859_5
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-#define HB_CP_LOWER     "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîï"
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpbgmik.c
+++ b/harbour/src/codepage/cpbgmik.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Bulgarian MIK"
 #define HB_CP_UNITB     HB_UNITB_MIK
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "€<EFBFBD>‚ƒ„…†‡ˆ‰Š‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™š›œ<EFBFBD>žŸ"
-#define HB_CP_LOWER     " ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿"
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpbgwin.c
+++ b/harbour/src/codepage/cpbgwin.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Bulgarian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-#define HB_CP_LOWER     "àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpcsiso.c
+++ b/harbour/src/codepage/cpcsiso.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Czech ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCÈDÏEÉÌËFGH.CH.IÍJKLMNÒOÓÖPQRØS©T«UÚÙÜVWXYÝZ®"
-#define HB_CP_LOWER     "aáäbcèdïeéìëfgh.ch.iíjklmnòoóöpqrøs¹t»uúùüvwxyýz¾"
+#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚËFGH.CH.IÍJKLMNŇOÓÖPQRŘSŠTŤUÚŮÜVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdďeéěëfgh.ch.iíjklmnňoóöpqrřsštťuúůüvwxyýzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpcskamc.c
+++ b/harbour/src/codepage/cpcskamc.c
@@ -17,8 +17,9 @@
 #define HB_CP_UNITB     HB_UNITB_KAM
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_CSSORT    HB_CDP_CSSORT_MIXED
-#define HB_CP_UPPER     "A<EFBFBD>ŽBC€D…E<EFBFBD>‰FGHI‹JKLŠœMN¥O•§™PQR«žS›T†U—¦šVWXY<EFBFBD>Z’"
-#define HB_CP_LOWER     "a „bc‡dƒe‚ˆfghi¡jkl<EFBFBD>Œmn¤o¢“”pqrª©s¨tŸu£–<EFBFBD>vwxy˜z‘"
+#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚFGHIÍJKLĹĽMNŇOÓÔÖPQRŔŘSŠTŤUÚŮÜVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdďeéěfghiíjklĺľmnňoóôöpqrŕřsštťuúůüvwxyýzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpcswin.c
+++ b/harbour/src/codepage/cpcswin.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Czech Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCÈDÏEÉÌËFGH.CH.IÍJKLMNÒOÓÖPQRØSŠT<EFBFBD>UÚÙÜVWXYÝZŽ"
-#define HB_CP_LOWER     "aáäbcèdïeéìëfgh.ch.iíjklmnòoóöpqrøsšt<EFBFBD>uúùüvwxyýzž"
+#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚËFGH.CH.IÍJKLMNŇOÓÖPQRŘSŠTŤUÚŮÜVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdďeéěëfgh.ch.iíjklmnňoóöpqrřsštťuúůüvwxyýzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpde850.c
+++ b/harbour/src/codepage/cpde850.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "German CP-850 (ntxger.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AŽBCDEFGHIJKLMNO™PQRS TUšVWXYZ"
-#define HB_CP_LOWER     "a„bcdefghijklmno”pqrsátu<EFBFBD>vwxyz"
+#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
+#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
+#define HB_CP_UTF8

 #if 0 /* VERIFIED: 20091116 */

--- a/harbour/src/codepage/cpdeiso.c
+++ b/harbour/src/codepage/cpdeiso.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "German ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
-#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
+#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
+#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpdewin.c
+++ b/harbour/src/codepage/cpdewin.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "German Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
-#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
+#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
+#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpel737.c
+++ b/harbour/src/codepage/cpel737.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Greek CP-737"
 #define HB_CP_UNITB     HB_UNITB_737
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "€~ê<>‚ƒ„~ë…†~ì‡ˆ~í‰Š‹Œ<E280B9>Ž~î<><C3AE>‘‘’“~ï”•–—~ð"
-#define HB_CP_LOWER     "˜~á™š›œ~â<>ž~ãŸ ~å¡¢£¤¥¦~æ§¨©ª«¬~ç®¯à~é"
+#define HB_CP_UPPER     "Α~ΆΒΓΔΕ~ΈΖΗ~ΉΘΙ~ΊΚΛΜΝΞΟ~ΌΠΡΣΣΤΥ~ΎΦΧΨΩ~Ώ"
+#define HB_CP_LOWER     "α~άβγδε~έζη~ήθι~ίκλμνξο~όπρσςτυ~ύφχψω~ώ"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpeliso.c
+++ b/harbour/src/codepage/cpeliso.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Greek ISO-8859-7"
 #define HB_CP_UNITB     HB_UNITB_8859_7
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "Á~¶ÂÃÄÅ~¸ÆÇ~¹ÈÉ~ºÊËÌÍÎÏ~¼ÐÑÓÓÔÕ~¾Ö×ØÙ~¿"
-#define HB_CP_LOWER     "á~Üâãäå~Ýæç~Þèé~ßêëìíîï~üðñóòôõ~ýö÷øù~þ"
+#define HB_CP_UPPER     "Α~ΆΒΓΔΕ~ΈΖΗ~ΉΘΙ~ΊΚΛΜΝΞΟ~ΌΠΡΣΣΤΥ~ΎΦΧΨΩ~Ώ"
+#define HB_CP_LOWER     "α~άβγδε~έζη~ήθι~ίκλμνξο~όπρσςτυ~ύφχψω~ώ"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpelwin.c
+++ b/harbour/src/codepage/cpelwin.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Greek ANSI CP-1253"
 #define HB_CP_UNITB     HB_UNITB_1253
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "Á~¢ÂÃÄÅ~¸ÆÇ~¹ÈÉ~ºÊËÌÍÎÏ~¼ÐÑÓÓÔÕ~¾Ö×ØÙ~¿"
-#define HB_CP_LOWER     "á~Üâãäå~Ýæç~Þèé~ßêëìíîï~üðñóòôõ~ýö÷øù~þ"
+#define HB_CP_UPPER     "Α~ΆΒΓΔΕ~ΈΖΗ~ΉΘΙ~ΊΚΛΜΝΞΟ~ΌΠΡΣΣΤΥ~ΎΦΧΨΩ~Ώ"
+#define HB_CP_LOWER     "α~άβγδε~έζη~ήθι~ίκλμνξο~όπρσςτυ~ύφχψω~ώ"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpes850.c
+++ b/harbour/src/codepage/cpes850.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Spanish (Modern) CP-850"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "Aµ·ŽBC€DE<EFBFBD>ÔÓFGHIÖÞØJKLMN¥Oàã™PQRSTUéëšVWXYZ"
-#define HB_CP_LOWER     "a …„bc‡de‚Š‰fghi¡<EFBFBD>‹jklmn¤o¢•”pqrstu£—<EFBFBD>vwxyz"
+#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
+#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpesiso.c
+++ b/harbour/src/codepage/cpesiso.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Spanish (Modern) ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
-#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
+#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpesmwin.c
+++ b/harbour/src/codepage/cpesmwin.c
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Spanish (Modern) ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
-#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
+#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpeswin.c
+++ b/harbour/src/codepage/cpeswin.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Spanish (Modern) Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
-#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
+#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpfi850.c
+++ b/harbour/src/codepage/cpfi850.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Finnish CP-850 (ntxfin.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCDE<EFBFBD>FGHIJKLMNOPQRSTUVWXYšZ<EFBFBD>Ž™"
-#define HB_CP_LOWER     "abcde‚fghijklmnopqrstuvwxy<EFBFBD>z†„”"
+#define HB_CP_UPPER     "ABCDEÉFGHIJKLMNOPQRSTUVWXYÜZÅÄÖ"
+#define HB_CP_LOWER     "abcdeéfghijklmnopqrstuvwxyüzåäö"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpfr850.c
+++ b/harbour/src/codepage/cpfr850.c
@@ -17,7 +17,8 @@
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_UPPER     "AAAAABCDEEEEEFGHIIIIIJKLMNOOOOOPQRSTUUUUUVWXYZ"
-#define HB_CP_LOWER     "a …ƒ„bcde‚Šˆ‰fghi¡<EFBFBD>Œ‹jklmno¢•“”pqrstu£—–<EFBFBD>vwxyz"
+#define HB_CP_LOWER     "aáàâäbcdeéèêëfghiíìîïjklmnoóòôöpqrstuúùûüvwxyz"
+#define HB_CP_UTF8

 #if 0 /* VERIFIED: 20091116 */

--- a/harbour/src/codepage/cpfriso.c
+++ b/harbour/src/codepage/cpfriso.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "French ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "A~Á~À~Â~ÄBCDE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMNO~Ó~Ò~Ô~ÖPQRSTU~Ú~Ù~Û~ÜVWXYZ"
-#define HB_CP_LOWER     "a~á~à~â~äbcde~é~è~ê~ëfghi~í~ì~î~ïjklmno~ó~ò~ô~öpqrstu~ú~ù~û~üvwxyz"
+#define HB_CP_UPPER     "A~Á~À~Â~ÄBCDE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMNO~Ó~Ò~Ô~ÖPQRSTU~Ú~Ù~Û~ÜVWXYZ"
+#define HB_CP_LOWER     "a~á~à~â~äbcde~é~è~ê~ëfghi~í~ì~î~ïjklmno~ó~ò~ô~öpqrstu~ú~ù~û~üvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpfrwin.c
+++ b/harbour/src/codepage/cpfrwin.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "French Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "A~Á~À~Â~ÄBCDE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMNO~Ó~Ò~Ô~ÖPQRSTU~Ú~Ù~Û~ÜVWXYZ"
-#define HB_CP_LOWER     "a~á~à~â~äbcde~é~è~ê~ëfghi~í~ì~î~ïjklmno~ó~ò~ô~öpqrstu~ú~ù~û~üvwxyz"
+#define HB_CP_UPPER     "A~Á~À~Â~ÄBCDE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMNO~Ó~Ò~Ô~ÖPQRSTU~Ú~Ù~Û~ÜVWXYZ"
+#define HB_CP_LOWER     "a~á~à~â~äbcde~é~è~ê~ëfghi~í~ì~î~ïjklmno~ó~ò~ô~öpqrstu~ú~ù~û~üvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphe862.c
+++ b/harbour/src/codepage/cphe862.c
@@ -56,6 +56,7 @@
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_UPPER     ""
 #define HB_CP_LOWER     ""
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphewin.c
+++ b/harbour/src/codepage/cphewin.c
@@ -56,6 +56,7 @@
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_UPPER     ""
 #define HB_CP_LOWER     ""
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphr646.c
+++ b/harbour/src/codepage/cphr646.c
@@ -6,7 +6,7 @@
 * Harbour Project source code:
 * National Collation Support Module (HR646)
 *
- * Copyright 2003 Vlado Miholic <Vladimir.Miholic@sk.hinet.hr>
+ * Copyright 2003 Vlado Miholic <Vladimir.MiholicŽsk.hinet.hr>
 * www - http://harbour-project.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Croatian ISO-646 (CROSCII)"
 #define HB_CP_UNITB     HB_UNITB_646YU
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABC^]D\\EFGHIJKLMNOPQRS[TUVWXYZ@"
-#define HB_CP_LOWER     "abc~}d|efghijklmnopqrs{tuvwxyz`"
+#define HB_CP_UPPER     "ABCČĆDĐĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphr852.c
+++ b/harbour/src/codepage/cphr852.c
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Croatian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABC¬<EFBFBD>DÑEFGHIJKLMNOPQRSæTUVWXYZ¦"
-#define HB_CP_LOWER     "abcŸ†dÐefghijklmnopqrsçtuvwxyz§"
+#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphriso.c
+++ b/harbour/src/codepage/cphriso.c
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Croatian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCÈÆDÐEFGHIJKLMNOPQRS©TUVWXYZ®"
-#define HB_CP_LOWER     "abcèædðefghijklmnopqrs¹tuvwxyz¾"
+#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphrwin.c
+++ b/harbour/src/codepage/cphrwin.c
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Croatian Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCÈÆDÐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcèædðefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphu852.c
+++ b/harbour/src/codepage/cphu852.c
@@ -12,14 +12,15 @@
 * This file is generated automatically by cpinfo.prg
 */

-/* NOTE: Ž/„ has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */
+/* NOTE: Ä/ä has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */

 #define HB_CP_ID        HU852
 #define HB_CP_INFO      "Hungarian CP-852 (sixhu852.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AµŽBCDE<EFBFBD>FGHIÖJKLMNOà™ŠPQRSTUéšëVWXYZ"
-#define HB_CP_LOWER     "a „bcde‚fghi¡jklmno¢”‹pqrstu£<EFBFBD>ûvwxyz"
+#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
+#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphu852c.c
+++ b/harbour/src/codepage/cphu852c.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Hungarian CP-852 (ntxhu852.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "A<EFBFBD>µŽBCDE<EFBFBD>FGHI<EFBFBD>ÖJKLMNO•à™§ ŠPQRSTU—éš˜ ëVWXYZ"
-#define HB_CP_LOWER     "a  „bcde‚fghi ¡jklmno ¢” “‹pqrstu £<EFBFBD> –ûvwxyz"
+#define HB_CP_UPPER     "AĆÁÄBCDEÉFGHIŹÍJKLMNOĽÓÖž ŐPQRSTUŚÚÜś ŰVWXYZ"
+#define HB_CP_LOWER     "a áäbcdeéfghi íjklmno óö ôőpqrstu úü ľűvwxyz"
+#define HB_CP_UTF8

 #if 0 /* VERIFIED: 20091116 */

--- a/harbour/src/codepage/cphuiso.c
+++ b/harbour/src/codepage/cphuiso.c
@@ -50,14 +50,15 @@
 *
 */

-/* NOTE: Ä/ä has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */
+/* NOTE: Ä/ä has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */

 #define HB_CP_ID        HUISO
 #define HB_CP_INFO      "Hungarian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖÕPQRSTUÚÜÛVWXYZ"
-#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöõpqrstuúüûvwxyz"
+#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
+#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cphuutf.c
+++ b/harbour/src/codepage/cphuutf.c
@@ -1,63 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * Harbour Project source code:
- * National Collation Support Module (HUUTF) (EXPERIMENTAL)
- *
- * Copyright 1999-2005 Viktor Szakats (harbour syenar.net)
- * www - http://harbour-project.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.txt.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
- *
- * As a special exception, the Harbour Project gives permission for
- * additional uses of the text contained in its release of Harbour.
- *
- * The exception is that, if you link the Harbour libraries with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the Harbour library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the Harbour
- * Project under the name Harbour.  If you copy code from other
- * Harbour Project or Free Software Foundation releases into a copy of
- * Harbour, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for Harbour, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- *
- */
-
-/* NOTE: Ä/ä has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */
-
-#define HB_CP_ID        HUUTF
-#define HB_CP_INFO      "Hungarian UTF-8"
-#define HB_CP_UNITB     HB_UNITB_UNDEF /* TOFIX: change to HB_UNITB_UTF8, when implemented */
-#define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
-#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"
-
-/* include CP registration code */
-#include "hbcdpreg.h"
--- a/harbour/src/codepage/cphuwin.c
+++ b/harbour/src/codepage/cphuwin.c
@@ -50,14 +50,15 @@
 *
 */

-/* NOTE: Ä/ä has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */
+/* NOTE: Ä/ä has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */

 #define HB_CP_ID        HUWIN
 #define HB_CP_INFO      "Hungarian Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖÕPQRSTUÚÜÛVWXYZ"
-#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöõpqrstuúüûvwxyz"
+#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
+#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpis850.c
+++ b/harbour/src/codepage/cpis850.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Icelandic CP-850 (ntxic850.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AµBCDÑE<EFBFBD>FGHIÖJKLMNOàPQRSTUéVWXYíZè’™"
-#define HB_CP_LOWER     "a bcdÐe‚fghi¡jklmno¢pqrstu£vwxyìzç‘”"
+#define HB_CP_UPPER     "AÁBCDÐEÉFGHIÍJKLMNOÓPQRSTUÚVWXYÝZÞÆÖ"
+#define HB_CP_LOWER     "aábcdðeéfghiíjklmnoópqrstuúvwxyýzþæö"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpis861.c
+++ b/harbour/src/codepage/cpis861.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Icelandic CP-861 (ntxic861.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_861
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "A¤BCD‹E<EFBFBD>FGHI¥JKLMNO¦PQRSTU§VWXY—Z<EFBFBD>’™"
-#define HB_CP_LOWER     "a bcdŒe‚fghi¡jklmno¢pqrstu£vwxy˜z•‘”"
+#define HB_CP_UPPER     "AÁBCDÐEÉFGHIÍJKLMNOÓPQRSTUÚVWXYÝZÞÆÖ"
+#define HB_CP_LOWER     "aábcdðeéfghiíjklmnoópqrstuúvwxyýzþæö"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpit437.c
+++ b/harbour/src/codepage/cpit437.c
@@ -53,8 +53,9 @@
 #define HB_CP_INFO      "Italian CP-437"
 #define HB_CP_UNITB     HB_UNITB_437
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AAAAŽ<EFBFBD>BCDEE<EFBFBD>FGHIIIJKLMNOOOPQRSTUUUVWXYZ"
-#define HB_CP_LOWER     "a… ƒ„†bcdeŠ‚fghi<EFBFBD>¡jklmno•¢pqrstu—£vwxyz"
+#define HB_CP_UPPER     "AAAAÄÅBCDEEÉFGHIIIJKLMNOOOPQRSTUUUVWXYZ"
+#define HB_CP_LOWER     "aàáâäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpit850.c
+++ b/harbour/src/codepage/cpit850.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Italian CP-850 (ntxita.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AAABCDE<EFBFBD>EFGHIIIJKLMNOOOPQRSTUUUVWXYZ"
-#define HB_CP_LOWER     "a… bcde‚Šfghi<EFBFBD>¡jklmno•¢pqrstu—£vwxyz"
+#define HB_CP_UPPER     "AAABCDEÉEFGHIIIJKLMNOOOPQRSTUUUVWXYZ"
+#define HB_CP_LOWER     "aàábcdeéèfghiìíjklmnoòópqrstuùúvwxyz"
+#define HB_CP_UTF8

 #if 0 /* VERIFIED: 20091116 */

--- a/harbour/src/codepage/cpitisb.c
+++ b/harbour/src/codepage/cpitisb.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Italian ISO-8859-1b (with BOX characters)"
 #define HB_CP_UNITB     HB_UNITB_8859_1B
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ"
-#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#define HB_CP_UPPER     "A└┴┬├─┼BCDE╚╔FGHI╠═JKLMNO╥╙PQRSTU┘┌VWXYZ"
+#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpitiso.c
+++ b/harbour/src/codepage/cpitiso.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Italian ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ"
-#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#define HB_CP_UPPER     "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ"
+#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpitwin.c
+++ b/harbour/src/codepage/cpitwin.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Italian Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ"
-#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#define HB_CP_UPPER     "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ"
+#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cplt775.c
+++ b/harbour/src/codepage/cplt775.c
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Lithuanian CP-775"
 #define HB_CP_UNITB     HB_UNITB_775
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AµBC¶DE·¸FGHI½YJKLMNOPQRS¾TUÆÇVWXZÏ"
-#define HB_CP_LOWER     "aÐbcÑdeÒÓfghiÔyjklmnopqrsÕtuÖ×vwxzØ"
+#define HB_CP_UPPER     "AĄBCČDEĘĖFGHIĮYJKLMNOPQRSŠTUŲŪVWXZŽ"
+#define HB_CP_LOWER     "aąbcčdeęėfghiįyjklmnopqrsštuųūvwxzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpltwin.c
+++ b/harbour/src/codepage/cpltwin.c
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Lithuanian Windows-1257"
 #define HB_CP_UNITB     HB_UNITB_1257
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÀBCÈDEÆËFGHIÁYJKLMNOPQRSÐTUØÛVWXZÞ"
-#define HB_CP_LOWER     "aàbcèdeæëfghiáyjklmnopqrsðtuøûvwxzþ"
+#define HB_CP_UPPER     "AĄBCČDEĘĖFGHIĮYJKLMNOPQRSŠTUŲŪVWXZŽ"
+#define HB_CP_LOWER     "aąbcčdeęėfghiįyjklmnopqrsštuųūvwxzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpno865.c
+++ b/harbour/src/codepage/cpno865.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Norwegian CP-865 (ntxnor.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_865
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCDE<EFBFBD>FGHIJKLMNOPQRSTUVWXYšZ’ <20><>"
-#define HB_CP_LOWER     "abcdeŠfghijklmnopqrstuvwxy<EFBFBD>z‘‚›†"
+#define HB_CP_UPPER     "ABCDEÉFGHIJKLMNOPQRSTUVWXYÜZÆ ØÅ"
+#define HB_CP_LOWER     "abcdeèfghijklmnopqrstuvwxyüzæéøå"
+#define HB_CP_UTF8

 #if 0 /* VERIFIED: 20091116 */

--- a/harbour/src/codepage/cppl852.c
+++ b/harbour/src/codepage/cppl852.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Polish CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "A¤BC<EFBFBD>DE¨FGHIJKL<EFBFBD>MNãOàPQRS—TUVWXYZ<EFBFBD>½"
-#define HB_CP_LOWER     "a¥bc†de©fghijklˆmnäo¢pqrs˜tuvwxyz«¾"
+#define HB_CP_UPPER     "AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"
+#define HB_CP_LOWER     "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cppliso.c
+++ b/harbour/src/codepage/cppliso.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Polish ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "A¡BCÆDEÊFGHIJKL£MNÑOÓPQRS¦TUVWXYZ¬¯"
-#define HB_CP_LOWER     "a±bcædeêfghijkl³mnñoópqrs¶tuvwxyz¼¿"
+#define HB_CP_UPPER     "AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"
+#define HB_CP_LOWER     "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpplwin.c
+++ b/harbour/src/codepage/cpplwin.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Polish Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "A¥BCÆDEÊFGHIJKL£MNÑOÓPQRSŒTUVWXYZ<EFBFBD>¯"
-#define HB_CP_LOWER     "a¹bcædeêfghijkl³mnñoópqrsœtuvwxyzŸ¿"
+#define HB_CP_UPPER     "AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"
+#define HB_CP_LOWER     "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cppt850.c
+++ b/harbour/src/codepage/cppt850.c
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Portuguese CP-850"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "Aµ·¶ÇŽBC€DE<EFBFBD>ÔÒFGHIÖÞ×ØJKLMN¥Oàãâå™PQRSTUéëêšVWXYZ"
-#define HB_CP_LOWER     "a …ƒÆ„bc‡de‚Šˆfghi¡<EFBFBD>Œ‹jklmn¤o¢•“ä”pqrstu£—–<EFBFBD>vwxyz"
+#define HB_CP_UPPER     "AÁÀÂÃÄBCÇDEÉÈÊFGHIÍÌÎÏJKLMNÑOÓÒÔÕÖPQRSTUÚÙÛÜVWXYZ"
+#define HB_CP_LOWER     "aáàâãäbcçdeéèêfghiíìîïjklmnñoóòôõöpqrstuúùûüvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cppt860.c
+++ b/harbour/src/codepage/cppt860.c
@@ -18,6 +18,7 @@
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_UPPER     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 #define HB_CP_LOWER     "abcdefghijklmnopqrstuvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpptiso.c
+++ b/harbour/src/codepage/cpptiso.c
@@ -56,8 +56,9 @@
 #define HB_CP_INFO      "Portuguese ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÂÃÄBCÇDEÉÈÊFGHIÍÌÎÏJKLMNÑOÓÒÔÕÖPQRSTUÚÙÛÜVWXYZ"
-#define HB_CP_LOWER     "aáàâãäbcçdeéèêfghiíìîïjklmnñoóòôõöpqrstuúùûüvwxyz"
+#define HB_CP_UPPER     "AÁÀÂÃÄBCÇDEÉÈÊFGHIÍÌÎÏJKLMNÑOÓÒÔÕÖPQRSTUÚÙÛÜVWXYZ"
+#define HB_CP_LOWER     "aáàâãäbcçdeéèêfghiíìîïjklmnñoóòôõöpqrstuúùûüvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpro852.c
+++ b/harbour/src/codepage/cpro852.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Romanian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÆ¶BCDEFGHI×JKLMNOPQRS¸TÝUVWXYZ"
-#define HB_CP_LOWER     "aÇƒbcdefghiŒjklmnopqrstîuvwxyz"
+#define HB_CP_UPPER     "AĂÂBCDEFGHIÎJKLMNOPQRSŞTŢUVWXYZ"
+#define HB_CP_LOWER     "aăâbcdefghiîjklmnopqrsştţuvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cproiso.c
+++ b/harbour/src/codepage/cproiso.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Romanian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÃÂBCDEFGHIÎJKLMNOPQRSªTÞUVWXYZ"
-#define HB_CP_LOWER     "aãâbcdefghiîjklmnopqrsºtþuvwxyz"
+#define HB_CP_UPPER     "AĂÂBCDEFGHIÎJKLMNOPQRSŞTŢUVWXYZ"
+#define HB_CP_LOWER     "aăâbcdefghiîjklmnopqrsştţuvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cprowin.c
+++ b/harbour/src/codepage/cprowin.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Romanian Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÃÂBCDEFGHIÎJKLMNOPQRSªTÞUVWXYZ"
-#define HB_CP_LOWER     "aãâbcdefghiîjklmnopqrsºtþuvwxyz"
+#define HB_CP_UPPER     "AĂÂBCDEFGHIÎJKLMNOPQRSŞTŢUVWXYZ"
+#define HB_CP_LOWER     "aăâbcdefghiîjklmnopqrsştţuvwxyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpru1251.c
+++ b/harbour/src/codepage/cpru1251.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Russian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-#define HB_CP_LOWER     "àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpru866.c
+++ b/harbour/src/codepage/cpru866.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Russian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "€<EFBFBD>‚ƒ„…†‡ˆ‰Š‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™š›œ<EFBFBD>žŸ"
-#define HB_CP_LOWER     " ¡¢£¤¥¦§¨©ª«¬®¯àáâãäåæçèéêëìíîï"
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpruiso.c
+++ b/harbour/src/codepage/cpruiso.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Russian ISO-8859-5"
 #define HB_CP_UNITB     HB_UNITB_8859_5
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ¡¤§®"
-#define HB_CP_LOWER     "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïñô÷þ"
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯЁЄЇЎ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюяёєїў"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cprukoi8.c
+++ b/harbour/src/codepage/cprukoi8.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Russian KOI-8"
 #define HB_CP_UNITB     HB_UNITB_KOI_8
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "áâ÷çäåöúéêëìíîïðòóôõæèãþûýÿùøüàñ"
-#define HB_CP_LOWER     "ÁÂ×ÇÄÅÖÚÉÊËÌÍÎÏÐÒÓÔÕÆÈÃÞÛÝßÙØÜÀÑ"
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpskiso.c
+++ b/harbour/src/codepage/cpskiso.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Slovak ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCÈDÏ.DZ..D®.EÉÌËFGH.CH.IÍJKLÅ¥MNÒOÓÔÖÕPQRÀØS©T«UÚÙÜÛVWXYÝZ®"
-#define HB_CP_LOWER     "aáäbcèdï.dz..d¾.eéìëfgh.ch.iíjklåµmnòoóôöõpqràøs¹t»uúùüûvwxyýz¾"
+#define HB_CP_UPPER     "AÁÄBCČDĎ.DZ..DŽ.EÉĚËFGH.CH.IÍJKLĹĽMNŇOÓÔÖŐPQRŔŘSŠTŤUÚŮÜŰVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdď.dz..dž.eéěëfgh.ch.iíjklĺľmnňoóôöőpqrŕřsštťuúůüűvwxyýzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpskkamc.c
+++ b/harbour/src/codepage/cpskkamc.c
@@ -17,8 +17,9 @@
 #define HB_CP_UNITB     HB_UNITB_KAM
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_CSSORT    HB_CDP_CSSORT_MIXED
-#define HB_CP_UPPER     "A<EFBFBD>ŽBC€D…E<EFBFBD>‰FGHI‹JKLŠœMN¥O•§™PQR«žS›T†U—¦šVWXY<EFBFBD>Z’"
-#define HB_CP_LOWER     "a „bc‡dƒe‚ˆfghi¡jkl<EFBFBD>Œmn¤o¢“”pqrª©s¨tŸu£–<EFBFBD>vwxy˜z‘"
+#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚFGHIÍJKLĹĽMNŇOÓÔÖPQRŔŘSŠTŤUÚŮÜVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdďeéěfghiíjklĺľmnňoóôöpqrŕřsštťuúůüvwxyýzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpskwin.c
+++ b/harbour/src/codepage/cpskwin.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Slovak Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCÈDÏ.DZ..DŽ.EÉÌËFGH.CH.IÍJKLÅ¼MNÒOÓÔÖÕPQRÀØSŠT<EFBFBD>UÚÙÜÛVWXYÝZŽ"
-#define HB_CP_LOWER     "aáäbcèdï.dz..dž.eéìëfgh.ch.iíjklå¾mnòoóôöõpqràøsšt<EFBFBD>uúùüûvwxyýzž"
+#define HB_CP_UPPER     "AÁÄBCČDĎ.DZ..DŽ.EÉĚËFGH.CH.IÍJKLĹĽMNŇOÓÔÖŐPQRŔŘSŠTŤUÚŮÜŰVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdď.dz..dž.eéěëfgh.ch.iíjklĺľmnňoóôöőpqrŕřsštťuúůüűvwxyýzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpsl646.c
+++ b/harbour/src/codepage/cpsl646.c
@@ -6,9 +6,9 @@
 * Harbour Project source code:
 * National Collation Support Module (SL646)
 *
- * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
+ * Copyright 2002 Alexander S.Kresin <alexŽbelacy.belgorod.su>
 * www - http://harbour-project.org
- * 2003 Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+ * 2003 Mitja Podgornik <Mitja.PodgornikŽzgs.gov.si>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Slovenian ISO-646 (SLOSCII)"
 #define HB_CP_UNITB     HB_UNITB_646YU
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABC^]D\\EFGHIJKLMNOPQRS[TUVWXYZ@"
-#define HB_CP_LOWER     "abc~}d|efghijklmnopqrs{tuvwxyz`"
+#define HB_CP_UPPER     "ABCČĆDĐĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpsl852.c
+++ b/harbour/src/codepage/cpsl852.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Slovenian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABC¬<EFBFBD>DÑEFGHIJKLMNOPQRSæTUVWXYZ¦"
-#define HB_CP_LOWER     "abcŸ†dÐefghijklmnopqrsçtuvwxyz§"
+#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpsliso.c
+++ b/harbour/src/codepage/cpsliso.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Slovenian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCÈÆDÐEFGHIJKLMNOPQRS©TUVWXYZ®"
-#define HB_CP_LOWER     "abcèædðefghijklmnopqrs¹tuvwxyz¾"
+#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpslwin.c
+++ b/harbour/src/codepage/cpslwin.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Slovenian CP-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCÈÆDÐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcèædðefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpsr646.c
+++ b/harbour/src/codepage/cpsr646.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Serbian ISO-646 (YUSCII)"
 #define HB_CP_UNITB     HB_UNITB_646YU
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABC^]D\\EFGHIJKLMNOPQRS[TUVWXYZ@"
-#define HB_CP_LOWER     "abc~}d|efghijklmnopqrs{tuvwxyz`"
+#define HB_CP_UPPER     "ABCČĆDĐĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpsrwin.c
+++ b/harbour/src/codepage/cpsrwin.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Serbian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ÀÁÂÃÄ€ÅÆÇÈ£ÊËŠÌÍŒÎÏÐÑÒŽÓÔÕÖ×<EFBFBD>Ø"
-#define HB_CP_LOWER     "àáâãä<EFBFBD>åæçè¼êëšìíœîïðñòžóôõö÷Ÿø"
+#define HB_CP_UPPER     "АБВГДЂЕЖЗИЈКЛЉМНЊОПРСТЋУФХЦЧЏШ"
+#define HB_CP_LOWER     "абвгдђежзијклљмнњопрстћуфхцчџш"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpsv437c.c
+++ b/harbour/src/codepage/cpsv437c.c
@@ -67,7 +67,7 @@
   For sharing data with Clipper, assuming that the chr(146) and chr(145)
   problem is properly taken care of in your code, this codepage version
   must be used. For correct collation according to the book "Svenska
-   skrivregler" (Swedish Writing Rules) by Svenska Spr†kn„mnden (the Swedish
+   skrivregler" (Swedish Writing Rules) by Svenska Språknämnden (the Swedish
   Language Council), use the SV850 version instead. That will of course
   not be Clipper compatible.
 */
@@ -84,8 +84,9 @@
 #define HB_CP_INFO      "Swedish CP-437"
 #define HB_CP_UNITB     HB_UNITB_437
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCDE<EFBFBD>FGHIJKLMNOPQRSTUVWXYšZ<EFBFBD>Ž™"
-#define HB_CP_LOWER     "abcdeŠfghijklmnopqrstuvwxy<EFBFBD>z†„”"
+#define HB_CP_UPPER     "ABCDEÉFGHIJKLMNOPQRSTUVWXYÜZÅÄÖ"
+#define HB_CP_LOWER     "abcdeèfghijklmnopqrstuvwxyüzåäö"
+#define HB_CP_UTF8
 */

 #define HB_CP_ID        SV437C
--- a/harbour/src/codepage/cpsviso.c
+++ b/harbour/src/codepage/cpsviso.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Swedish ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_INTERLEAVED
-#define HB_CP_UPPER     "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ"
-#define HB_CP_LOWER     "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~œ"
+#define HB_CP_UPPER     "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~~ÜZÅÄ~ÆÖ~Ø~"
+#define HB_CP_LOWER     "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpsvwin.c
+++ b/harbour/src/codepage/cpsvwin.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Swedish Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_INTERLEAVED
-#define HB_CP_UPPER     "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ"
-#define HB_CP_LOWER     "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~œ"
+#define HB_CP_UPPER     "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ"
+#define HB_CP_LOWER     "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~œ"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cptr857.c
+++ b/harbour/src/codepage/cptr857.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Turkish CP-857"
 #define HB_CP_UNITB     HB_UNITB_857
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "A¶BC€DEÒFG¦HI˜×JKLMNOâ™PRSžTUêšVYZ"
-#define HB_CP_LOWER     "aƒbc‡deˆfg§h<EFBFBD>iŒjklmno“”prsŸtu–<EFBFBD>vyz"
+#define HB_CP_UPPER     "AÂBCÇDEÊFGĞHIİÎJKLMNOÔÖPRSŞTUÛÜVYZ"
+#define HB_CP_LOWER     "aâbcçdeêfgğhıiîjklmnoôöprsştuûüvyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cptriso.c
+++ b/harbour/src/codepage/cptriso.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Turkish ISO-8859-9"
 #define HB_CP_UNITB     HB_UNITB_8859_9
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÂBCÇDEÊFGÐHIÝÎJKLMNOÔÖPRSÞTUÛÜVYZ"
-#define HB_CP_LOWER     "aâbcçdeêfgðhýiîjklmnoôöprsþtuûüvyz"
+#define HB_CP_UPPER     "AÂBCÇDEÊFGĞHIİÎJKLMNOÔÖPRSŞTUÛÜVYZ"
+#define HB_CP_LOWER     "aâbcçdeêfgğhıiîjklmnoôöprsştuûüvyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cptrwin.c
+++ b/harbour/src/codepage/cptrwin.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Turkish Windows-1254"
 #define HB_CP_UNITB     HB_UNITB_1254
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÂBCÇDEÊFGÐHIÝÎJKLMNOÔÖPRSÞTUÛÜVYZ"
-#define HB_CP_LOWER     "aâbcçdeêfgðhýiîjklmnoôöprsþtuûüvyz"
+#define HB_CP_UPPER     "AÂBCÇDEÊFGĞHIİÎJKLMNOÔÖPRSŞTUÛÜVYZ"
+#define HB_CP_LOWER     "aâbcçdeêfgğhıiîjklmnoôöprsştuûüvyz"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpua1125.c
+++ b/harbour/src/codepage/cpua1125.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Ukrainian CP-1125"
 #define HB_CP_UNITB     HB_UNITB_1125
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "€<EFBFBD>‚ƒò„…ðô†‡ˆöø‰Š‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™š›œ<EFBFBD>žŸ"
-#define HB_CP_LOWER     " ¡¢£ó¤¥ñõ¦§¨÷ù©ª«¬®¯àáâãäåæçèéêëìíîï"
+#define HB_CP_UPPER     "АБВГҐДЕЁЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгґдеёєжзиіїйклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpua1251.c
+++ b/harbour/src/codepage/cpua1251.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module (UAWIN)
+ * National Collation Support Module (UA1251)
 *
 * Copyright 2004 Pavel Tsarenko <tpe2@mail.ru>
 * www - http://www.xharbour.org
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Ukrainian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ÀÁÂÃ¥ÄÅ¨ªÆÇÈ²¯ÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-#define HB_CP_LOWER     "àáâã´äå¸ºæçè³¿éêëìíîïðñòóôõö÷øùúûüýþÿ"
+#define HB_CP_UPPER     "АБВГҐДЕЁЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгґдеёєжзиіїйклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpua866.c
+++ b/harbour/src/codepage/cpua866.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Ukrainian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "€<EFBFBD>‚ƒ„…ðò†‡ˆIô‰Š‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™š›œ<EFBFBD>žŸ"
-#define HB_CP_LOWER     " ¡¢£¤¥ñó¦§¨iõ©ª«¬®¯àáâãäåæçèéêëìíîï"
+#define HB_CP_UPPER     "АБВГДЕЁЄЖЗИIЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдеёєжзиiїйклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpuakoi8.c
+++ b/harbour/src/codepage/cpuakoi8.c
@@ -54,8 +54,9 @@
 #define HB_CP_INFO      "Ukrainian KOI8-U"
 #define HB_CP_UNITB     HB_UNITB_KOI_8U
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "áâ÷ç½äå³´öúé¶·êëìíîïðòóôõæèãþûýÿùøüàñ"
-#define HB_CP_LOWER     "ÁÂ×ÇÄÅ£¤ÖÚÉ¦§ÊËÌÍÎÏÐÒÓÔÕÆÈÃÞÛÝßÙØÜÀÑ"
+#define HB_CP_UPPER     "АБВГҐДЕЁЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгґдеёєжзиіїйклмнопрстуфхцчшщъыьэюя"
+#define HB_CP_UTF8

 /* include CP registration code */
 #include "hbcdpreg.h"