[Dotgnu-pnet-commits] CVS: pnetlib/I18N/tools cvt.sh, 1.2, 1.3 ucm2cp.c, 1.3, 1.4

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/I18N/tools
In directory subversions:/tmp/cvs-serv31592/I18N/tools

Modified Files:
        cvt.sh ucm2cp.c 
Log Message:


Add some Mac-related code pages to I18N.


Index: cvt.sh
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/tools/cvt.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cvt.sh      13 Aug 2003 04:09:34 -0000      1.2
--- cvt.sh      15 Aug 2003 04:38:46 -0000      1.3
***************
*** 5,9 ****
  # is at the end of this file.
  #
! # Copyright (C) 2002  Southern Storm Software, Pty Ltd.
  #
  # This program is free software; you can redistribute it and/or modify
--- 5,9 ----
  # is at the end of this file.
  #
! # Copyright (C) 2002, 2003  Southern Storm Software, Pty Ltd.
  #
  # This program is free software; you can redistribute it and/or modify
***************
*** 314,317 ****
--- 314,374 ----
        --no-mailnews-save West/ibm-1275.ucm >West/CP10000.cs
  
+ ${UCM2CP} --region MidEast --page 10004 --wpage 1256 \
+       --name 'MAC - Arabic' \
+       --webname windows-10004 --bodyname windows-10004 \
+       --headername windows-10004 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save MidEast/mac-10004.ucm >MidEast/CP10004.cs
+ 
+ ${UCM2CP} --region MidEast --page 10005 --wpage 1255 \
+       --name 'MAC - Hebrew' \
+       --webname windows-10005 --bodyname windows-10005 \
+       --headername windows-10005 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save MidEast/mac-10005.ucm >MidEast/CP10005.cs
+ 
+ ${UCM2CP} --region West --page 10006 --wpage 1253 \
+       --name 'MAC - Greek I' \
+       --webname windows-10006 --bodyname windows-10006 \
+       --headername windows-10006 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save West/mac-10006.ucm >West/CP10006.cs
+ 
+ ${UCM2CP} --region Other --page 10007 --wpage 1251 \
+       --name 'MAC - Cyrillic' \
+       --webname windows-10007 --bodyname windows-10007 \
+       --headername windows-10007 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save Other/mac-10007.ucm >Other/CP10007.cs
+ 
+ ${UCM2CP} --region West --page 10010 --wpage 1250 \
+       --name 'MAC - Romania' \
+       --webname windows-10010 --bodyname windows-10010 \
+       --headername windows-10010 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save West/mac-10010.ucm >West/CP10010.cs
+ 
+ # 10017 has the same mappings as 10007
+ ${UCM2CP} --region Other --page 10017 --wpage 1251 \
+       --name 'MAC - Ukraine' \
+       --webname windows-10017 --bodyname windows-10017 \
+       --headername windows-10017 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save Other/mac-10007.ucm >Other/CP10017.cs
+ 
+ ${UCM2CP} --region Other --page 10021 --wpage 874 \
+       --name 'MAC - Thai' \
+       --webname windows-10021 --bodyname windows-10021 \
+       --headername windows-10021 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save Other/mac-10021.ucm >Other/CP10021.cs
+ 
+ ${UCM2CP} --region West --page 10029 --wpage 1250 \
+       --name 'MAC - Latin II' \
+       --webname windows-10029 --bodyname windows-10029 \
+       --headername windows-10029 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save West/mac-10029.ucm >West/CP10029.cs
+ 
  ${UCM2CP} --region West --page 10079 --wpage 1252 \
        --name 'Icelandic (Mac)' \
***************
*** 321,324 ****
--- 378,395 ----
        --no-mailnews-save West/mac-is.ucm >West/CP10079.cs
  
+ ${UCM2CP} --region MidEast --page 10081 --wpage 1254 \
+       --name 'MAC - Turkish' \
+       --webname windows-10081 --bodyname windows-10005 \
+       --headername windows-10081 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save MidEast/mac-10081.ucm >MidEast/CP10081.cs
+ 
+ ${UCM2CP} --region West --page 10082 --wpage 1252 \
+       --name 'MAC - Croatia' \
+       --webname windows-10082 --bodyname windows-10082 \
+       --headername windows-10082 --no-browser-display \
+       --no-browser-save --no-mailnews-display \
+       --no-mailnews-save West/mac-10082.ucm >West/CP10082.cs
+ 
  ${UCM2CP} --region Rare --page 20273 --wpage 1252 \
        --name 'IBM EBCDIC (Germany)' \
***************
*** 491,505 ****
  #  10002 MAC - Traditional Chinese (Big5)
  #  10003 MAC - Korean
- #  10004 MAC - Arabic
- #  10005 MAC - Hebrew
- #  10006 MAC - Greek I
- #  10007 MAC - Cyrillic
  #  10008 MAC - Simplified Chinese (GB 2312)
- #  10010 MAC - Romania
- #  10017 MAC - Ukraine
- #  10021 MAC - Thai
- #  10029 MAC - Latin II
- #  10081 MAC - Turkish
- #  10082 MAC - Croatia
  #  12000 Unicode UCS-4 Little-Endian
  #  12001 Unicode UCS-4 Big-Endian
--- 562,566 ----
***************
*** 525,529 ****
  #  20936 Simplified Chinese (GB2312)
  #  21027 Extended Alpha Lowercase
- #  21866 Ukrainian (KOI8-U)
  #  29001 Europa 3
  #  50220 Japanese (JIS)
--- 586,589 ----

Index: ucm2cp.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/tools/ucm2cp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ucm2cp.c    16 Apr 2003 07:12:12 -0000      1.3
--- ucm2cp.c    15 Aug 2003 04:38:46 -0000      1.4
***************
*** 265,268 ****
--- 265,270 ----
        char buffer[BUFSIZ];
        const char *buf;
+       int macStyle;
+       int macStyleInited = 0;
  
        /* Initialize the mapping tables */
***************
*** 280,285 ****
        while(fgets(buffer, BUFSIZ, file))
        {
!               /* Lines of interest begin with "<U" */
!               if(buffer[0] != '<' || buffer[1] != 'U')
                {
                        continue;
--- 282,300 ----
        while(fgets(buffer, BUFSIZ, file))
        {
!               /* Lines of interest begin with "<U" (IBM style) or "0x" (Mac 
style) */
!               macStyle = 0;
!               if(buffer[0] == '0' && buffer[1] == 'x')
!               {
!                       macStyle = 1;
!                       if(!macStyleInited)
!                       {
!                               for(posn = 0; posn < 256; ++posn)
!                               {
!                                       byteToChar[posn] = (unsigned)posn;
!                               }
!                               macStyleInited = 1;
!                       }
!               }
!               else if(buffer[0] != '<' || buffer[1] != 'U')
                {
                        continue;
***************
*** 287,319 ****
  
                /* Parse the fields on the line */
!               buf = buffer + 2;
!               buf += parseHex(buf, &posn);
!               if(posn >= 65536)
!               {
!                       continue;
!               }
!               while(*buf != '\0' && *buf != '\\')
                {
!                       ++buf;
!               }
!               if(*buf != '\\' || buf[1] != 'x')
!               {
!                       continue;
!               }
!               buf += 2;
!               buf += parseHex(buf, &byteValue);
!               if(byteValue >= 256)
!               {
!                       continue;
!               }
!               while(*buf != '\0' && *buf != '|')
!               {
!                       ++buf;
!               }
!               if(*buf != '|')
!               {
!                       continue;
                }
-               level = (int)(buf[1] - '0');
  
                /* Update the byte->char mapping table */
--- 302,361 ----
  
                /* Parse the fields on the line */
!               if(!macStyle)
                {
!                       buf = buffer + 2;
!                       buf += parseHex(buf, &posn);
!                       if(posn >= 65536)
!                       {
!                               continue;
!                       }
!                       while(*buf != '\0' && *buf != '\\')
!                       {
!                               ++buf;
!                       }
!                       if(*buf != '\\' || buf[1] != 'x')
!                       {
!                               continue;
!                       }
!                       buf += 2;
!                       buf += parseHex(buf, &byteValue);
!                       if(byteValue >= 256)
!                       {
!                               continue;
!                       }
!                       while(*buf != '\0' && *buf != '|')
!                       {
!                               ++buf;
!                       }
!                       if(*buf != '|')
!                       {
!                               continue;
!                       }
!                       level = (int)(buf[1] - '0');
!               }
!               else
!               {
!                       buf = buffer + 2;
!                       buf += parseHex(buf, &byteValue);
!                       if(byteValue >= 0x0100)
!                       {
!                               continue;
!                       }
!                       while(*buf != '\0' && *buf != '0')
!                       {
!                               ++buf;
!                       }
!                       if(*buf != '0' || buf[1] != 'x')
!                       {
!                               continue;
!                       }
!                       buf += 2;
!                       buf += parseHex(buf, &posn);
!                       if(posn >= 65535)
!                       {
!                               continue;
!                       }
!                       level = 1;
                }
  
                /* Update the byte->char mapping table */