summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-10-02 08:00:25 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-10-02 08:00:25 +0000
commitf28d6db58747245c798b3e77ac8a8871b9190095 (patch)
tree7c6704698da795d565eff7b7d4f0ff8f6473c506 /Build/source
parent2faf58f41cab410a689b684f7d0c86b644d91d85 (diff)
icu 54.1 (release)
git-svn-id: svn://tug.org/texlive/trunk@35299 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/README2
-rw-r--r--Build/source/libs/icu/ChangeLog4
-rw-r--r--Build/source/libs/icu/icu-54.1-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/icu/icu-54.1-PATCHES/TL-Changes10
-rw-r--r--Build/source/libs/icu/icu-54.1/readme.html9
-rw-r--r--Build/source/libs/icu/icu-54.1/source/common/ubidi.c15
-rw-r--r--Build/source/libs/icu/icu-54.1/source/common/ubidiimp.h12
-rw-r--r--Build/source/libs/icu/icu-54.1/source/data/in/icudt54l.datbin16794144 -> 16801168 bytes
-rw-r--r--Build/source/libs/icu/icu-54.1/source/data/misc/zoneinfo64.txt74
-rw-r--r--Build/source/libs/icu/icu-54.1/source/i18n/unicode/smpdtfmt.h45
-rw-r--r--Build/source/libs/icu/icu-54.1/source/i18n/unicode/ucol.h29
-rw-r--r--Build/source/libs/icu/icu-54.1/source/i18n/unicode/unum.h18
-rw-r--r--Build/source/libs/icu/icu-54.1/source/i18n/unicode/usearch.h4
-rw-r--r--Build/source/libs/icu/icu-54.1/source/test/cintltst/cdattst.c5
-rw-r--r--Build/source/libs/icu/icu-54.1/source/test/intltest/tztest.cpp31
-rw-r--r--Build/source/libs/icu/icu-54.1/source/tools/tzcode/icuzones4
16 files changed, 138 insertions, 129 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 0b279616d49..1cd8ba3cf4c 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -27,7 +27,7 @@ graphite2 1.2.4 - checked 2dec13
harfbuzz 0.9.35 - checked 14aug14
http://www.freedesktop.org/software/harfbuzz/release/
-icu 54.1 (rc) - checked 18sep14
+icu 54.1 (release) - checked 2oct14
http://download.icu-project.org/files/icu4c/
libpaper 1.1.24+nmu2 - checked 24oct13
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 530692b94ba..db8f897c75e 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Update icu-54.1 (release).
+
2014-09-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Import icu-54.1 (54_rc).
diff --git a/Build/source/libs/icu/icu-54.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-54.1-PATCHES/ChangeLog
index c7a75f295f6..d5ae87ccb00 100644
--- a/Build/source/libs/icu/icu-54.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-54.1-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Updated icu-54.1 source tree (icu4c-54_1-src.tgz) from:
+ http://download.icu-project.org/files/icu4c/54.1/
+
2014-09-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported icu-54.1 source tree (icu4c-54_rc-src.tgz) from:
diff --git a/Build/source/libs/icu/icu-54.1-PATCHES/TL-Changes b/Build/source/libs/icu/icu-54.1-PATCHES/TL-Changes
index c11a96e516e..c74ca3b753b 100644
--- a/Build/source/libs/icu/icu-54.1-PATCHES/TL-Changes
+++ b/Build/source/libs/icu/icu-54.1-PATCHES/TL-Changes
@@ -1,9 +1,19 @@
Changes applied to the icu-54.1/ tree as obtained from:
http://download.icu-project.org/files/icu4c/54rc/icu4c-53_rc-src.tgz
+Added:
+ source/data/in/icudt54l.dat
+
Removed:
as_is/
packaging/
+ source/data/brkitr/
+ source/data/coll/
+ source/data/locales/
+ source/data/mappings/
+ source/data/rbnf/
+ source/data/translit/
+ source/data/xml/
Removed empty directory:
source/config/m4/
diff --git a/Build/source/libs/icu/icu-54.1/readme.html b/Build/source/libs/icu/icu-54.1/readme.html
index af9fc459713..4f992452fbf 100644
--- a/Build/source/libs/icu/icu-54.1/readme.html
+++ b/Build/source/libs/icu/icu-54.1/readme.html
@@ -3,7 +3,7 @@
<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
- <title>ReadMe for ICU 54.1 (rc)</title>
+ <title>ReadMe for ICU 54.1</title>
<meta name="COPYRIGHT" content=
"Copyright (c) 1997-2014 IBM Corporation and others. All Rights Reserved." />
<meta name="KEYWORDS" content=
@@ -23,7 +23,8 @@
milestone - if the release note is a milestone release
-->
- <body class="rc">
+ <!--<body class="rc">-->
+ <body>
<p class="only-draft"><b>Note:</b> This is a draft readme.</p>
<h1>
@@ -32,7 +33,7 @@
<span class="only-rc">Release Candidate</span>
<span class="only-milestone">(Milestone Release)</span>
- <abbr title="International Components for Unicode">ICU</abbr> 54.1 (rc) ReadMe
+ <abbr title="International Components for Unicode">ICU</abbr> 54.1 ReadMe
</h1>
@@ -45,7 +46,7 @@
<p class="note only-rc">This is a release candidate version of ICU4C.
It is not recommended for production use.</p>
- <p>Last updated: 2014-September-16<br />
+ <p>Last updated: 2014-September-24<br />
Copyright &copy; 1997-2014 International Business Machines Corporation and
others. All Rights Reserved.</p>
<!-- Remember that there is a copyright at the end too -->
diff --git a/Build/source/libs/icu/icu-54.1/source/common/ubidi.c b/Build/source/libs/icu/icu-54.1/source/common/ubidi.c
index b62b7df9081..8c0d64b0398 100644
--- a/Build/source/libs/icu/icu-54.1/source/common/ubidi.c
+++ b/Build/source/libs/icu/icu-54.1/source/common/ubidi.c
@@ -403,12 +403,12 @@ static UBool
checkParaCount(UBiDi *pBiDi) {
int32_t count=pBiDi->paraCount;
if(pBiDi->paras==pBiDi->simpleParas) {
- if(count<=SIMPLE_PARAS_SIZE)
+ if(count<=SIMPLE_PARAS_COUNT)
return TRUE;
- if(!getInitialParasMemory(pBiDi, SIMPLE_PARAS_SIZE * 2))
+ if(!getInitialParasMemory(pBiDi, SIMPLE_PARAS_COUNT * 2))
return FALSE;
pBiDi->paras=pBiDi->parasMemory;
- uprv_memcpy(pBiDi->parasMemory, pBiDi->simpleParas, SIMPLE_PARAS_SIZE * sizeof(Para));
+ uprv_memcpy(pBiDi->parasMemory, pBiDi->simpleParas, SIMPLE_PARAS_COUNT * sizeof(Para));
return TRUE;
}
if(!getInitialParasMemory(pBiDi, count * 2))
@@ -682,7 +682,7 @@ bracketInit(UBiDi *pBiDi, BracketData *bd) {
bd->openingsCount=pBiDi->openingsSize / sizeof(Opening);
} else {
bd->openings=bd->simpleOpenings;
- bd->openingsCount=SIMPLE_OPENINGS_SIZE;
+ bd->openingsCount=SIMPLE_OPENINGS_COUNT;
}
bd->isNumbersSpecial=bd->pBiDi->reorderingMode==UBIDI_REORDER_NUMBERS_SPECIAL ||
bd->pBiDi->reorderingMode==UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL;
@@ -749,7 +749,7 @@ bracketAddOpening(BracketData *bd, UChar match, int32_t position) {
return FALSE;
if(bd->openings==bd->simpleOpenings)
uprv_memcpy(pBiDi->openingsMemory, bd->simpleOpenings,
- SIMPLE_OPENINGS_SIZE * sizeof(Opening));
+ SIMPLE_OPENINGS_COUNT * sizeof(Opening));
bd->openings=pBiDi->openingsMemory; /* may have changed */
bd->openingsCount=pBiDi->openingsSize / sizeof(Opening);
}
@@ -2167,6 +2167,9 @@ resolveImplicitLevels(UBiDi *pBiDi,
} else {
DirProp prop, prop1;
prop=dirProps[i];
+ if(prop==B) {
+ pBiDi->isolateCount=-1; /* current isolates stack entry == none */
+ }
if(inverseRTL) {
if(prop==AL) {
/* AL before EN does not make it AN */
@@ -2634,7 +2637,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length,
}
/* allocate isolate memory */
- if(pBiDi->isolateCount<=SIMPLE_ISOLATES_SIZE)
+ if(pBiDi->isolateCount<=SIMPLE_ISOLATES_COUNT)
pBiDi->isolates=pBiDi->simpleIsolates;
else
if((int32_t)(pBiDi->isolateCount*sizeof(Isolate))<=pBiDi->isolatesSize)
diff --git a/Build/source/libs/icu/icu-54.1/source/common/ubidiimp.h b/Build/source/libs/icu/icu-54.1/source/common/ubidiimp.h
index 6db5b44c17a..20ab9b994e9 100644
--- a/Build/source/libs/icu/icu-54.1/source/common/ubidiimp.h
+++ b/Build/source/libs/icu/icu-54.1/source/common/ubidiimp.h
@@ -122,11 +122,11 @@ ubidi_getParaLevelAtIndex(const UBiDi *pBiDi, int32_t index);
(ubidi)->paraLevel : ubidi_getParaLevelAtIndex((ubidi), (index))))
/* number of paras entries allocated initially without malloc */
-#define SIMPLE_PARAS_SIZE 10
+#define SIMPLE_PARAS_COUNT 10
/* number of isolate entries allocated initially without malloc */
-#define SIMPLE_ISOLATES_SIZE 5
+#define SIMPLE_ISOLATES_COUNT 5
/* number of isolate run entries for paired brackets allocated initially without malloc */
-#define SIMPLE_OPENINGS_SIZE 20
+#define SIMPLE_OPENINGS_COUNT 20
#define CR 0x000D
#define LF 0x000A
@@ -171,7 +171,7 @@ typedef struct IsoRun {
typedef struct BracketData {
UBiDi *pBiDi;
/* array of opening entries which should be enough in most cases; no malloc() */
- Opening simpleOpenings[SIMPLE_OPENINGS_SIZE];
+ Opening simpleOpenings[SIMPLE_OPENINGS_COUNT];
Opening *openings; /* pointer to current array of entries */
int32_t openingsCount; /* number of allocated entries */
int32_t isoRunLast; /* index of last used entry */
@@ -345,7 +345,7 @@ struct UBiDi {
Para *paras;
/* for relatively short text, we only need a tiny array of paras (no malloc()) */
- Para simpleParas[SIMPLE_PARAS_SIZE];
+ Para simpleParas[SIMPLE_PARAS_COUNT];
/* fields for line reordering */
int32_t runCount; /* ==-1: runs not set up yet */
@@ -363,7 +363,7 @@ struct UBiDi {
Isolate *isolates;
/* for simple text, have a small stack (no malloc()) */
- Isolate simpleIsolates[SIMPLE_ISOLATES_SIZE];
+ Isolate simpleIsolates[SIMPLE_ISOLATES_COUNT];
/* for inverse Bidi with insertion of directional marks */
InsertPoints insertPoints;
diff --git a/Build/source/libs/icu/icu-54.1/source/data/in/icudt54l.dat b/Build/source/libs/icu/icu-54.1/source/data/in/icudt54l.dat
index f4bd034fba9..b5405fd3c25 100644
--- a/Build/source/libs/icu/icu-54.1/source/data/in/icudt54l.dat
+++ b/Build/source/libs/icu/icu-54.1/source/data/in/icudt54l.dat
Binary files differ
diff --git a/Build/source/libs/icu/icu-54.1/source/data/misc/zoneinfo64.txt b/Build/source/libs/icu/icu-54.1/source/data/misc/zoneinfo64.txt
index 13f2459e6e9..945dec14773 100644
--- a/Build/source/libs/icu/icu-54.1/source/data/misc/zoneinfo64.txt
+++ b/Build/source/libs/icu/icu-54.1/source/data/misc/zoneinfo64.txt
@@ -3,17 +3,17 @@
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Wed Sep 3 03:51:27 2014
+// Build date: Fri Sep 26 12:59:27 2014
// Olson source: ftp://elsie.nci.nih.gov/pub/
-// Olson version: 2014g
-// ICU version: 54.0.1
+// Olson version: 2014h
+// ICU version: 54.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
// >> !!! >>> DO NOT EDIT <<< !!! <<
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
- TZVersion { "2014g" }
+ TZVersion { "2014h" }
Zones:array {
/* ACT */ :int { 347 } //Z#0
/* AET */ :int { 359 } //Z#1
@@ -60,17 +60,9 @@ zoneinfo64:table(nofallback) {
typeOffsets:intvector { -3740, 0, -3600, 0, 0, 0 }
typeMap:bin { "0102" }
} //Z#14
- /* Africa/Blantyre */ :table {
- trans:intvector { -2109291600 }
- typeOffsets:intvector { 8400, 0, 7200, 0 }
- typeMap:bin { "01" }
- } //Z#15
+ /* Africa/Blantyre */ :int { 43 } //Z#15
/* Africa/Brazzaville */ :int { 36 } //Z#16
- /* Africa/Bujumbura */ :table {
- transPre32:intvector { -1, 1770438648 }
- typeOffsets:intvector { 7048, 0, 7200, 0 }
- typeMap:bin { "01" }
- } //Z#17
+ /* Africa/Bujumbura */ :int { 43 } //Z#17
/* Africa/Cairo */ :table {
transPre32:intvector { -1, 2109558187 }
trans:intvector { -929844000, -923108400, -906170400, -892868400, -875844000, -857790000, -844308000, -825822000, -812685600, -794199600, -779853600, -762663600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -71107200, -52707600, -39484800, -21171600, -7948800, 10364400, 23587200, 41900400, 55123200, 73522800, 86745600, 105058800, 118281600, 136594800, 149817600, 168130800, 181353600, 199753200, 212976000, 231289200, 244512000, 262825200, 276048000, 294361200, 307584000, 325983600, 339206400, 357519600, 370742400, 396399600, 402278400, 426812400, 433814400, 452214000, 465436800, 483750000, 496972800, 515286000, 528508800, 546822000, 560044800, 578444400, 591667200, 610412400, 623203200, 641516400, 654739200, 673052400, 686275200, 704674800, 717897600, 736210800, 749433600, 767746800, 780969600, 799020000, 812322000, 830469600, 843771600, 861919200, 875221200, 893368800, 906670800, 925423200, 938725200, 956872800, 970174800, 988322400, 1001624400, 1019772000, 1033074000, 1051221600, 1064523600, 1083276000, 1096578000, 1114725600, 1128027600, 1146175200, 1158872400, 1177624800, 1189112400, 1209074400, 1219957200, 1240524000, 1250802000, 1272578400, 1281474000, 1284069600, 1285880400, 1400191200, 1403816400, 1406844000, 1411678800, 1429826400, 1434056400, 1437688800, 1443128400, 1461880800, 1464901200, 1467928800, 1475182800, 1493330400, 1495746000, 1498773600, 1506632400, 1524780000, 1525986000, 1529013600, 1538082000, 1556229600, 1556830800, 1559858400, 1569531600, 1590703200, 1600981200, 1620943200, 1633035600, 1651788000, 1664485200, 1682632800, 1695934800 }
@@ -122,23 +114,14 @@ zoneinfo64:table(nofallback) {
finalYear:int { 2039 }
} //Z#26
/* Africa/Freetown */ :int { 5 } //Z#27
- /* Africa/Gaborone */ :table {
- transPre32:intvector { -1, 1612673076 }
- trans:intvector { -2109288600, -829526400, -813805200 }
- typeOffsets:intvector { 6220, 0, 5400, 0, 7200, 0, 7200, 3600 }
- typeMap:bin { "01020302" }
- } //Z#28
- /* Africa/Harare */ :table {
- trans:intvector { -2109290652 }
- typeOffsets:intvector { 7452, 0, 7200, 0 }
- typeMap:bin { "01" }
- links:intvector { 29, 370 }
- } //Z#29
+ /* Africa/Gaborone */ :int { 43 } //Z#28
+ /* Africa/Harare */ :int { 43 } //Z#29
/* Africa/Johannesburg */ :table {
transPre32:intvector { -1, 1836794176 }
trans:intvector { -2109288600, -860976000, -845254800, -829526400, -813805200 }
typeOffsets:intvector { 6720, 0, 5400, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "010203020302" }
+ links:intvector { 30, 44, 45 }
} //Z#30
/* Africa/Juba */ :int { 33 } //Z#31
/* Africa/Kampala */ :table {
@@ -152,11 +135,7 @@ zoneinfo64:table(nofallback) {
typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020103" }
links:intvector { 31, 33 }
} //Z#33
- /* Africa/Kigali */ :table {
- trans:intvector { -1091498416 }
- typeOffsets:intvector { 7216, 0, 7200, 0 }
- typeMap:bin { "01" }
- } //Z#34
+ /* Africa/Kigali */ :int { 43 } //Z#34
/* Africa/Kinshasa */ :int { 36 } //Z#35
/* Africa/Lagos */ :table {
trans:intvector { -1588464816 }
@@ -167,32 +146,17 @@ zoneinfo64:table(nofallback) {
/* Africa/Libreville */ :int { 36 } //Z#37
/* Africa/Lome */ :int { 5 } //Z#38
/* Africa/Luanda */ :int { 36 } //Z#39
- /* Africa/Lubumbashi */ :table {
- transPre32:intvector { -1, 2018320704 }
- typeOffsets:intvector { 6592, 0, 7200, 0 }
- typeMap:bin { "01" }
- } //Z#40
- /* Africa/Lusaka */ :table {
- trans:intvector { -2109289988 }
- typeOffsets:intvector { 6788, 0, 7200, 0 }
- typeMap:bin { "01" }
- } //Z#41
+ /* Africa/Lubumbashi */ :int { 43 } //Z#40
+ /* Africa/Lusaka */ :int { 43 } //Z#41
/* Africa/Malabo */ :int { 36 } //Z#42
/* Africa/Maputo */ :table {
trans:intvector { -2109291020 }
typeOffsets:intvector { 7820, 0, 7200, 0 }
typeMap:bin { "01" }
+ links:intvector { 15, 17, 28, 29, 34, 40, 41, 43, 370 }
} //Z#43
- /* Africa/Maseru */ :table {
- trans:intvector { -2109289800, -829526400, -813805200 }
- typeOffsets:intvector { 6600, 0, 7200, 0, 7200, 3600 }
- typeMap:bin { "010201" }
- } //Z#44
- /* Africa/Mbabane */ :table {
- trans:intvector { -2109290664 }
- typeOffsets:intvector { 7464, 0, 7200, 0 }
- typeMap:bin { "01" }
- } //Z#45
+ /* Africa/Maseru */ :int { 30 } //Z#44
+ /* Africa/Mbabane */ :int { 30 } //Z#45
/* Africa/Mogadishu */ :table {
transPre32:intvector { -1, 1891394808 }
trans:intvector { -1230778800, -410236200 }
@@ -740,7 +704,7 @@ zoneinfo64:table(nofallback) {
finalYear:int { 2008 }
} //Z#140
/* America/Jamaica */ :table {
- trans:intvector { -1827687169, 136364400, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600 }
+ trans:intvector { -1827687169, 126687600, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600 }
typeOffsets:intvector { -18431, 0, -18000, 0, -18000, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201" }
links:intvector { 141, 517 }
@@ -1606,7 +1570,7 @@ zoneinfo64:table(nofallback) {
links:intvector { 292, 463 }
} //Z#292
/* Asia/Novokuznetsk */ :table {
- trans:intvector { -1577512128, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701798400, 717519600, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1035658800, 1048964400, 1067108400, 1080414000, 1099162800, 1111863600, 1130612400, 1143313200, 1162062000, 1174762800, 1193511600, 1206817200, 1224961200, 1238266800, 1256410800, 1269716400, 1288468800, 1301169600 }
+ trans:intvector { -1441259328, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701798400, 717519600, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1035658800, 1048964400, 1067108400, 1080414000, 1099162800, 1111863600, 1130612400, 1143313200, 1162062000, 1174762800, 1193511600, 1206817200, 1224961200, 1238266800, 1256410800, 1269716400, 1288468800, 1301169600 }
typeOffsets:intvector { 20928, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" }
} //Z#293
@@ -1966,7 +1930,7 @@ zoneinfo64:table(nofallback) {
/* Brazil/DeNoronha */ :int { 175 } //Z#367
/* Brazil/East */ :int { 200 } //Z#368
/* Brazil/West */ :int { 155 } //Z#369
- /* CAT */ :int { 29 } //Z#370
+ /* CAT */ :int { 43 } //Z#370
/* CET */ :table {
trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -766623600, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 3600, 0, 3600, 3600 }
@@ -3617,7 +3581,7 @@ zoneinfo64:table(nofallback) {
"BR", //Z#367 Brazil/DeNoronha
"BR", //Z#368 Brazil/East
"BR", //Z#369 Brazil/West
- "ZW", //Z#370 CAT
+ "MZ", //Z#370 CAT
"001",//Z#371 CET
"CA", //Z#372 CNT
"US", //Z#373 CST
diff --git a/Build/source/libs/icu/icu-54.1/source/i18n/unicode/smpdtfmt.h b/Build/source/libs/icu/icu-54.1/source/i18n/unicode/smpdtfmt.h
index 7d056cb2a14..d41fb59f713 100644
--- a/Build/source/libs/icu/icu-54.1/source/i18n/unicode/smpdtfmt.h
+++ b/Build/source/libs/icu/icu-54.1/source/i18n/unicode/smpdtfmt.h
@@ -71,7 +71,8 @@ class TimeZoneFormat;
* <a href="http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table">UTS#35
* Unicode Locale Data Markup Language (LDML)</a> and further documented for ICU in the
* <a href="https://sites.google.com/site/icuprojectuserguide/formatparse/datetime?pli=1#TOC-Date-Field-Symbol-Table">ICU
- * User Guide</a>. The following pattern letters are currently available:</p>
+ * User Guide</a>. The following pattern letters are currently available (note that the actual
+ * values depend on CLDR and may change from the examples shown here):</p>
*
* <table border="1">
* <tr>
@@ -87,7 +88,7 @@ class TimeZoneFormat;
* <td style="text-align: center">1..3</td>
* <td>AD</td>
* <td rowspan="3">Era - Replaced with the Era string for the current date. One to three letters for the
- * abbreviated form, four letters for the long form, five for the narrow form.</td>
+ * abbreviated form, four letters for the long (wide) form, five for the narrow form.</td>
* </tr>
* <tr>
* <td style="text-align: center">4</td>
@@ -182,7 +183,7 @@ class TimeZoneFormat;
* <td>&#30002;&#23376;</td>
* <td rowspan="3">Cyclic year name. Calendars such as the Chinese lunar calendar (and related calendars)
* and the Hindu calendars use 60-year cycles of year names. Use one through three letters for the abbreviated
- * name, four for the full name, or five for the narrow name (currently the data only provides abbreviated names,
+ * name, four for the full (wide) name, or five for the narrow name (currently the data only provides abbreviated names,
* which will be used for all requested name widths). If the calendar does not provide cyclic year name data,
* or if the year value to be formatted is out of the range of years for which cyclic name data is provided,
* then numeric formatting is used (behaves like 'y').</td>
@@ -200,8 +201,8 @@ class TimeZoneFormat;
* <td rowspan="3" style="text-align: center">Q</td>
* <td style="text-align: center">1..2</td>
* <td>02</td>
- * <td rowspan="3">Quarter - Use one or two for the numerical quarter, three for the abbreviation, or four
- * for the full name.</td>
+ * <td rowspan="3">Quarter - Use one or two for the numerical quarter, three for the abbreviation, or four for the
+ * full (wide) name (five for the narrow name is not yet supported).</td>
* </tr>
* <tr>
* <td style="text-align: center">3</td>
@@ -216,7 +217,7 @@ class TimeZoneFormat;
* <td style="text-align: center">1..2</td>
* <td>02</td>
* <td rowspan="3"><b>Stand-Alone</b> Quarter - Use one or two for the numerical quarter, three for the abbreviation,
- * or four for the full name.</td>
+ * or four for the full name (five for the narrow name is not yet supported).</td>
* </tr>
* <tr>
* <td style="text-align: center">3</td>
@@ -232,11 +233,12 @@ class TimeZoneFormat;
* <td style="text-align: center">1..2</td>
* <td>09</td>
* <td rowspan="4">Month - Use one or two for the numerical month, three for the abbreviation, four for
- * the full name, or five for the narrow name.</td>
+ * the full (wide) name, or five for the narrow name. With two ("MM"), the month number is zero-padded
+ * if necessary (e.g. "08")</td>
* </tr>
* <tr>
* <td style="text-align: center">3</td>
- * <td>Sept</td>
+ * <td>Sep</td>
* </tr>
* <tr>
* <td style="text-align: center">4</td>
@@ -251,11 +253,12 @@ class TimeZoneFormat;
* <td style="text-align: center">1..2</td>
* <td>09</td>
* <td rowspan="4"><b>Stand-Alone</b> Month - Use one or two for the numerical month, three for the abbreviation,
- * or four for the full name, or 5 for the narrow name.</td>
+ * four for the full (wide) name, or 5 for the narrow name. With two ("LL"), the month number is zero-padded if
+ * necessary (e.g. "08")</td>
* </tr>
* <tr>
* <td style="text-align: center">3</td>
- * <td>Sept</td>
+ * <td>Sep</td>
* </tr>
* <tr>
* <td style="text-align: center">4</td>
@@ -270,7 +273,8 @@ class TimeZoneFormat;
* <td style="text-align: center">w</td>
* <td style="text-align: center">1..2</td>
* <td>27</td>
- * <td>Week of Year.</td>
+ * <td>Week of Year. Use "w" to show the minimum number of digits, or "ww" to always show two digits
+ * (zero-padding if necessary, e.g. "08").</td>
* </tr>
* <tr>
* <td style="text-align: center">W</td>
@@ -283,7 +287,8 @@ class TimeZoneFormat;
* <td style="text-align: center">d</td>
* <td style="text-align: center">1..2</td>
* <td>1</td>
- * <td>Date - Day of the month</td>
+ * <td>Date - Day of the month. Use "d" to show the minimum number of digits, or "dd" to always show
+ * two digits (zero-padding if necessary, e.g. "08").</td>
* </tr>
* <tr>
* <td style="text-align: center">D</td>
@@ -311,8 +316,8 @@ class TimeZoneFormat;
* day</th>
* <td rowspan="4" style="text-align: center">E</td>
* <td style="text-align: center">1..3</td>
- * <td>Tues</td>
- * <td rowspan="4">Day of week - Use one through three letters for the short day, or four for the full name,
+ * <td>Tue</td>
+ * <td rowspan="4">Day of week - Use one through three letters for the short day, four for the full (wide) name,
* five for the narrow name, or six for the short name.</td>
* </tr>
* <tr>
@@ -336,7 +341,7 @@ class TimeZoneFormat;
* </tr>
* <tr>
* <td style="text-align: center">3</td>
- * <td>Tues</td>
+ * <td>Tue</td>
* </tr>
* <tr>
* <td style="text-align: center">4</td>
@@ -355,12 +360,12 @@ class TimeZoneFormat;
* <td style="text-align: center">1</td>
* <td>2</td>
* <td rowspan="5"><b>Stand-Alone</b> local day of week - Use one letter for the local numeric value (same
- * as 'e'), three for the short day, four for the full name, five for the narrow name, or six for
+ * as 'e'), three for the short day, four for the full (wide) name, five for the narrow name, or six for
* the short name.</td>
* </tr>
* <tr>
* <td style="text-align: center">3</td>
- * <td>Tues</td>
+ * <td>Tue</td>
* </tr>
* <tr>
* <td style="text-align: center">4</td>
@@ -415,14 +420,16 @@ class TimeZoneFormat;
* <td style="text-align: center">m</td>
* <td style="text-align: center">1..2</td>
* <td>59</td>
- * <td>Minute. Use one or two for zero padding.</td>
+ * <td>Minute. Use "m" to show the minimum number of digits, or "mm" to always show two digits
+ * (zero-padding if necessary, e.g. "08").</td>
* </tr>
* <tr>
* <th rowspan="3">second</th>
* <td style="text-align: center">s</td>
* <td style="text-align: center">1..2</td>
* <td>12</td>
- * <td>Second. Use one or two for zero padding.</td>
+ * <td>Second. Use "s" to show the minimum number of digits, or "ss" to always show two digits
+ * (zero-padding if necessary, e.g. "08").</td>
* </tr>
* <tr>
* <td style="text-align: center">S</td>
diff --git a/Build/source/libs/icu/icu-54.1/source/i18n/unicode/ucol.h b/Build/source/libs/icu/icu-54.1/source/i18n/unicode/ucol.h
index 511a63cb902..bd3db7b1d35 100644
--- a/Build/source/libs/icu/icu-54.1/source/i18n/unicode/ucol.h
+++ b/Build/source/libs/icu/icu-54.1/source/i18n/unicode/ucol.h
@@ -867,31 +867,32 @@ ucol_getKeywordValuesForLocale(const char* key,
UErrorCode* status);
/**
- * Return the functionally equivalent locale for the given
- * requested locale, with respect to given keyword, for the
- * collation service. If two locales return the same result, then
- * collators instantiated for these locales will behave
- * equivalently. The converse is not always true; two collators
+ * Return the functionally equivalent locale for the specified
+ * input locale, with respect to given keyword, for the
+ * collation service. If two different input locale + keyword
+ * combinations produce the same result locale, then collators
+ * instantiated for these two different input locales will behave
+ * equivalently. The converse is not always true; two collators
* may in fact be equivalent, but return different results, due to
- * internal details. The return result has no other meaning than
+ * internal details. The return result has no other meaning than
* that stated above, and implies nothing as to the relationship
- * between the two locales. This is intended for use by
+ * between the two locales. This is intended for use by
* applications who wish to cache collators, or otherwise reuse
- * collators when possible. The functional equivalent may change
- * over time. For more information, please see the <a
+ * collators when possible. The functional equivalent may change
+ * over time. For more information, please see the <a
* href="http://userguide.icu-project.org/locale#TOC-Locales-and-Services">
* Locales and Services</a> section of the ICU User Guide.
- * @param result fillin for the functionally equivalent locale
+ * @param result fillin for the functionally equivalent result locale
* @param resultCapacity capacity of the fillin buffer
* @param keyword a particular keyword as enumerated by
* ucol_getKeywords.
- * @param locale the requested locale
+ * @param locale the specified input locale
* @param isAvailable if non-NULL, pointer to a fillin parameter that
- * indicates whether the requested locale was 'available' to the
- * collation service. A locale is defined as 'available' if it
+ * on return indicates whether the specified input locale was 'available'
+ * to the collation service. A locale is defined as 'available' if it
* physically exists within the collation locale data.
* @param status pointer to input-output error code
- * @return the actual buffer size needed for the locale. If greater
+ * @return the actual buffer size needed for the locale. If greater
* than resultCapacity, the returned full name will be truncated and
* an error code will be returned.
* @stable ICU 3.0
diff --git a/Build/source/libs/icu/icu-54.1/source/i18n/unicode/unum.h b/Build/source/libs/icu/icu-54.1/source/i18n/unicode/unum.h
index 3a00e95206e..c382cc86f9e 100644
--- a/Build/source/libs/icu/icu-54.1/source/i18n/unicode/unum.h
+++ b/Build/source/libs/icu/icu-54.1/source/i18n/unicode/unum.h
@@ -163,12 +163,16 @@ typedef enum UNumberFormatStyle {
*/
UNUM_SCIENTIFIC=4,
/**
- * Spellout rule-based format
+ * Spellout rule-based format. The default ruleset can be specified/changed using
+ * unum_setTextAttribute with UNUM_DEFAULT_RULESET; the available public rulesets
+ * can be listed using unum_getTextAttribute with UNUM_PUBLIC_RULESETS.
* @stable ICU 2.0
*/
UNUM_SPELLOUT=5,
/**
- * Ordinal rule-based format
+ * Ordinal rule-based format . The default ruleset can be specified/changed using
+ * unum_setTextAttribute with UNUM_DEFAULT_RULESET; the available public rulesets
+ * can be listed using unum_getTextAttribute with UNUM_PUBLIC_RULESETS.
* @stable ICU 3.0
*/
UNUM_ORDINAL=6,
@@ -1052,14 +1056,20 @@ typedef enum UNumberFormatTextAttribute {
/** The ISO currency code */
UNUM_CURRENCY_CODE,
/**
- * The default rule set. This is only available with rule-based formatters.
+ * The default rule set, such as "%spellout-numbering-year:", "%spellout-cardinal:",
+ * "%spellout-ordinal-masculine-plural:", "%spellout-ordinal-feminine:", or
+ * "%spellout-ordinal-neuter:". The available public rulesets can be listed using
+ * unum_getTextAttribute with UNUM_PUBLIC_RULESETS. This is only available with
+ * rule-based formatters.
* @stable ICU 3.0
*/
UNUM_DEFAULT_RULESET,
/**
* The public rule sets. This is only available with rule-based formatters.
* This is a read-only attribute. The public rulesets are returned as a
- * single string, with each ruleset name delimited by ';' (semicolon).
+ * single string, with each ruleset name delimited by ';' (semicolon). See the
+ * CLDR LDML spec for more information about RBNF rulesets:
+ * http://www.unicode.org/reports/tr35/tr35-numbers.html#Rule-Based_Number_Formatting
* @stable ICU 3.0
*/
UNUM_PUBLIC_RULESETS
diff --git a/Build/source/libs/icu/icu-54.1/source/i18n/unicode/usearch.h b/Build/source/libs/icu/icu-54.1/source/i18n/unicode/usearch.h
index a64e9190c92..75521f528a4 100644
--- a/Build/source/libs/icu/icu-54.1/source/i18n/unicode/usearch.h
+++ b/Build/source/libs/icu/icu-54.1/source/i18n/unicode/usearch.h
@@ -96,10 +96,6 @@
* UTS #10 Unicode Collation Algorithm</a>, specifically the USearchAttribute
* USEARCH_ELEMENT_COMPARISON and its values.
* <p>
- * E.g. In English, overlapping matches produces the result 0 and 2
- * for the pattern "abab" in the text "ababab", where else mutually
- * exclusive matches only produce the result of 0.
- * <p>
* Though collator attributes will be taken into consideration while
* performing matches, there are no APIs here for setting and getting the
* attributes. These attributes can be set by getting the collator
diff --git a/Build/source/libs/icu/icu-54.1/source/test/cintltst/cdattst.c b/Build/source/libs/icu/icu-54.1/source/test/cintltst/cdattst.c
index 2abc310351b..ac3a1b27577 100644
--- a/Build/source/libs/icu/icu-54.1/source/test/cintltst/cdattst.c
+++ b/Build/source/libs/icu/icu-54.1/source/test/cintltst/cdattst.c
@@ -1618,6 +1618,7 @@ static void TestOverrideNumberFormat(void) {
overrideFmt = unum_open(UNUM_DEFAULT, NULL, 0, localeString, NULL, &status);
assertSuccess("unum_open()", &status);
udat_setNumberFormat(fmt, overrideFmt); // test the same override NF will not crash
+ unum_close(overrideFmt);
}
udat_close(fmt);
@@ -1668,10 +1669,8 @@ static void TestOverrideNumberFormat(void) {
log_err("fail: udat_format for locale, expected %s, got %s\n",
u_austrncpy(bbuf1,expected,kUbufMax), u_austrncpy(bbuf2,ubuf,kUbufMax) );
+ udat_close(overrideFmt2);
udat_close(fmt2);
- if ( strcmp(overrideNumberFormat[i][0], "") == 0 ) { // set uses clone, so free up
- udat_close(overrideFmt2);
- }
}
free(expected);
free(fields);
diff --git a/Build/source/libs/icu/icu-54.1/source/test/intltest/tztest.cpp b/Build/source/libs/icu/icu-54.1/source/test/intltest/tztest.cpp
index 6fe0f8a9a5e..4111e51a5d7 100644
--- a/Build/source/libs/icu/icu-54.1/source/test/intltest/tztest.cpp
+++ b/Build/source/libs/icu/icu-54.1/source/test/intltest/tztest.cpp
@@ -853,7 +853,7 @@ void TimeZoneTest::TestShortZoneIDs()
{"UTC", 0, FALSE}, // Olson etcetera 0
{"ECT", 60, TRUE}, // ICU Link - Europe/Paris
{"MET", 60, TRUE}, // Olson europe 1:00 C-Eur
- {"CAT", 120, FALSE}, // ICU Link - Africa/Harare
+ {"CAT", 120, FALSE}, // ICU Link - Africa/Maputo
{"ART", 120, TRUE}, // ICU Link - Africa/Cairo
{"EET", 120, TRUE}, // Olson europe 2:00 EU
{"EAT", 180, FALSE}, // ICU Link - Africa/Addis_Ababa
@@ -952,7 +952,7 @@ void TimeZoneTest::TestShortZoneIDs()
"AST", "America/Anchorage",
"BET", "America/Sao_Paulo",
"BST", "Asia/Dhaka", // # spelling changed in 2000h; was Asia/Dacca
- "CAT", "Africa/Harare",
+ "CAT", "Africa/Maputo",
"CNT", "America/St_Johns",
"CST", "America/Chicago",
"CTT", "Asia/Shanghai",
@@ -1974,23 +1974,32 @@ void TimeZoneTest::TestCanonicalID() {
const char *zone;
} excluded1[] = {
{"Africa/Bamako", "Africa/Abidjan"},
+ {"Africa/Bangui", "Africa/Lagos"},
{"Africa/Banjul", "Africa/Abidjan"},
- {"Africa/Brazzaville", "Africa/Bangui"},
+ {"Africa/Blantyre", "Africa/Maputo"},
+ {"Africa/Brazzaville", "Africa/Lagos"},
+ {"Africa/Bujumbura", "Africa/Maputo"},
{"Africa/Conakry", "Africa/Abidjan"},
{"Africa/Dakar", "Africa/Abidjan"},
- {"Africa/Douala", "Africa/Bangui"},
+ {"Africa/Douala", "Africa/Lagos"},
{"Africa/Freetown", "Africa/Abidjan"},
+ {"Africa/Gaborone", "Africa/Maputo"},
+ {"Africa/Harare", "Africa/Maputo"},
{"Africa/Khartoum", "Africa/Juba"},
- {"Africa/Kinshasa", "Africa/Bangui"},
- {"Africa/Lagos", "Africa/Bangui"},
- {"Africa/Libreville", "Africa/Bangui"},
+ {"Africa/Kigali", "Africa/Maputo"},
+ {"Africa/Kinshasa", "Africa/Lagos"},
+ {"Africa/Libreville", "Africa/Lagos"},
{"Africa/Lome", "Africa/Abidjan"},
- {"Africa/Luanda", "Africa/Bangui"},
- {"Africa/Malabo", "Africa/Bangui"},
- {"Africa/Niamey", "Africa/Bangui"},
+ {"Africa/Luanda", "Africa/Lagos"},
+ {"Africa/Lubumbashi", "Africa/Maputo"},
+ {"Africa/Lusaka", "Africa/Maputo"},
+ {"Africa/Maseru", "Africa/Johannesburg"},
+ {"Africa/Malabo", "Africa/Lagos"},
+ {"Africa/Mbabane", "Africa/Johannesburg"},
+ {"Africa/Niamey", "Africa/Lagos"},
{"Africa/Nouakchott", "Africa/Abidjan"},
{"Africa/Ouagadougou", "Africa/Abidjan"},
- {"Africa/Porto-Novo", "Africa/Bangui"},
+ {"Africa/Porto-Novo", "Africa/Lagos"},
{"Africa/Sao_Tome", "Africa/Abidjan"},
{"America/Curacao", "America/Aruba"},
{"America/Dominica", "America/Anguilla"},
diff --git a/Build/source/libs/icu/icu-54.1/source/tools/tzcode/icuzones b/Build/source/libs/icu/icu-54.1/source/tools/tzcode/icuzones
index 21b0fa2463c..f8cbc7c1b89 100644
--- a/Build/source/libs/icu/icu-54.1/source/tools/tzcode/icuzones
+++ b/Build/source/libs/icu/icu-54.1/source/tools/tzcode/icuzones
@@ -1,5 +1,5 @@
######################################################################
-# Copyright (C) 2007-2010, International Business Machines
+# Copyright (C) 2007-2014, International Business Machines
# Corporation and others. All Rights Reserved.
######################################################################
# This is an ICU-specific file with the same format as regular
@@ -45,7 +45,7 @@ Link Africa/Cairo ART
Link America/Anchorage AST
Link America/Sao_Paulo BET
Link Asia/Dhaka BST
-Link Africa/Harare CAT
+Link Africa/Maputo CAT
Link America/St_Johns CNT
Link America/Chicago CST
Link Asia/Shanghai CTT
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 08:47:04 +0000