diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f341cc17ae..b3f6e12659 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,22 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-21 00:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * include/hbcpage.hbx + * src/codepage/Makefile + + src/codepage/cpsk852c.c + + Added Clipper compatible Slovak collation. + + * src/codepage/cpsk852.c + * src/codepage/cpskkam.c + * src/codepage/cpskiso.c + * src/codepage/cpskwin.c + ! Fixed Slovak collation. + ; INCOMPATIBLE: All users using any of the above codepages will + have to reindex. + + ; Thanks to Julius Bartal for sorting it out. + 2010-11-20 21:31 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rdd/dbfntx/dbfntx1.c * harbour/src/rdd/dbfnsx/dbfnsx1.c diff --git a/harbour/include/hbcpage.hbx b/harbour/include/hbcpage.hbx index 610313608a..d4b18a9c3c 100644 --- a/harbour/include/hbcpage.hbx +++ b/harbour/include/hbcpage.hbx @@ -93,6 +93,7 @@ DYNAMIC HB_CODEPAGE_RU866 DYNAMIC HB_CODEPAGE_RUISO DYNAMIC HB_CODEPAGE_RUKOI8 DYNAMIC HB_CODEPAGE_SK852 +DYNAMIC HB_CODEPAGE_SK852C DYNAMIC HB_CODEPAGE_SKISO DYNAMIC HB_CODEPAGE_SKKAM DYNAMIC HB_CODEPAGE_SKWIN diff --git a/harbour/src/codepage/Makefile b/harbour/src/codepage/Makefile index e8f896ae1a..3e30098717 100644 --- a/harbour/src/codepage/Makefile +++ b/harbour/src/codepage/Makefile @@ -69,6 +69,7 @@ C_SOURCES := \ cprukoi.c \ cpruwin.c \ cpsk852.c \ + cpsk852c.c \ cpskiso.c \ cpskkam.c \ cpskwin.c \ diff --git a/harbour/src/codepage/cpsk852.c b/harbour/src/codepage/cpsk852.c index 9ce9329215..c3744d0933 100644 --- a/harbour/src/codepage/cpsk852.c +++ b/harbour/src/codepage/cpsk852.c @@ -6,56 +6,18 @@ * Harbour Project source code: * National Collation Support Module ( SK852 ) * - * Copyright 2007 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2009 Przemyslaw Czerpak * 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. 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. - * + * This file is generated automatically by cpinfo.prg */ #define HB_CP_ID SK852 #define HB_CP_INFO "Slovak CP-852" #define HB_CP_UNITB HB_UNITB_852 -#define HB_CP_ACSORT HB_CDP_ACSORT_INTERLEAVED -#define HB_CP_UPPER "A~~BCD~.DZ..D.E~FGH.CH.I~JKL~~MN~O~~PQR~ST~U~VWXY~Z" -#define HB_CP_LOWER "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z" +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGHIJKLMNO♊PQRSTUޚVWXYZ" +#define HB_CP_LOWER "abcde؉fghijklmnopqrstuvwxyz" /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpsk852c.c b/harbour/src/codepage/cpsk852c.c new file mode 100644 index 0000000000..3b879eac68 --- /dev/null +++ b/harbour/src/codepage/cpsk852c.c @@ -0,0 +1,23 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * National Collation Support Module ( SK852 ) + * + * Copyright 2009 Przemyslaw Czerpak + * www - http://harbour-project.org + * + * This file is generated automatically by cpinfo.prg + */ + +#define HB_CP_ID SK852C +#define HB_CP_INFO "Slovak CP-852 (ntxsl852.obj compatible)" +#define HB_CP_UNITB HB_UNITB_852 +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGHIJKLMNOPQRSTUޚVWXYZ" +#define HB_CP_LOWER "abcde؉fghijklmnopqrstuvwxyz" + +/* include CP registration code */ +#include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpskiso.c b/harbour/src/codepage/cpskiso.c index 4f77f4e3b6..d18ca1595c 100644 --- a/harbour/src/codepage/cpskiso.c +++ b/harbour/src/codepage/cpskiso.c @@ -6,56 +6,18 @@ * Harbour Project source code: * National Collation Support Module ( SKISO ) * - * Copyright 2007 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2007-2010 Viktor Szakats (harbour.01 syenar.hu) * 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. 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. - * + * This file is generated automatically by cpinfo.prg */ #define HB_CP_ID SKISO #define HB_CP_INFO "Slovak ISO-8859-2" #define HB_CP_UNITB HB_UNITB_8859_2 -#define HB_CP_ACSORT HB_CDP_ACSORT_INTERLEAVED -#define HB_CP_UPPER "A~~BCD~.DZ..D.E~FGH.CH.I~JKL~~MN~O~~PQR~ST~U~VWXY~Z" -#define HB_CP_LOWER "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z" +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGHIJKLťMNOPQRSTUVWXYZ" +#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpskkam.c b/harbour/src/codepage/cpskkam.c index dcba73dd82..838c3e95e4 100644 --- a/harbour/src/codepage/cpskkam.c +++ b/harbour/src/codepage/cpskkam.c @@ -6,56 +6,17 @@ * Harbour Project source code: * National Collation Support Module ( SKKAM ) * - * Copyright 2007 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2007-2010 Viktor Szakats (harbour.01 syenar.hu) * 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. 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. - * + * This file is generated automatically by cpinfo.prg */ #define HB_CP_ID SKKAM #define HB_CP_INFO "Slovak Kamenicky (895)" #define HB_CP_UNITB HB_UNITB_KAM -#define HB_CP_ACSORT HB_CDP_ACSORT_INTERLEAVED -#define HB_CP_UPPER "A~~BCD~.DZ..D.E~FGH.CH.I~JKL~~MN~O~~PQR~ST~U~VWXY~Z" -#define HB_CP_LOWER "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z" - +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGHIJKLMNOPPQRSTUpVWXYZ" +#define HB_CP_LOWER "abcdefghijklmnoQpqrstuqvwxyz" /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpskwin.c b/harbour/src/codepage/cpskwin.c index 4f1340ce19..1f1dfb2687 100644 --- a/harbour/src/codepage/cpskwin.c +++ b/harbour/src/codepage/cpskwin.c @@ -6,56 +6,18 @@ * Harbour Project source code: * National Collation Support Module ( SKWIN ) * - * Copyright 2007 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2009 Przemyslaw Czerpak * 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. 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. - * + * This file is generated automatically by cpinfo.prg */ #define HB_CP_ID SKWIN #define HB_CP_INFO "Slovak Windows-1250" #define HB_CP_UNITB HB_UNITB_1250 -#define HB_CP_ACSORT HB_CDP_ACSORT_INTERLEAVED -#define HB_CP_UPPER "A~~BCD~.DZ..D.E~FGH.CH.I~JKL~~MN~O~~PQR~ST~U~VWXY~Z" -#define HB_CP_LOWER "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z" +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGHIJKLżMNOPQRSTUVWXYZ" +#define HB_CP_LOWER "abcdefghijklmnopqrstuvwxyz" /* include CP registration code */ #include "hbcdpreg.h"