diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index f41302f427..3b08188466 100644 --- 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 diff --git a/harbour/src/codepage/Makefile b/harbour/src/codepage/Makefile index ea5a9999fc..bbf8a20094 100644 --- 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 \ diff --git a/harbour/src/codepage/cpbg866.c b/harbour/src/codepage/cpbg866.c index 42debf079b..9a12dc4add 100644 --- 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 "" -#define HB_CP_LOWER "" +#define HB_CP_UPPER "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ" +#define HB_CP_LOWER "абвгдежзийклмнопрстуфхцчшщъыьэюя" +#define HB_CP_UTF8 /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpbgiso.c b/harbour/src/codepage/cpbgiso.c index 343e499211..97dcc420b7 100644 --- 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" diff --git a/harbour/src/codepage/cpbgmik.c b/harbour/src/codepage/cpbgmik.c index 3ac52cbb57..e3c1ed0ef1 100644 --- 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 "" -#define HB_CP_LOWER "" +#define HB_CP_UPPER "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ" +#define HB_CP_LOWER "абвгдежзийклмнопрстуфхцчшщъыьэюя" +#define HB_CP_UTF8 /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpbgwin.c b/harbour/src/codepage/cpbgwin.c index e55f475ac6..a4ba79dd10 100644 --- 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" diff --git a/harbour/src/codepage/cpcsiso.c b/harbour/src/codepage/cpcsiso.c index 1cc590b277..517b983f7d 100644 --- 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 "ABCDEFGH.CH.IJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefgh.ch.ijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpcskamc.c b/harbour/src/codepage/cpcskamc.c index 1492e2ca69..911c76a085 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpcswin.c b/harbour/src/codepage/cpcswin.c index 504b928f22..b31704f41d 100644 --- 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 "ABCDEFGH.CH.IJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefgh.ch.ijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpde850.c b/harbour/src/codepage/cpde850.c index a12fb6ebb7..8bce1e4281 100644 --- 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 "ABCDEFGHIJKLMNOPQRS TUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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 */ diff --git a/harbour/src/codepage/cpdeiso.c b/harbour/src/codepage/cpdeiso.c index e7ddd2f57f..b7b6367713 100644 --- 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 "ABCDEFGHIJKLMNOPQRS TUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpdewin.c b/harbour/src/codepage/cpdewin.c index 935ca0b80b..bade01b62f 100644 --- 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 "ABCDEFGHIJKLMNOPQRS TUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpel737.c b/harbour/src/codepage/cpel737.c index e4e82315a6..484d3c2467 100644 --- 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 "~ꁂ~녆~쇈~퉊~~~" -#define HB_CP_LOWER "~ᙚ~❞~㟠~塢~槨~筮~" +#define HB_CP_UPPER "Α~ΆΒΓΔΕ~ΈΖΗ~ΉΘΙ~ΊΚΛΜΝΞΟ~ΌΠΡΣΣΤΥ~ΎΦΧΨΩ~Ώ" +#define HB_CP_LOWER "α~άβγδε~έζη~ήθι~ίκλμνξο~όπρσςτυ~ύφχψω~ώ" +#define HB_CP_UTF8 /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpeliso.c b/harbour/src/codepage/cpeliso.c index 6edd605eda..5f21a0b847 100644 --- 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" diff --git a/harbour/src/codepage/cpelwin.c b/harbour/src/codepage/cpelwin.c index 70dcfb41f5..3dc313ca43 100644 --- 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" diff --git a/harbour/src/codepage/cpes850.c b/harbour/src/codepage/cpes850.c index 6276f2589b..5d12980b4a 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpesiso.c b/harbour/src/codepage/cpesiso.c index c71cc56194..b3c0b88ee2 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpeswinm.c b/harbour/src/codepage/cpesmwin.c similarity index 93% rename from harbour/src/codepage/cpeswinm.c rename to harbour/src/codepage/cpesmwin.c index 53f870e086..0adc3b5be6 100644 --- a/harbour/src/codepage/cpeswinm.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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpeswin.c b/harbour/src/codepage/cpeswin.c index 8a0d80e04a..f176fd294f 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpfi850.c b/harbour/src/codepage/cpfi850.c index 7c0fc411b5..4173f895be 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpfr850.c b/harbour/src/codepage/cpfr850.c index 81f43585c6..d10116797b 100644 --- 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 "abcdefghijklmnopqrstuvwxyz" +#define HB_CP_LOWER "aáàâäbcdeéèêëfghiíìîïjklmnoóòôöpqrstuúùûüvwxyz" +#define HB_CP_UTF8 #if 0 /* VERIFIED: 20091116 */ diff --git a/harbour/src/codepage/cpfriso.c b/harbour/src/codepage/cpfriso.c index 4136985b6a..e69195cc1f 100644 --- 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" diff --git a/harbour/src/codepage/cpfrwin.c b/harbour/src/codepage/cpfrwin.c index 9559f90d15..f0e7aba824 100644 --- 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" diff --git a/harbour/src/codepage/cphe862.c b/harbour/src/codepage/cphe862.c index b92a8d429d..3a53650732 100644 --- 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" diff --git a/harbour/src/codepage/cphewin.c b/harbour/src/codepage/cphewin.c index 22650264ad..446d63e327 100644 --- 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" diff --git a/harbour/src/codepage/cphr646.c b/harbour/src/codepage/cphr646.c index 0973844933..8a42b56e4d 100644 --- 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 + * Copyright 2003 Vlado Miholic * 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" diff --git a/harbour/src/codepage/cphr852.c b/harbour/src/codepage/cphr852.c index 610ae5d55c..2dd743ba73 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cphriso.c b/harbour/src/codepage/cphriso.c index 009be936fd..35d79e63eb 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cphrwin.c b/harbour/src/codepage/cphrwin.c index e33af8c946..bd7490cded 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cphu852.c b/harbour/src/codepage/cphu852.c index 2235d41518..2279184913 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cphu852c.c b/harbour/src/codepage/cphu852c.c index 5111f89d40..542c1ccc91 100644 --- 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 "ABCDEFGHIJKLMNO PQRSTU隘 VWXYZ" -#define HB_CP_LOWER "a bcdefghi 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 #if 0 /* VERIFIED: 20091116 */ diff --git a/harbour/src/codepage/cphuiso.c b/harbour/src/codepage/cphuiso.c index 5206620324..23993200d3 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cphuutf.c b/harbour/src/codepage/cphuutf.c deleted file mode 100644 index f72dd16d34..0000000000 --- a/harbour/src/codepage/cphuutf.c +++ /dev/null @@ -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" diff --git a/harbour/src/codepage/cphuwin.c b/harbour/src/codepage/cphuwin.c index ec77543907..66374b91db 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpis850.c b/harbour/src/codepage/cpis850.c index ca8fdcd569..c869ef9d45 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ蒙" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz瑔" +#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" diff --git a/harbour/src/codepage/cpis861.c b/harbour/src/codepage/cpis861.c index d42591cdef..9c59ee3a50 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpit437.c b/harbour/src/codepage/cpit437.c index 7d680acd0a..5a793719a2 100644 --- 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 "AAAABCDEEFGHIIIJKLMNOOOPQRSTUUUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpit850.c b/harbour/src/codepage/cpit850.c index adb4c61c56..68bf3a0f77 100644 --- 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 "AAABCDEEFGHIIIJKLMNOOOPQRSTUUUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#define HB_CP_UPPER "AAABCDEÉEFGHIIIJKLMNOOOPQRSTUUUVWXYZ" +#define HB_CP_LOWER "aàábcdeéèfghiìíjklmnoòópqrstuùúvwxyz" +#define HB_CP_UTF8 #if 0 /* VERIFIED: 20091116 */ diff --git a/harbour/src/codepage/cpitisb.c b/harbour/src/codepage/cpitisb.c index 0c14ea81b6..104b229307 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpitiso.c b/harbour/src/codepage/cpitiso.c index bd31c09629..ba08b13999 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpitwin.c b/harbour/src/codepage/cpitwin.c index d721c6f200..dffaa4812b 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cplt775.c b/harbour/src/codepage/cplt775.c index 6177896413..557c9a9a7d 100644 --- 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 "ABCDEFGHIYJKLMNOPQRSTUVWXZ" -#define HB_CP_LOWER "abcdefghiyjklmnopqrstuvwxz" +#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" diff --git a/harbour/src/codepage/cpltwin.c b/harbour/src/codepage/cpltwin.c index dead341e8e..c6f343e23a 100644 --- 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 "ABCDEFGHIYJKLMNOPQRSTUVWXZ" -#define HB_CP_LOWER "abcdefghiyjklmnopqrstuvwxz" +#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" diff --git a/harbour/src/codepage/cpno865.c b/harbour/src/codepage/cpno865.c index eb1804fdd8..3793488fd4 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ " -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#define HB_CP_UPPER "ABCDEÉFGHIJKLMNOPQRSTUVWXYÜZÆ ØÅ" +#define HB_CP_LOWER "abcdeèfghijklmnopqrstuvwxyüzæéøå" +#define HB_CP_UTF8 #if 0 /* VERIFIED: 20091116 */ diff --git a/harbour/src/codepage/cppl852.c b/harbour/src/codepage/cppl852.c index 8bca34cf28..a1d107f301 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cppliso.c b/harbour/src/codepage/cppliso.c index 0fc732503e..ea99868e23 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpplwin.c b/harbour/src/codepage/cpplwin.c index 50581b2f30..24336110ca 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cppt850.c b/harbour/src/codepage/cppt850.c index d4d53dd1b5..ae95abc5a5 100644 --- 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ǎBCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "aƄbcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cppt860.c b/harbour/src/codepage/cppt860.c index 7cfc5112e5..b7450db466 100644 --- 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" diff --git a/harbour/src/codepage/cpptiso.c b/harbour/src/codepage/cpptiso.c index 31c9fd0ebd..b4a07a8305 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpro852.c b/harbour/src/codepage/cpro852.c index 8eb3cb7d8d..900d0e35e2 100644 --- 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ƶBCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "aǃbcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cproiso.c b/harbour/src/codepage/cproiso.c index e3dd90178a..cc47ca6798 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cprowin.c b/harbour/src/codepage/cprowin.c index ace557f775..542e643938 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpruwin.c b/harbour/src/codepage/cpru1251.c similarity index 92% rename from harbour/src/codepage/cpruwin.c rename to harbour/src/codepage/cpru1251.c index 01440cc4ff..f8e6e6b553 100644 --- a/harbour/src/codepage/cpruwin.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" diff --git a/harbour/src/codepage/cpru866.c b/harbour/src/codepage/cpru866.c index 81941cec25..604c65ec37 100644 --- 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 "" -#define HB_CP_LOWER "" +#define HB_CP_UPPER "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ" +#define HB_CP_LOWER "абвгдежзийклмнопрстуфхцчшщъыьэюя" +#define HB_CP_UTF8 /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpruiso.c b/harbour/src/codepage/cpruiso.c index ccc0fefe7f..9dbad456d3 100644 --- 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" diff --git a/harbour/src/codepage/cprukoi.c b/harbour/src/codepage/cprukoi8.c similarity index 92% rename from harbour/src/codepage/cprukoi.c rename to harbour/src/codepage/cprukoi8.c index 581ab621af..92bdf4760c 100644 --- a/harbour/src/codepage/cprukoi.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" diff --git a/harbour/src/codepage/cpskiso.c b/harbour/src/codepage/cpskiso.c index ec6529bd03..bf4c4a4237 100644 --- 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 "ABCD.DZ..D.EFGH.CH.IJKLťMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcd.dz..d.efgh.ch.ijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpskkamc.c b/harbour/src/codepage/cpskkamc.c index 83201fc0a4..5a09600aaf 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpskwin.c b/harbour/src/codepage/cpskwin.c index 016ed22fab..35ce7f2f29 100644 --- 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 "ABCD.DZ..D.EFGH.CH.IJKLżMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcd.dz..d.efgh.ch.ijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpsl646.c b/harbour/src/codepage/cpsl646.c index fb70ec51b3..edd1d027d7 100644 --- 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 + * Copyright 2002 Alexander S.Kresin * www - http://harbour-project.org - * 2003 Mitja Podgornik + * 2003 Mitja Podgornik * * 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" diff --git a/harbour/src/codepage/cpsl852.c b/harbour/src/codepage/cpsl852.c index 2d6d96337b..c036e8be38 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpsliso.c b/harbour/src/codepage/cpsliso.c index c1d1b1e9d2..f5f9294ed3 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpslwin.c b/harbour/src/codepage/cpslwin.c index 588d0c3da1..495c9cb0e0 100644 --- 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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#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" diff --git a/harbour/src/codepage/cpsr646.c b/harbour/src/codepage/cpsr646.c index 0c43571505..4e2a8ca660 100644 --- 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" diff --git a/harbour/src/codepage/cpsrwin.c b/harbour/src/codepage/cpsrwin.c index b68b197335..96e708940a 100644 --- 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 "Āȣˊ͌Ҏ׏" -#define HB_CP_LOWER "" +#define HB_CP_UPPER "АБВГДЂЕЖЗИЈКЛЉМНЊОПРСТЋУФХЦЧЏШ" +#define HB_CP_LOWER "абвгдђежзијклљмнњопрстћуфхцчџш" +#define HB_CP_UTF8 /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpsv437c.c b/harbour/src/codepage/cpsv437c.c index 5d3db49587..a81256fe6c 100644 --- 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 Sprknmnden (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 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" +#define HB_CP_UPPER "ABCDEÉFGHIJKLMNOPQRSTUVWXYÜZÅÄÖ" +#define HB_CP_LOWER "abcdeèfghijklmnopqrstuvwxyüzåäö" +#define HB_CP_UTF8 */ #define HB_CP_ID SV437C diff --git a/harbour/src/codepage/cpsviso.c b/harbour/src/codepage/cpsviso.c index 566490df0c..f88da6c2c8 100644 --- 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" diff --git a/harbour/src/codepage/cpsvwin.c b/harbour/src/codepage/cpsvwin.c index 38f27b5e9b..60b65e2f4d 100644 --- 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" diff --git a/harbour/src/codepage/cptr857.c b/harbour/src/codepage/cptr857.c index 5baf4ab206..18bab0d794 100644 --- 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 "ABCDEFGHIJKLMNOPRSTUVYZ" -#define HB_CP_LOWER "abcdefghijklmnoprstuvyz" +#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" diff --git a/harbour/src/codepage/cptriso.c b/harbour/src/codepage/cptriso.c index 6954e85429..b54a8cb54c 100644 --- 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 "ABCDEFGHIJKLMNOPRSTUVYZ" -#define HB_CP_LOWER "abcdefghijklmnoprstuvyz" +#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" diff --git a/harbour/src/codepage/cptrwin.c b/harbour/src/codepage/cptrwin.c index 9e241657b3..e45b560dc3 100644 --- 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 "ABCDEFGHIJKLMNOPRSTUVYZ" -#define HB_CP_LOWER "abcdefghijklmnoprstuvyz" +#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" diff --git a/harbour/src/codepage/cpua1125.c b/harbour/src/codepage/cpua1125.c index 16f48b77b5..668b66f579 100644 --- 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 "􆇈" -#define HB_CP_LOWER "" +#define HB_CP_UPPER "АБВГҐДЕЁЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ" +#define HB_CP_LOWER "абвгґдеёєжзиіїйклмнопрстуфхцчшщъыьэюя" +#define HB_CP_UTF8 /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpuawin.c b/harbour/src/codepage/cpua1251.c similarity index 90% rename from harbour/src/codepage/cpuawin.c rename to harbour/src/codepage/cpua1251.c index 8aa69bbe6f..1428200925 100644 --- a/harbour/src/codepage/cpuawin.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 * 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" diff --git a/harbour/src/codepage/cpua866.c b/harbour/src/codepage/cpua866.c index d964030ae1..e8ed0bd1f8 100644 --- 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 "򆇈I􉊋" -#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" diff --git a/harbour/src/codepage/cpuakoi.c b/harbour/src/codepage/cpuakoi8.c similarity index 91% rename from harbour/src/codepage/cpuakoi.c rename to harbour/src/codepage/cpuakoi8.c index e9624ae03e..ecaf140557 100644 --- a/harbour/src/codepage/cpuakoi.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"