2007-12-06 02:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* include/hbextern.ch * common.mak * source/codepage/Makefile - source/codepage/cpdedos.c + source/codepage/cpde850.c - source/codepage/cpeldos.c + source/codepage/cpel737.c - source/codepage/cpesdos.c + source/codepage/cpes850.c - source/codepage/cpfrdos.c + source/codepage/cpfr850.c - source/codepage/cptrdos.c + source/codepage/cptr857.c ! Renamed some codepage modules to include the actual DOS codepage number instead of nothing or generic "dos" name. * common.mak * source/lang/Makefile + source/lang/msgtr857.c - source/lang/msgtrdos.c ! Rename one language module to be in sync with proper internal ID.
2007-12-06 01:26:32 +00:00
parent 5a278f5646
commit 12bb58304e
11 changed files with 61 additions and 36 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,31 @@
   2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */

+2007-12-06 02:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * include/hbextern.ch
+   * common.mak
+   * source/codepage/Makefile
+   - source/codepage/cpdedos.c
+   + source/codepage/cpde850.c
+   - source/codepage/cpeldos.c
+   + source/codepage/cpel737.c
+   - source/codepage/cpesdos.c
+   + source/codepage/cpes850.c
+   - source/codepage/cpfrdos.c
+   + source/codepage/cpfr850.c
+   - source/codepage/cptrdos.c
+   + source/codepage/cptr857.c
+     ! Renamed some codepage modules to include the 
+       actual DOS codepage number instead of nothing 
+       or generic "dos" name.
+
+   * common.mak
+   * source/lang/Makefile
+   + source/lang/msgtr857.c
+   - source/lang/msgtrdos.c
+     ! Rename one language module to be in sync with 
+       proper internal ID.
+
 2007-12-06 01:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * doc/howtosvn.txt
     ! Fixed the SVN propset command to include all needed keywords, 
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -722,7 +722,7 @@ LANG_LIB_OBJS = \
    $(OBJ_DIR)\msgsr852$(OBJEXT) \
    $(OBJ_DIR)\msgsriso$(OBJEXT) \
    $(OBJ_DIR)\msgsrwin$(OBJEXT) \
-    $(OBJ_DIR)\msgtrdos$(OBJEXT) \
+    $(OBJ_DIR)\msgtr857$(OBJEXT) \
    $(OBJ_DIR)\msgtrwin$(OBJEXT) \
    $(OBJ_DIR)\msgzhb5$(OBJEXT)  \
    $(OBJ_DIR)\msgzhgb$(OBJEXT)  \
@@ -761,14 +761,14 @@ CODEPAGE_LIB_OBJS = \
    $(OBJ_DIR)\cpcsiso$(OBJEXT)  \
    $(OBJ_DIR)\cpcskam$(OBJEXT)  \
    $(OBJ_DIR)\cpcswin$(OBJEXT)  \
-    $(OBJ_DIR)\cpdedos$(OBJEXT)  \
+    $(OBJ_DIR)\cpde850$(OBJEXT)  \
    $(OBJ_DIR)\cpdeiso$(OBJEXT)  \
-    $(OBJ_DIR)\cpeldos$(OBJEXT)  \
+    $(OBJ_DIR)\cpel737$(OBJEXT)  \
    $(OBJ_DIR)\cpelwin$(OBJEXT)  \
-    $(OBJ_DIR)\cpesdos$(OBJEXT)  \
+    $(OBJ_DIR)\cpes850$(OBJEXT)  \
    $(OBJ_DIR)\cpesmwin$(OBJEXT) \
    $(OBJ_DIR)\cpeswin$(OBJEXT)  \
-    $(OBJ_DIR)\cpfrdos$(OBJEXT)  \
+    $(OBJ_DIR)\cpfr850$(OBJEXT)  \
    $(OBJ_DIR)\cphr1250$(OBJEXT) \
    $(OBJ_DIR)\cphr437$(OBJEXT)  \
    $(OBJ_DIR)\cphr852$(OBJEXT)  \
@@ -804,7 +804,7 @@ CODEPAGE_LIB_OBJS = \
    $(OBJ_DIR)\cpsv850$(OBJEXT)  \
    $(OBJ_DIR)\cpsvclip$(OBJEXT) \
    $(OBJ_DIR)\cpsvwin$(OBJEXT)  \
-    $(OBJ_DIR)\cptrdos$(OBJEXT)  \
+    $(OBJ_DIR)\cptr857$(OBJEXT)  \
    $(OBJ_DIR)\cptrwin$(OBJEXT)  \
    $(OBJ_DIR)\cpua866$(OBJEXT)  \
    $(OBJ_DIR)\cpuakoi$(OBJEXT)  \
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -904,14 +904,14 @@ EXTERNAL HB_CODEPAGE_CS852
 EXTERNAL HB_CODEPAGE_CSISO
 EXTERNAL HB_CODEPAGE_CSKAM
 EXTERNAL HB_CODEPAGE_CSWIN
-EXTERNAL HB_CODEPAGE_DE
+EXTERNAL HB_CODEPAGE_DE850
 EXTERNAL HB_CODEPAGE_DEISO
-EXTERNAL HB_CODEPAGE_EL
+EXTERNAL HB_CODEPAGE_EL737
 EXTERNAL HB_CODEPAGE_ELWIN
-EXTERNAL HB_CODEPAGE_ES
+EXTERNAL HB_CODEPAGE_ES850
 EXTERNAL HB_CODEPAGE_ESMWIN
 EXTERNAL HB_CODEPAGE_ESWIN
-EXTERNAL HB_CODEPAGE_FR
+EXTERNAL HB_CODEPAGE_FR850
 EXTERNAL HB_CODEPAGE_HR1250
 EXTERNAL HB_CODEPAGE_HR437
 EXTERNAL HB_CODEPAGE_HR852
--- a/harbour/source/codepage/Makefile
+++ b/harbour/source/codepage/Makefile
@@ -14,14 +14,14 @@ C_SOURCES=\
 	cpcsiso.c     \
 	cpcskam.c     \
 	cpcswin.c     \
-	cpdedos.c     \
+	cpde850.c     \
 	cpdeiso.c     \
-	cpeldos.c     \
+	cpel737.c     \
 	cpelwin.c     \
-	cpesdos.c     \
+	cpes850.c     \
 	cpeswin.c     \
 	cpesmwin.c    \
-	cpfrdos.c     \
+	cpfr850.c     \
 	cphr1250.c    \
 	cphr437.c     \
 	cphr852.c     \
@@ -57,7 +57,7 @@ C_SOURCES=\
 	cpsv850.c     \
 	cpsvclip.c    \
 	cpsvwin.c     \
-	cptrdos.c     \
+	cptr857.c     \
 	cptrwin.c     \
 	cpua866.c     \
 	cpuakoi.c     \
--- a/harbour/source/codepage/cpde850.c
+++ b/harbour/source/codepage/cpde850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( German MS-DOS )
+ * National Collation Support Module ( German MS-DOS 850 )
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://www.harbour-project.org
@@ -84,16 +84,16 @@
   same excepting the characters case, of course.
 */

-static HB_CODEPAGE s_codepage = { "DE",
+static HB_CODEPAGE s_codepage = { "DE850",
    HB_CPID_850, HB_UNITB_850, NUMBER_OF_CHARACTERS,
    "AŽBCDEFGHIJKLMNO™PQRSáTUšVWXYZ",
    "a„bcdefghijklmno”pqrsátu<EFBFBD>vwxyz",
    IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };

-HB_CODEPAGE_INIT( DE )
+HB_CODEPAGE_INIT( DE850 )

 #if defined(HB_PRAGMA_STARTUP)
-   #pragma startup hb_codepage_Init_DE
+   #pragma startup hb_codepage_Init_DE850
 #elif defined(HB_MSC_STARTUP)
   #if _MSC_VER >= 1010
      #pragma data_seg( ".CRT$XIY" )
@@ -101,6 +101,6 @@ HB_CODEPAGE_INIT( DE )
   #else
      #pragma data_seg( "XIY" )
   #endif
-   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_DE = hb_codepage_Init_DE;
+   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_DE850 = hb_codepage_Init_DE850;
   #pragma data_seg()
 #endif
--- a/harbour/source/codepage/cpel737.c
+++ b/harbour/source/codepage/cpel737.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( template )
+ * National Collation Support Module ( Greek MS-DOS 737 )
 *
 * Copyright 2004 Pete Dionisopoulos <pete_westg@yahoo.gr>
 * www - http://www.harbour-project.org
@@ -83,16 +83,16 @@
   same excepting the characters case, of course.
 */

-static HB_CODEPAGE s_codepage = { "EL",
+static HB_CODEPAGE s_codepage = { "EL737",
    HB_CPID_737, HB_UNITB_737, NUMBER_OF_CHARACTERS,
    "€~ê<>‚ƒ„~ë…†~ì‡ˆ~í‰Š‹Œ<E280B9>Ž~î<><C3AE>‘‘’“~ï”•–—~ð",
    "˜~á™š›œ~â<>ž~ãŸ ~å¡¢£¤¥¦~æ§¨©ª«¬~ç®¯à~é",
    IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };

-HB_CODEPAGE_INIT( EL )
+HB_CODEPAGE_INIT( EL737 )

 #if defined(HB_PRAGMA_STARTUP)
-   #pragma startup hb_codepage_Init_EL
+   #pragma startup hb_codepage_Init_EL737
 #elif defined(HB_MSC_STARTUP)
   #if _MSC_VER >= 1010
      #pragma data_seg( ".CRT$XIY" )
@@ -100,6 +100,6 @@ HB_CODEPAGE_INIT( EL )
   #else
      #pragma data_seg( "XIY" )
   #endif
-   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_EL = hb_codepage_Init_EL;
+   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_EL737 = hb_codepage_Init_EL737;
   #pragma data_seg()
 #endif
--- a/harbour/source/codepage/cpes850.c
+++ b/harbour/source/codepage/cpes850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Spanish MS-DOS )
+ * National Collation Support Module ( Spanish MS-DOS 850 )
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://www.harbour-project.org
@@ -84,16 +84,16 @@
   same excepting the characters case, of course.
 */

-static HB_CODEPAGE s_codepage = { "ES", 
+static HB_CODEPAGE s_codepage = { "ES850", 
   HB_CPID_850, HB_UNITB_850, NUMBER_OF_CHARACTERS,
   "AµBCDE<EFBFBD>FGHIÖJKLMN¥OàPQRSTUéšVWXYZ", 
   "a bcde‚fghi¡jklmn¤o¢pqrstu£<EFBFBD>vwxyz",
   IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };

-HB_CODEPAGE_INIT( ES )
+HB_CODEPAGE_INIT( ES850 )

 #if defined(HB_PRAGMA_STARTUP)
-   #pragma startup hb_codepage_Init_ES
+   #pragma startup hb_codepage_Init_ES850
 #elif defined(HB_MSC_STARTUP)
   #if _MSC_VER >= 1010
      #pragma data_seg( ".CRT$XIY" )
@@ -101,6 +101,6 @@ HB_CODEPAGE_INIT( ES )
   #else
      #pragma data_seg( "XIY" )
   #endif
-   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_ES = hb_codepage_Init_ES;
+   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_ES850 = hb_codepage_Init_ES850;
   #pragma data_seg()
 #endif
--- a/harbour/source/codepage/cpfr850.c
+++ b/harbour/source/codepage/cpfr850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( French MS-DOS cp-850 )
+ * National Collation Support Module ( French MS-DOS 850 )
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://www.harbour-project.org
@@ -85,16 +85,16 @@
   same excepting the characters case, of course.
 */

-static HB_CODEPAGE s_codepage = { "FR",
+static HB_CODEPAGE s_codepage = { "FR850",
    HB_CPID_850, HB_UNITB_850, NUMBER_OF_CHARACTERS,
    "AAAAABCDEEEEEFGHIIIIIJKLMNOOOOOPQRSTUUUUUVWXYZ",
    "a …ƒ„bcde‚Šˆ‰fghi¡<EFBFBD>Œ‹jklmno¢•“”pqrstu£—–<EFBFBD>vwxyz",
    IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };

-HB_CODEPAGE_INIT( FR )
+HB_CODEPAGE_INIT( FR850 )

 #if defined(HB_PRAGMA_STARTUP)
-   #pragma startup hb_codepage_Init_FR
+   #pragma startup hb_codepage_Init_FR850
 #elif defined(HB_MSC_STARTUP)
   #if _MSC_VER >= 1010
      #pragma data_seg( ".CRT$XIY" )
@@ -102,6 +102,6 @@ HB_CODEPAGE_INIT( FR )
   #else
      #pragma data_seg( "XIY" )
   #endif
-   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_FR = hb_codepage_Init_FR;
+   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_FR850 = hb_codepage_Init_FR850;
   #pragma data_seg()
 #endif
--- a/harbour/source/codepage/cptr857.c
+++ b/harbour/source/codepage/cptr857.c
--- a/harbour/source/lang/Makefile
+++ b/harbour/source/lang/Makefile
@@ -52,7 +52,7 @@ C_SOURCES=\
 	msgslwin.c   \
 	msgsr852.c   \
 	msgsriso.c   \
-	msgtrdos.c   \
+	msgtr857.c   \
 	msgtrwin.c   \
 	msgsrwin.c   \
 	msgzhb5.c    \
--- a/harbour/source/lang/msgtr857.c
+++ b/harbour/source/lang/msgtr857.c