2008-11-04 22:50 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* include/hbextern.ch * common.mak * source/codepage/Makefile + source/codepage/cpes850.c + Added ES850 - Modern Spanish. * include/hbextern.ch ! Added ITWIN. * source/codepage/cpesisoc.c * source/codepage/cpsviso.c * source/codepage/cpesiso.c * source/codepage/cpitwin.c + Added my copyright. * ChangeLog ; Some TODO/TOFIXes marked as [DONE]
2008-11-04 21:51:51 +00:00
parent bb49e3711a
commit d28d0d79d3
9 changed files with 145 additions and 16 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,25 @@
   2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */

+2008-11-04 22:50 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * include/hbextern.ch
+  * common.mak
+  * source/codepage/Makefile
+  + source/codepage/cpes850.c
+    + Added ES850 - Modern Spanish.
+
+  * include/hbextern.ch
+    ! Added ITWIN.
+
+  * source/codepage/cpesisoc.c
+  * source/codepage/cpsviso.c
+  * source/codepage/cpesiso.c
+  * source/codepage/cpitwin.c
+    + Added my copyright.
+
+  * ChangeLog
+    ; Some TODO/TOFIXes marked as [DONE]
+
 2008-11-04 22:39 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/include/hbapi.h
  * harbour/source/vm/hashfunc.c
@@ -50,7 +69,7 @@
    + Some changes marked as TOMERGE 1.0.

  * contrib/hbtip/base64x.c
-    ! Fixed and ages old problem with BUILDUSERPASSSTRING() 
+    ! Fixed an ages old problem with BUILDUSERPASSSTRING() 
      function, which always returned an empty string thus 
      making SMTP "AUTH PLAIN" broken. I wonder how this went 
      unnoticed for this long.
@@ -92,7 +111,7 @@
                (this collation has wrong CP linkage, so everyone is 
                encouraged to use ESWIN or ESISO instead.)
                Intentionally not added to hbextern.ch.
-     ; TODO: Add ES850.
+     ; TODO: Add ES850. [DONE]
     ; TODO: Check whether Clipper compatibility is indeed true.

 2008-11-04 12:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
@@ -356,7 +375,7 @@
  + source/codepage/cpro852.c
  + source/codepage/cprowin.c
    + Added Romanian codepages.
-    ; TODO: Add ROISO variant.
+    ; TODO: Add ROISO variant. [DONE]

  * source/codepage/uc1250.c
  * source/codepage/uc1251.c
@@ -963,9 +982,9 @@
            __ARCH*BIT__ and __*ENDIAN__ predefined macros, 
            as these can be misleading on some systems.
    ; TODO: Implement HB_V_DATE and HB_V_TIME.
-    ; TODO: Add HB_MTVM() functionality.
-    ; TODO: Add __PLATFORM__* equivalent.
-    ; TODO: Add HB_OS_UNIX_COMPATIBLE equivalent.
+    ; TODO: Add HB_MTVM() functionality. [DONE]
+    ; TODO: Add __PLATFORM__* equivalent. [DONE]
+    ; TODO: Add HB_OS_UNIX_COMPATIBLE equivalent. [DONE]

  * include/hbextern.ch
  * include/hbapifs.h
@@ -1161,7 +1180,7 @@
  * source/compiler/hbgenerr.c
  * utils/hbmake/hbmgauge.c
    * Changed snprintf() calls to hb_snprintf().
-    ; TODO: Finish the mappings in headers.
+    ; TODO: Finish the mappings in headers. [DONE]

  * tests/wvtext.prg
  * include/inkey.ch
@@ -1241,7 +1260,7 @@

  * include/hbsetup.h
    * Mapping snprintf() calls to hb_snprintf().
-    ; TODO: Replace the calls in source code.
+    ; TODO: Replace the calls in source code. [DONE]

  * source/common/hbstr.c
    ! Fixed hb_snprintf(). Please verify on your platforms.
@@ -1305,10 +1324,10 @@
             at it and replace it with hb_strncpy() or something 
             else secure? The code is cryptic and as someone 
             not using the debugger, I didn't dare to touch it, 
-             and this is the only one such call left.
+             and this is the only one such call left. [DONE - TOVERIFY]
    ; TODO: Change all snprintf() calls to hb_snprintf().
            When that happens, Harbour will no more use anything 
-            depicted as "non-secure" by MSVS 2005/2008.
+            depicted as "non-secure" by MSVS 2005/2008. [DONE]
    ; NOTE: This function may need tweaking, pls review and 
            fix if/where needed.

@@ -1813,6 +1832,7 @@
    * Changed 'BYTE val[]' to 'BYTE * val' in struct decl.
    ; TOFIX: It doesn't compile on MSVC due to this error:
             .\mysqldd.c(65) : fatal error C1017: invalid integer constant expression
+             [DONE]

  * ChangeLog
    + Marked one change as TOMERGE.
@@ -2395,7 +2415,7 @@
      in HBBrwText class
    ! fixed processing source code with TABs (chr(9))
    ; TOFIX: "Mono Display" causes RT error due to missing color index
-             range checking. It also does not change all colors immediately
+             range checking. It also does not change all colors immediately [DONE]
    ; TOFIX: getdbginput(): writing out of window area, scrolling internal
             buffer, cursor navigation, interrupting by ESC

--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -838,7 +838,8 @@ CODEPAGE_LIB_OBJS = \
    $(OBJ_DIR)\cpdewin$(OBJEXT)  \
    $(OBJ_DIR)\cpel737$(OBJEXT)  \
    $(OBJ_DIR)\cpelwin$(OBJEXT)  \
-    $(OBJ_DIR)\cpes850c$(OBJEXT)  \
+    $(OBJ_DIR)\cpes850$(OBJEXT)  \
+    $(OBJ_DIR)\cpes850c$(OBJEXT) \
    $(OBJ_DIR)\cpesiso$(OBJEXT)  \
    $(OBJ_DIR)\cpesisoc$(OBJEXT) \
    $(OBJ_DIR)\cpeswin$(OBJEXT)  \
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -982,6 +982,7 @@ EXTERNAL HB_CODEPAGE_DEWIN
 EXTERNAL HB_CODEPAGE_EL737
 EXTERNAL HB_CODEPAGE_ELWIN
 EXTERNAL HB_CODEPAGE_EN
+EXTERNAL HB_CODEPAGE_ES850
 EXTERNAL HB_CODEPAGE_ES850C
 EXTERNAL HB_CODEPAGE_ESISO
 EXTERNAL HB_CODEPAGE_ESISOC
@@ -1003,6 +1004,7 @@ EXTERNAL HB_CODEPAGE_IT437
 EXTERNAL HB_CODEPAGE_IT850
 EXTERNAL HB_CODEPAGE_ITISB
 EXTERNAL HB_CODEPAGE_ITISO
+EXTERNAL HB_CODEPAGE_ITWIN
 EXTERNAL HB_CODEPAGE_LTWIN
 EXTERNAL HB_CODEPAGE_PL852
 EXTERNAL HB_CODEPAGE_PLISO
--- a/harbour/source/codepage/Makefile
+++ b/harbour/source/codepage/Makefile
@@ -18,6 +18,7 @@ C_SOURCES=\
 	cpdewin.c  \
 	cpel737.c  \
 	cpelwin.c  \
+	cpes850.c  \
 	cpes850c.c \
 	cpesiso.c  \
 	cpesisoc.c \
--- a/harbour/source/codepage/cpes850.c
+++ b/harbour/source/codepage/cpes850.c
@@ -0,0 +1,104 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * National Collation Support Module (ES850 - Modern Spanish)
+ *
+ * Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
+ * www - http://www.harbour-project.org
+ * Spanish Windows support by Antonio Linares <alinares@fivetechsoft.com>
+ *
+ * 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.
+ *
+ */
+
+/* Language name: Spanish (Modern)*/
+/* ISO language code (2 chars): ES */
+/* Codepage: ISO-8859-1 */
+
+#include <ctype.h>
+#include "hbapi.h"
+#include "hbapicdp.h"
+
+#define NUMBER_OF_CHARACTERS  43    /* The number of single characters in the
+                                       alphabet, two-as-one aren't considered
+                                       here, accented - are considered. */
+#define IS_LATIN               1    /* Should be 1, if the national alphabet
+                                       is based on Latin */
+#define ACCENTED_EQUAL         0    /* Should be 1, if accented character
+                                       has the same weight as appropriate
+                                       unaccented. */
+#define ACCENTED_INTERLEAVED   0    /* Should be 1, if accented characters
+                                       sort after their unaccented counterparts
+                                       only if the unaccented versions of all
+                                       characters being compared are the same
+                                       ( interleaving ) */
+
+/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the
+   accented characters with the symbol '~' before each of them, for example:
+      a~_
+   If there is two-character sequence, which is considered as one, it should
+   be marked with '.' before and after it, for example:
+      ... h.ch.i ...
+
+   The Upper case string and the Lower case string should be absolutely the
+   same excepting the characters case, of course.
+ */
+
+static HB_CODEPAGE s_codepage = { "ES850",
+    HB_CPID_850, HB_UNITB_850, NUMBER_OF_CHARACTERS,
+    "Aµ·ŽBC€DE<EFBFBD>ÔÓFGHIÖÞØJKLMN¥Oàã™PQRSTUéëšVWXYZ",
+    "a …„bc‡de‚Š‰fghi¡<EFBFBD>‹jklmn¤o¢•”pqrstu£—<EFBFBD>vwxyz",
+    IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };
+
+HB_CODEPAGE_INIT( ES850 )
+
+#if defined( HB_PRAGMA_STARTUP )
+   #pragma startup hb_codepage_Init_ES850
+#elif defined( HB_MSC_STARTUP )
+   #if defined( HB_OS_WIN_64 )
+      #pragma section( HB_MSC_START_SEGMENT, long, read )
+   #endif
+   #pragma data_seg( HB_MSC_START_SEGMENT )
+   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_ES850 = hb_codepage_Init_ES850;
+   #pragma data_seg()
+#endif
--- a/harbour/source/codepage/cpesiso.c
+++ b/harbour/source/codepage/cpesiso.c
@@ -6,7 +6,7 @@
 * Harbour Project source code:
 * National Collation Support Module (ESISO - Modern Spanish)
 *
- * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
+ * Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
 * www - http://www.harbour-project.org
 * Spanish Windows support by Antonio Linares <alinares@fivetechsoft.com>
 *
--- a/harbour/source/codepage/cpesisoc.c
+++ b/harbour/source/codepage/cpesisoc.c
@@ -6,7 +6,7 @@
 * Harbour Project source code:
 * National Collation Support Module (ESISOC - Spanish Clipper compatible)
 *
- * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
+ * Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
 * www - http://www.harbour-project.org
 * Spanish support by Antonio Linares <alinares@fivetechsoft.com>
 *
--- a/harbour/source/codepage/cpitwin.c
+++ b/harbour/source/codepage/cpitwin.c
@@ -6,7 +6,7 @@
 * Harbour Project source code:
 * National Collation Support Module (Italian Windows-1252)
 *
- * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
+ * Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
 * www - http://www.harbour-project.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/harbour/source/codepage/cpsviso.c
+++ b/harbour/source/codepage/cpsviso.c
@@ -6,8 +6,9 @@
 * Harbour Project source code:
 * National Collation Support Module (SVISO)
 *
- * Copyright 2006 Klas Engwall <klas dot engwall at engwall dot com>
+ * Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
 * www - http://www.harbour-project.org
+ * Copyright 2006 Klas Engwall <klas dot engwall at engwall dot com>
 *
 * 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