dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnetlib/I18N/tools cvtcul.sh,1.2,1.3 loc2cul


From: Rhys Weatherley <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnetlib/I18N/tools cvtcul.sh,1.2,1.3 loc2cul.c,1.2,1.3
Date: Sun, 01 Jun 2003 22:25:43 -0400

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

Modified Files:
        cvtcul.sh loc2cul.c 
Log Message:


Remove the final dependencies on CultureNameTable by moving the name
information into the culture handlers.


Index: cvtcul.sh
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/tools/cvtcul.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cvtcul.sh   2 Jun 2003 00:59:00 -0000       1.2
--- cvtcul.sh   2 Jun 2003 02:25:41 -0000       1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  ${LOC2CUL} --region Other --id 0x0036 --name af \
+       --iso2 af --iso3 afr --windows AFK \
        Other/af.txt >Other/CID0036.cs
  
***************
*** 48,87 ****
--- 49,101 ----
  
  ${LOC2CUL} --region MidEast --id 0x0001 --name ar \
+       --iso2 ar --iso3 ara --windows ARA \
        MidEast/ar.txt >MidEast/CID0001.cs
  
  ${LOC2CUL} --region MidEast --id 0x3801 --name ar-AE \
+       --windows ARU \
        MidEast/ar_AE.txt >MidEast/CID3801.cs
  
  ${LOC2CUL} --region MidEast --id 0x3C01 --name ar-BH \
+       --windows ARH \
        MidEast/ar_BH.txt >MidEast/CID3c01.cs
  
  ${LOC2CUL} --region MidEast --id 0x1401 --name ar-DZ \
+       --windows ARG \
        MidEast/ar_DZ.txt >MidEast/CID1401.cs
  
  ${LOC2CUL} --region MidEast --id 0x0C01 --name ar-EG \
+       --windows ARE \
        MidEast/ar_EG.txt >MidEast/CID0c01.cs
  
  ${LOC2CUL} --region MidEast --id 0x0801 --name ar-IQ \
+       --windows ARI \
        MidEast/ar_IQ.txt >MidEast/CID0801.cs
  
  ${LOC2CUL} --region MidEast --id 0x2C01 --name ar-JO \
+       --windows ARJ \
        MidEast/ar_JO.txt >MidEast/CID2c01.cs
  
  ${LOC2CUL} --region MidEast --id 0x3401 --name ar-KW \
+       --windows ARK \
        MidEast/ar_KW.txt >MidEast/CID3401.cs
  
  ${LOC2CUL} --region MidEast --id 0x3001 --name ar-LB \
+       --windows ARB \
        MidEast/ar_LB.txt >MidEast/CID3001.cs
  
  ${LOC2CUL} --region MidEast --id 0x1001 --name ar-LY \
+       --windows ARL \
        MidEast/ar_LY.txt >MidEast/CID1001.cs
  
  ${LOC2CUL} --region MidEast --id 0x1801 --name ar-MA \
+       --windows ARM \
        MidEast/ar_MA.txt >MidEast/CID1801.cs
  
  ${LOC2CUL} --region MidEast --id 0x2001 --name ar-OM \
+       --windows ARO \
        MidEast/ar_OM.txt >MidEast/CID2001.cs
  
  ${LOC2CUL} --region MidEast --id 0x4001 --name ar-QA \
+       --windows ARQ \
        MidEast/ar_QA.txt >MidEast/CID4001.cs
  
***************
*** 90,99 ****
--- 104,116 ----
  
  ${LOC2CUL} --region MidEast --id 0x2801 --name ar-SY \
+       --windows ARS \
        MidEast/ar_SY.txt >MidEast/CID2801.cs
  
  ${LOC2CUL} --region MidEast --id 0x1C01 --name ar-TN \
+       --windows ART \
        MidEast/ar_TN.txt >MidEast/CID1c01.cs
  
  ${LOC2CUL} --region MidEast --id 0x3801 --name ar-YE \
+       --windows ARY \
        MidEast/ar_YE.txt >MidEast/CID3801.cs
  
***************
*** 101,104 ****
--- 118,122 ----
  
  ${LOC2CUL} --region Other --id 0x0023 --name be \
+       --iso2 be --iso3 bel --windows BEL \
        Other/be.txt >Other/CID0023.cs
  
***************
*** 109,112 ****
--- 127,131 ----
  
  ${LOC2CUL} --region West --id 0x0002 --name bg \
+       --iso2 bg --iso3 bul --windows BGR \
        West/bg.txt >West/CID0002.cs
  
***************
*** 117,120 ****
--- 136,140 ----
  
  ${LOC2CUL} --region West --id 0x0003 --name ca \
+       --iso2 ca --iso3 cat --windows CAT \
        West/ca.txt >West/CID0003.cs
  
***************
*** 125,128 ****
--- 145,149 ----
  
  ${LOC2CUL} --region West --id 0x0005 --name cs \
+       --iso2 cs --iso3 ces --windows CSY \
        West/cs.txt >West/CID0005.cs
  
***************
*** 133,136 ****
--- 154,158 ----
  
  ${LOC2CUL} --region West --id 0x0006 --name da \
+       --iso2 da --iso3 dan --windows DAN \
        West/da.txt >West/CID0006.cs
  
***************
*** 141,150 ****
--- 163,175 ----
  
  ${LOC2CUL} --region West --id 0x0007 --name de \
+       --iso2 de --iso3 deu --windows DEU \
        West/de.txt >West/CID0007.cs
  
  ${LOC2CUL} --region West --id 0x0C07 --name de-AT \
+       --windows DEA \
        West/de_AT.txt >West/CID0c07.cs
  
  ${LOC2CUL} --region West --id 0x0807 --name de-CH \
+       --windows DES \
        West/de_CH.txt >West/CID0807.cs
  
***************
*** 153,156 ****
--- 178,182 ----
  
  ${LOC2CUL} --region West --id 0x1007 --name de-LU \
+       --windows DEL \
        West/de_LU.txt >West/CID1007.cs
  
***************
*** 158,161 ****
--- 184,188 ----
  
  ${LOC2CUL} --region West --id 0x0008 --name el \
+       --iso2 el --iso3 ell --windows ELL \
        West/el.txt >West/CID0008.cs
  
***************
*** 166,187 ****
--- 193,221 ----
  
  ${LOC2CUL} --region Common --id 0x0009 --name en \
+       --iso2 en --iso3 eng --windows ENU \
        Common/en.txt >Common/CID0009.cs
  
  ${LOC2CUL} --region Common --id 0x0C09 --name en-AU \
+       --windows ENA \
        Common/en_AU.txt >Common/CID0c09.cs
  
  ${LOC2CUL} --region Common --id 0x1009 --name en-CA \
+       --windows ENC \
        Common/en_CA.txt >Common/CID1009.cs
  
  ${LOC2CUL} --region Common --id 0x0809 --name en-GB \
+       --windows ENG \
        Common/en_GB.txt >Common/CID0809.cs
  
  ${LOC2CUL} --region Common --id 0x1809 --name en-IE \
+       --windows ENI \
        Common/en_IE.txt >Common/CID1809.cs
  
  ${LOC2CUL} --region Common --id 0x1409 --name en-NZ \
+       --windows ENZ \
        Common/en_NZ.txt >Common/CID1409.cs
  
  ${LOC2CUL} --region Common --id 0x3409 --name en-PH \
+       --windows ENP \
        Common/en_PH.txt >Common/CID3409.cs
  
***************
*** 190,196 ****
--- 224,232 ----
  
  ${LOC2CUL} --region Common --id 0x1C09 --name en-ZA \
+       --windows ENS \
        Common/en_ZA.txt >Common/CID1c09.cs
  
  ${LOC2CUL} --region Common --id 0x3009 --name en-ZW \
+       --windows ENW \
        Common/en_ZW.txt >Common/CID3009.cs
  
***************
*** 198,258 ****
--- 234,314 ----
  
  ${LOC2CUL} --region West --id 0x000A --name es \
+       --iso2 es --iso3 spa --windows ESP \
        West/es.txt >West/CID000a.cs
  
  ${LOC2CUL} --region West --id 0x2C0A --name es-AR \
+       --windows ESS \
        West/es_AR.txt >West/CID2c0a.cs
  
  ${LOC2CUL} --region West --id 0x400A --name es-BO \
+       --windows ESB \
        West/es_BO.txt >West/CID400a.cs
  
  ${LOC2CUL} --region West --id 0x340A --name es-CL \
+       --windows ESL \
        West/es_CL.txt >West/CID340a.cs
  
  ${LOC2CUL} --region West --id 0x240A --name es-CO \
+       --windows ESO \
        West/es_CO.txt >West/CID240a.cs
  
  ${LOC2CUL} --region West --id 0x140A --name es-CR \
+       --windows ESC \
        West/es_CR.txt >West/CID140a.cs
  
  ${LOC2CUL} --region West --id 0x1C0A --name es-DO \
+       --windows ESD \
        West/es_DO.txt >West/CID1c0a.cs
  
  ${LOC2CUL} --region West --id 0x300A --name es-EC \
+       --windows ESF \
        West/es_EC.txt >West/CID300a.cs
  
  ${LOC2CUL} --region West --id 0x0C0A --name es-ES \
+       --windows ESN \
        West/es_ES.txt >West/CID0c0a.cs
  
  ${LOC2CUL} --region West --id 0x100A --name es-GT \
+       --windows ESG \
        West/es_GT.txt >West/CID100a.cs
  
  ${LOC2CUL} --region West --id 0x480A --name es-HN \
+       --windows ESH \
        West/es_HN.txt >West/CID480a.cs
  
  ${LOC2CUL} --region West --id 0x080A --name es-MX \
+       --windows ESM \
        West/es_MX.txt >West/CID080a.cs
  
  ${LOC2CUL} --region West --id 0x4C0A --name es-NI \
+       --windows ESI \
        West/es_NI.txt >West/CID4c0a.cs
  
  ${LOC2CUL} --region West --id 0x180A --name es-PA \
+       --windows ESA \
        West/es_PA.txt >West/CID180a.cs
  
  ${LOC2CUL} --region West --id 0x280A --name es-PE \
+       --windows ESR \
        West/es_PE.txt >West/CID280a.cs
  
  ${LOC2CUL} --region West --id 0x500A --name es-PR \
+       --windows ESU \
        West/es_PR.txt >West/CID500a.cs
  
  ${LOC2CUL} --region West --id 0x3C0A --name es-PY \
+       --windows ESZ \
        West/es_PY.txt >West/CID3c0a.cs
  
  ${LOC2CUL} --region West --id 0x440A --name es-SV \
+       --windows ESE \
        West/es_SV.txt >West/CID440a.cs
  
  ${LOC2CUL} --region West --id 0x380A --name es-UY \
+       --windows ESY \
        West/es_UY.txt >West/CID380a.cs
  
  ${LOC2CUL} --region West --id 0x200A --name es-VE \
+       --windows ESV \
        West/es_VE.txt >West/CID200a.cs
  
***************
*** 260,263 ****
--- 316,320 ----
  
  ${LOC2CUL} --region Other --id 0x0025 --name et \
+       --iso2 et --iso3 est --windows ETI \
        Other/et.txt >Other/CID0025.cs
  
***************
*** 268,271 ****
--- 325,329 ----
  
  ${LOC2CUL} --region West --id 0x002D --name eu \
+       --iso2 eu --iso3 eus --windows EUQ \
        West/eu.txt >West/CID002D.cs
  
***************
*** 276,279 ****
--- 334,338 ----
  
  ${LOC2CUL} --region MidEast --id 0x0029 --name fa \
+       --iso2 fa --iso3 fas --windows FAR \
        MidEast/fa.txt >MidEast/CID0029.cs
  
***************
*** 284,287 ****
--- 343,347 ----
  
  ${LOC2CUL} --region West --id 0x000B --name fi \
+       --iso2 fi --iso3 fin --windows FIN \
        West/fi.txt >West/CID000b.cs
  
***************
*** 292,295 ****
--- 352,356 ----
  
  ${LOC2CUL} --region Other --id 0x0038 --name fo \
+       --iso2 fo --iso3 fao --windows FOS \
        Other/fo.txt >Other/CID0038.cs
  
***************
*** 300,312 ****
--- 361,377 ----
  
  ${LOC2CUL} --region West --id 0x000C --name fr \
+       --iso2 fr --iso3 fra --windows FRA \
        West/fr.txt >West/CID000c.cs
  
  ${LOC2CUL} --region West --id 0x080C --name fr-BE \
+       --windows FRB \
        West/fr_BE.txt >West/CID080c.cs
  
  ${LOC2CUL} --region West --id 0x0C0C --name fr-CA \
+       --windows FRC \
        West/fr_CA.txt >West/CID0c0c.cs
  
  ${LOC2CUL} --region West --id 0x100C --name fr-CH \
+       --windows FRS \
        West/fr_CH.txt >West/CID100c.cs
  
***************
*** 315,318 ****
--- 380,384 ----
  
  ${LOC2CUL} --region West --id 0x140C --name fr-LU \
+       --windows FRL \
        West/fr_LU.txt >West/CID140c.cs
  
***************
*** 320,323 ****
--- 386,390 ----
  
  ${LOC2CUL} --region West --id 0x0056 --name gl \
+       --iso2 gl --iso3 glg --windows GLC \
        West/gl.txt >West/CID0056.cs
  
***************
*** 328,331 ****
--- 395,399 ----
  
  ${LOC2CUL} --region Other --id 0x0047 --name gu \
+       --iso2 gu --iso3 guj --windows GUJ \
        Other/gu.txt >Other/CID0047.cs
  
***************
*** 336,339 ****
--- 404,408 ----
  
  ${LOC2CUL} --region MidEast --id 0x000D --name he \
+       --iso2 he --iso3 heb --windows HEB \
        MidEast/he.txt >MidEast/CID000d.cs
  
***************
*** 344,347 ****
--- 413,417 ----
  
  ${LOC2CUL} --region Other --id 0x0039 --name hi \
+       --iso2 hi --iso3 hin --windows HIN \
        Other/hi.txt >Other/CID0039.cs
  
***************
*** 352,355 ****
--- 422,426 ----
  
  ${LOC2CUL} --region Other --id 0x001A --name hr \
+       --iso2 hr --iso3 hrv --windows HRV \
        Other/hr.txt >Other/CID001a.cs
  
***************
*** 360,363 ****
--- 431,435 ----
  
  ${LOC2CUL} --region West --id 0x000E --name hu \
+       --iso2 hu --iso3 hun --windows HUN \
        West/hu.txt >West/CID000e.cs
  
***************
*** 368,371 ****
--- 440,444 ----
  
  ${LOC2CUL} --region Other --id 0x002B --name hy \
+       --iso2 hy --iso3 hye --windows HYE \
        Other/hy.txt >Other/CID002b.cs
  
***************
*** 376,379 ****
--- 449,453 ----
  
  ${LOC2CUL} --region Other --id 0x0021 --name id \
+       --iso2 id --iso3 ind --windows IND \
        Other/id.txt >Other/CID0021.cs
  
***************
*** 384,387 ****
--- 458,462 ----
  
  ${LOC2CUL} --region West --id 0x000F --name is \
+       --iso2 is --iso3 isl --windows ISL \
        West/is.txt >West/CID000f.cs
  
***************
*** 392,398 ****
--- 467,475 ----
  
  ${LOC2CUL} --region West --id 0x0010 --name it \
+       --iso2 it --iso3 ita --windows ITA \
        West/it.txt >West/CID0010.cs
  
  ${LOC2CUL} --region West --id 0x0810 --name it-CH \
+       --windows ITS \
        West/it_CH.txt >West/CID0810.cs
  
***************
*** 403,406 ****
--- 480,484 ----
  
  ${LOC2CUL} --region CJK --id 0x0011 --name ja \
+       --iso2 ja --iso3 jpn --windows JPN \
        CJK/ja.txt >CJK/CID0011.cs
  
***************
*** 411,414 ****
--- 489,493 ----
  
  ${LOC2CUL} --region Other --id 0x004B --name kn \
+       --iso2 kn --iso3 kan --windows KAN \
        Other/kn.txt >Other/CID004b.cs
  
***************
*** 419,422 ****
--- 498,502 ----
  
  ${LOC2CUL} --region Other --id 0x0057 --name kok \
+       --iso2 kok --iso3 kok --windows KNK \
        Other/kok.txt >Other/CID0057.cs
  
***************
*** 427,430 ****
--- 507,511 ----
  
  ${LOC2CUL} --region CJK --id 0x0012 --name ko \
+       --iso2 ko --iso3 kor --windows KOR \
        CJK/ko.txt >CJK/CID0012.cs
  
***************
*** 435,438 ****
--- 516,520 ----
  
  ${LOC2CUL} --region Other --id 0x0027 --name lt \
+       --iso2 lt --iso3 lit --windows LTH \
        Other/lt.txt >Other/CID0027.cs
  
***************
*** 443,446 ****
--- 525,529 ----
  
  ${LOC2CUL} --region Other --id 0x0026 --name lv \
+       --iso2 lv --iso3 lav --windows LVI \
        Other/lv.txt >Other/CID0026.cs
  
***************
*** 451,454 ****
--- 534,538 ----
  
  ${LOC2CUL} --region Other --id 0x002F --name mk \
+       --iso2 mk --iso3 mkd --windows MKI \
        Other/mk.txt >Other/CID002f.cs
  
***************
*** 459,462 ****
--- 543,547 ----
  
  ${LOC2CUL} --region Other --id 0x004e --name mr \
+       --iso2 mr --iso3 mar --windows MAR \
        Other/mr.txt >Other/CID004e.cs
  
***************
*** 467,476 ****
--- 552,564 ----
  
  ${LOC2CUL} --region West --id 0x0014 --name no --alias no-NO \
+       --iso2 no --iso3 nor --windows NOR \
        West/no.txt >West/CID0014.cs
  
  ${LOC2CUL} --region West --id 0x0414 --name nb-NO --alias nb \
+       --iso2 nb --iso3 nob \
        West/nb_NO.txt >West/CID0414.cs
  
  ${LOC2CUL} --region West --id 0x0814 --name nn-NO --alias nn \
+       --iso2 nn --iso3 nno --windows NON \
        West/nn_NO.txt >West/CID0814.cs
  
***************
*** 478,484 ****
--- 566,574 ----
  
  ${LOC2CUL} --region West --id 0x0013 --name nl \
+       --iso2 nl --iso3 nld --windows NLD \
        West/nl.txt >West/CID0013.cs
  
  ${LOC2CUL} --region West --id 0x0813 --name nl-BE \
+       --windows NLB \
        West/nl_BE.txt >West/CID0813.cs
  
***************
*** 489,492 ****
--- 579,583 ----
  
  ${LOC2CUL} --region West --id 0x0015 --name pl \
+       --iso2 pl --iso3 pol --windows PLK \
        West/pl.txt >West/CID0015.cs
  
***************
*** 497,500 ****
--- 588,592 ----
  
  ${LOC2CUL} --region West --id 0x0016 --name pt \
+       --iso2 pt --iso3 por --windows PTB \
        West/pt.txt >West/CID0016.cs
  
***************
*** 503,506 ****
--- 595,599 ----
  
  ${LOC2CUL} --region West --id 0x0816 --name pt-PT \
+       --windows PTG \
        West/pt_PT.txt >West/CID0816.cs
  
***************
*** 508,511 ****
--- 601,605 ----
  
  ${LOC2CUL} --region West --id 0x0018 --name ro \
+       --iso2 ro --iso3 ron --windows ROM \
        West/ro.txt >West/CID0018.cs
  
***************
*** 516,519 ****
--- 610,614 ----
  
  ${LOC2CUL} --region Other --id 0x0019 --name ru \
+       --iso2 ru --iso3 rus --windows RUS \
        Other/ru.txt >Other/CID0019.cs
  
***************
*** 524,527 ****
--- 619,623 ----
  
  ${LOC2CUL} --region West --id 0x001B --name sk \
+       --iso2 sk --iso3 slk --windows SKY \
        West/sk.txt >West/CID001b.cs
  
***************
*** 532,535 ****
--- 628,632 ----
  
  ${LOC2CUL} --region Other --id 0x0024 --name sl \
+       --iso2 sl --iso3 slv --windows SLV \
        Other/sl.txt >Other/CID0024.cs
  
***************
*** 540,543 ****
--- 637,641 ----
  
  ${LOC2CUL} --region Other --id 0x001C --name sq \
+       --iso2 sq --iso3 sqi --windows SQI \
        Other/sq.txt >Other/CID001c.cs
  
***************
*** 548,551 ****
--- 646,650 ----
  
  ${LOC2CUL} --region West --id 0x001D --name sv \
+       --iso2 sv --iso3 swe --windows SVE \
        West/sv.txt >West/CID001d.cs
  
***************
*** 554,557 ****
--- 653,657 ----
  
  ${LOC2CUL} --region West --id 0x081D --name sv-FI \
+       --windows SVF \
        West/sv_FI.txt >West/CID081d.cs
  
***************
*** 559,562 ****
--- 659,663 ----
  
  ${LOC2CUL} --region Other --id 0x0041 --name sw \
+       --iso2 sw --iso3 swa --windows SWK \
        Other/sw.txt >Other/CID0041.cs
  
***************
*** 567,570 ****
--- 668,672 ----
  
  ${LOC2CUL} --region Other --id 0x0049 --name ta \
+       --iso2 ta --iso3 tam --windows TAM \
        Other/ta.txt >Other/CID0049.cs
  
***************
*** 575,578 ****
--- 677,681 ----
  
  ${LOC2CUL} --region Other --id 0x004A --name te \
+       --iso2 te --iso3 tel --windows TEL \
        Other/te.txt >Other/CID004a.cs
  
***************
*** 583,586 ****
--- 686,690 ----
  
  ${LOC2CUL} --region Other --id 0x001E --name th \
+       --iso2 th --iso3 tha --windows THA \
        Other/th.txt >Other/CID001e.cs
  
***************
*** 591,594 ****
--- 695,699 ----
  
  ${LOC2CUL} --region MidEast --id 0x001F --name tr \
+       --iso2 tr --iso3 tur --windows TRK \
        MidEast/tr.txt >MidEast/CID001f.cs
  
***************
*** 599,602 ****
--- 704,708 ----
  
  ${LOC2CUL} --region Other --id 0x0022 --name uk \
+       --iso2 uk --iso3 ukr --windows UKR \
        Other/uk.txt >Other/CID0022.cs
  
***************
*** 607,610 ****
--- 713,717 ----
  
  ${LOC2CUL} --region Other --id 0x002A --name vi \
+       --iso2 vi --iso3 vie --windows VIT \
        Other/vi.txt >Other/CID002a.cs
  
***************
*** 615,618 ****
--- 722,726 ----
  
  ${LOC2CUL} --region CJK --id 0x0004 --name zh --alias zh-CHS \
+       --iso2 zh --iso3 zho --windows CHS \
        CJK/zh.txt >CJK/CID0004.cs
  
***************
*** 621,633 ****
--- 729,745 ----
  
  ${LOC2CUL} --region CJK --id 0x0C04 --name zh-HK \
+       --windows ZHH \
        CJK/zh_HK.txt >CJK/CID0c04.cs
  
  ${LOC2CUL} --region CJK --id 0x1404 --name zh-MO \
+       --windows ZHM \
        CJK/zh_MO.txt >CJK/CID1404.cs
  
  ${LOC2CUL} --region CJK --id 0x1004 --name zh-SG \
+       --windows ZHI \
        CJK/zh_SG.txt >CJK/CID1004.cs
  
  ${LOC2CUL} --region CJK --id 0x0404 --name zh-TW --alias zh-CHT \
+       --windows CHT \
        CJK/zh_TW.txt >CJK/CID0404.cs
  

Index: loc2cul.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/tools/loc2cul.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** loc2cul.c   2 Jun 2003 00:59:00 -0000       1.2
--- loc2cul.c   2 Jun 2003 02:25:41 -0000       1.3
***************
*** 29,32 ****
--- 29,35 ----
        --alias str                             Human-readable alias name
        --root                                  Generate definitions for the 
root culture
+       --iso2 str                              Two-letter ISO name
+       --iso3 str                              Three-letter ISO name
+       --windows str                   Three-letter Windows name
  
  */
***************
*** 43,46 ****
--- 46,52 ----
  static char *name = 0;
  static char *alias = 0;
+ static char *iso2 = 0;
+ static char *iso3 = 0;
+ static char *windows = 0;
  static const char *filename = 0;
  
***************
*** 89,92 ****
--- 95,115 ----
                        --argc;
                }
+               else if(!strcmp(argv[1], "--iso2") && argc > 2)
+               {
+                       iso2 = argv[2];
+                       ++argv;
+                       --argc;
+               }
+               else if(!strcmp(argv[1], "--iso3") && argc > 2)
+               {
+                       iso3 = argv[2];
+                       ++argv;
+                       --argc;
+               }
+               else if(!strcmp(argv[1], "--windows") && argc > 2)
+               {
+                       windows = argv[2];
+                       ++argv;
+               }
                else if(!strcmp(argv[1], "--root"))
                {
***************
*** 145,148 ****
--- 168,174 ----
        fprintf(stderr, "    --alias str      Human-readable alias name\n");
        fprintf(stderr, "    --root           Generate definitions for the root 
culture\n");
+       fprintf(stderr, "    --iso2 str       Two-letter ISO name\n");
+       fprintf(stderr, "    --iso3 str       Three-letter ISO name\n");
+       fprintf(stderr, "    --windows str    Three-letter Windows name\n");
  }
  
***************
*** 568,577 ****
                   load the culture again */
                printf("public abstract class RootCulture : CultureInfo\n{\n");
!               printf("\tprivate CultureName cultureName;\n\n");
!               printf("\tpublic RootCulture(int culture, CultureName 
cultureName)\n");
!               printf("\t\t: base(0x40000000 + culture)\n");
!               printf("\t{\n");
!               printf("\t\tthis.cultureName = cultureName;\n");
!               printf("\t}\n\n");
  
                /* Override the name properties */
--- 594,599 ----
                   load the culture again */
                printf("public abstract class RootCulture : CultureInfo\n{\n");
!               printf("\tpublic RootCulture(int culture) ");
!               printf(": base(0x40000000 + culture) {}\n\n");
  
                /* Override the name properties */
***************
*** 590,600 ****
                printf("\t\t}\n");
                printf("\t}\n");
-               printf("\tpublic override String Name\n");
-               printf("\t{\n");
-               printf("\t\tget\n");
-               printf("\t\t{\n");
-               printf("\t\t\treturn cultureName.name;\n");
-               printf("\t\t}\n");
-               printf("\t}\n");
                printf("\tpublic override String NativeName\n");
                printf("\t{\n");
--- 612,615 ----
***************
*** 604,631 ****
                printf("\t\t}\n");
                printf("\t}\n");
-               printf("\tpublic override String ThreeLetterISOLanguageName\n");
-               printf("\t{\n");
-               printf("\t\tget\n");
-               printf("\t\t{\n");
-               printf("\t\t\treturn cultureName.threeLetterISOName;\n");
-               printf("\t\t}\n");
-               printf("\t}\n");
-               printf("\tpublic override String 
ThreeLetterWindowsLanguageName\n");
-               printf("\t{\n");
-               printf("\t\tget\n");
-               printf("\t\t{\n");
-               printf("\t\t\treturn cultureName.threeLetterWindowsName;\n");
-               printf("\t\t}\n");
-               printf("\t}\n");
-               printf("\tpublic override String TwoLetterISOLanguageName\n");
-               printf("\t{\n");
-               printf("\t\tget\n");
-               printf("\t\t{\n");
-               printf("\t\t\treturn cultureName.twoLetterISOName;\n");
-               printf("\t\t}\n");
-               printf("\t}\n\n");
  
!               /* Declare the "Language" and "Country" properties for the root 
*/
!               printf("\tpublic abstract String Language { get; }\n");
                printf("\tpublic virtual String Country\n");
                printf("\t{\n");
--- 619,624 ----
                printf("\t\t}\n");
                printf("\t}\n");
  
!               /* Declare the "Country" property for the root */
                printf("\tpublic virtual String Country\n");
                printf("\t{\n");
***************
*** 640,651 ****
                /* This is a neutral culture: inherit from RootCulture */
                printf("public class CID%04x : RootCulture\n{\n", identifier);
!               printf("\tprivate CultureName cultureName;\n\n");
!               printf("\tpublic CID%04x()\n", identifier);
!               printf("\t\t: base(0x%04X, "
!                                       
"CultureNameTable.GetNameInfoByID(0x%04X)) {}\n",
!                          identifier, identifier);
!               printf("\tpublic CID%04x(int culture, CultureName 
cultureName)\n",
!                          identifier);
!               printf("\t\t: base(culture, cultureName) {}\n\n");
        }
        else
--- 633,640 ----
                /* This is a neutral culture: inherit from RootCulture */
                printf("public class CID%04x : RootCulture\n{\n", identifier);
!               printf("\tpublic CID%04x() ", identifier);
!               printf(": base(0x%04X) {}\n", identifier);
!               printf("\tpublic CID%04x(int culture) ", identifier);
!               printf(": base(culture) {}\n\n");
        }
        else
***************
*** 655,673 ****
                printf("public class CID%04x : CID%04x\n{\n",
                           identifier, (identifier & 0x03FF));
!               printf("\tpublic CID%04x()\n", identifier);
!               printf("\t\t: base(0x%04X, "
!                                       
"CultureNameTable.GetNameInfoByID(0x%04X)) {}\n\n",
!                          identifier, identifier);
        }
        if(identifier != 0)
        {
!               /* Declare the "Language" and "Country" properties for a 
culture */
!               printf("\tpublic override String Language\n");
                printf("\t{\n");
                printf("\t\tget\n");
                printf("\t\t{\n");
!               printf("\t\t\treturn \"%c%c\";\n", name[0], name[1]);
                printf("\t\t}\n");
                printf("\t}\n");
                if(strlen(name) > 2)
                {
--- 644,692 ----
                printf("public class CID%04x : CID%04x\n{\n",
                           identifier, (identifier & 0x03FF));
!               printf("\tpublic CID%04x() ", identifier);
!               printf(": base(0x%04X) {}\n\n", identifier);
        }
        if(identifier != 0)
        {
!               /* Declare the name properties */
!               printf("\tpublic override String Name\n");
                printf("\t{\n");
                printf("\t\tget\n");
                printf("\t\t{\n");
!               printf("\t\t\treturn \"%s\";\n", name);
                printf("\t\t}\n");
                printf("\t}\n");
+               if(iso3)
+               {
+                       printf("\tpublic override String 
ThreeLetterISOLanguageName\n");
+                       printf("\t{\n");
+                       printf("\t\tget\n");
+                       printf("\t\t{\n");
+                       printf("\t\t\treturn \"%s\";\n", iso3);
+                       printf("\t\t}\n");
+                       printf("\t}\n");
+               }
+               if(windows)
+               {
+                       printf("\tpublic override String 
ThreeLetterWindowsLanguageName\n");
+                       printf("\t{\n");
+                       printf("\t\tget\n");
+                       printf("\t\t{\n");
+                       printf("\t\t\treturn \"%s\";\n", windows);
+                       printf("\t\t}\n");
+                       printf("\t}\n");
+               }
+               if(iso2)
+               {
+                       printf("\tpublic override String 
TwoLetterISOLanguageName\n");
+                       printf("\t{\n");
+                       printf("\t\tget\n");
+                       printf("\t\t{\n");
+                       printf("\t\t\treturn \"%s\";\n", iso2);
+                       printf("\t\t}\n");
+                       printf("\t}\n");
+               }
+ 
+               /* Declare the "Country" property for a culture */
                if(strlen(name) > 2)
                {





reply via email to

[Prev in Thread] Current Thread [Next in Thread]