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 23:22:27 +00:00
parent e66e43e894
commit 57d7a2ab2d
8 changed files with 61 additions and 173 deletions
--- 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
--- 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
--- 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 \
--- 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 <druzus / at / priv.onet.pl>
 * 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~µ~ŽBC¬D~Ò.DZ..D¦.E~<7E>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_ACSORT    HB_CDP_ACSORT_NONE
+#define HB_CP_UPPER     "AµŽBC¬DÒE<EFBFBD>·Ó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£…<EFBFBD>ûvwxyìz§"

 /* include CP registration code */
 #include "hbcdpreg.h"
--- a/harbour/src/codepage/cpsk852c.c
+++ b/harbour/src/codepage/cpsk852c.c
@@ -0,0 +1,23 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * National Collation Support Module ( SK852 )
+ *
+ * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
+ * 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     "AµŽBC¬DÒE<C392>·Ó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£…<C2A3>vwxyìz§"
+
+/* include CP registration code */
+#include "hbcdpreg.h"
--- 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~Á~Ä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_ACSORT    HB_CDP_ACSORT_NONE
+#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¾"

 /* include CP registration code */
 #include "hbcdpreg.h"
--- 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~<7E>~ŽBC€D~….DZ..D’.E~<7E>FGH.CH.I~‹JKL~Š~œMN~¥O~•~§PQR~«S›T~†U~—VWXY~<EFBFBD>Z’"
-#define HB_CP_LOWER     "a~ ~„bc‡d~ƒ.dz..d‘.e~‚fgh.ch.i~¡jkl~<7E>~Œmn~¤o~¢~“pqr~ªs¨t~Ÿu~£vwxy~˜z‘"
-
+#define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
+#define HB_CP_UPPER     "A<EFBFBD>ŽBC€D…E<EFBFBD>‰ËFGHI‹JKLŠœMN¥O•§™PPQR«žS›T†U—¦špVWXY<EFBFBD>Z’"
+#define HB_CP_LOWER     "a „bc‡dƒe‚ˆëfghi¡jkl<EFBFBD>Œmn¤o¢“”Qpqrª©s¨tŸu£–<EFBFBD>qvwxy˜z‘"
 /* include CP registration code */
 #include "hbcdpreg.h"
--- 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 <druzus / at / priv.onet.pl>
 * 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~Á~Ä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_ACSORT    HB_CDP_ACSORT_NONE
+#define HB_CP_UPPER     "AÁÄBCÈDÏEÉÌËFGHIÍJKLÅ¼MNÒOÓÔÖÕPQRÀØSŠT<EFBFBD>UÚÙÜÛVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcèdïeéìëfghiíjklå¾mnòoóôöõpqràøsšt<EFBFBD>uúùüûvwxyýzž"

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