summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-15 14:23:04 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-15 14:23:04 +0000
commit68a17828a0339180b4f91f13eeb1e3c04b7cea89 (patch)
treec391f1b25e1f0248ae0a06acc46c20c5b5a6aaee /Build
parent47f1ed0323a3ae03ca90175c06277d1eb6d20c4d (diff)
icu: somewhat simplify XeTeX modifications
git-svn-id: svn://tug.org/texlive/trunk@25655 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam4
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic30
-rw-r--r--Build/source/libs/icu/icu-49.1/layout/ArabicShaping.cpp14
-rw-r--r--Build/source/libs/icu/icu-49.1/layout/LEGlyphStorage.h2
5 files changed, 27 insertions, 28 deletions
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
index dbaa1635c53..918f97caab4 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-40-auxParam: Fix a typo (auxillary => auxiliary).
+ * patch-70-Arabic: Remove useless changes of original code.
+
2012-03-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-03-U_PF_UNKNOWN (new): Bug fix for the case that
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam b/Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam
index 8462a7087b8..913bb9757a2 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam
@@ -297,13 +297,13 @@ diff -ur icu-49.rc.orig/source/layout/LEGlyphStorage.cpp icu-49.rc/source/layout
fCharIndices[fDestIndex] = fCharIndices[fSrcIndex];
diff -ur icu-49.rc.orig/source/layout/LEGlyphStorage.h icu-49.rc/source/layout/LEGlyphStorage.h
--- icu-49.rc.orig/source/layout/LEGlyphStorage.h 2012-03-02 23:14:52.000000000 +0100
-+++ icu-49.rc/source/layout/LEGlyphStorage.h 2012-03-03 17:32:24.000000000 +0100
++++ icu-49.rc/source/layout/LEGlyphStorage.h 2012-03-15 09:11:30.000000000 +0100
@@ -63,12 +63,12 @@
float *fPositions;
/**
- * The auxillary data array.
-+ * The auxillary data arrays.
++ * The auxiliary data arrays.
*
* @internal
*/
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic b/Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic
index da8d5372919..5aefbcead1d 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic
@@ -1,6 +1,6 @@
diff -ur icu-49.rc.orig/source/layout/ArabicShaping.cpp icu-49.rc/source/layout/ArabicShaping.cpp
--- icu-49.rc.orig/source/layout/ArabicShaping.cpp 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/ArabicShaping.cpp 2012-03-03 17:37:09.000000000 +0100
++++ icu-49.rc/source/layout/ArabicShaping.cpp 2012-03-15 09:11:30.000000000 +0100
@@ -24,6 +24,31 @@
ArabicShaping::ST_TRANSPARENT // [T]
};
@@ -33,32 +33,26 @@ diff -ur icu-49.rc.orig/source/layout/ArabicShaping.cpp icu-49.rc/source/layout/
/*
shaping array holds types for Arabic chars between 0610 and 0700
other values are either unshaped, or transparent if a mark or format
-@@ -36,17 +61,32 @@
+@@ -36,6 +61,18 @@
const ClassDefinitionTable *joiningTypes = (const ClassDefinitionTable *) ArabicShaping::shapingTypeTable;
le_int32 joiningType = joiningTypes->getGlyphClass(c);
-- if (joiningType >= 0 && joiningType < ArabicShaping::JT_COUNT) {
-- return ArabicShaping::shapeTypes[joiningType];
-+ if (joiningType == JT_RIGHT_JOINING) { // check for Syriac exceptions ALAPH, DALATH, RISH
++ if (joiningType == ArabicShaping::JT_RIGHT_JOINING) { // check for Syriac exceptions ALAPH, DALATH, RISH
+ if (c == 0x0710)
-+ return ST_ALAPH;
++ return ArabicShaping::ST_ALAPH;
+ if (c == 0x0715 || c == 0x0716 || c == 0x072A || c == 0x072F)
-+ return ST_DALATH_RISH;
- }
-
-- return ArabicShaping::ST_NOSHAPE_NONE;
-+ if (joiningType == 0) { // check for Mongolian range, not supported by ArabicShaping::shapingTypeTable
-+ if (c >= 0x1800 && c <= 0x18af)
-+ return mongolianTypes[c - 0x1800];
++ return ArabicShaping::ST_DALATH_RISH;
+ }
+
-+ if (joiningType >= 0 && joiningType < JT_COUNT) {
-+ return shapeTypes[joiningType];
++ if (joiningType == 0) { // check for Mongolian range, not supported by ArabicShaping::shapingTypeTable
++ if (c >= 0x1800 && c <= 0x18af)
++ return ArabicShaping::mongolianTypes[c - 0x1800];
+ }
+
-+ return ST_NOSHAPE_NONE;
- }
-
+ if (joiningType >= 0 && joiningType < ArabicShaping::JT_COUNT) {
+ return ArabicShaping::shapeTypes[joiningType];
+ }
+@@ -46,7 +83,10 @@
#define isolFeatureTag LE_ISOL_FEATURE_TAG
#define initFeatureTag LE_INIT_FEATURE_TAG
#define mediFeatureTag LE_MEDI_FEATURE_TAG
diff --git a/Build/source/libs/icu/icu-49.1/layout/ArabicShaping.cpp b/Build/source/libs/icu/icu-49.1/layout/ArabicShaping.cpp
index f913d2aa2f1..5433305e9fb 100644
--- a/Build/source/libs/icu/icu-49.1/layout/ArabicShaping.cpp
+++ b/Build/source/libs/icu/icu-49.1/layout/ArabicShaping.cpp
@@ -61,23 +61,23 @@ ArabicShaping::ShapeType ArabicShaping::getShapeType(LEUnicode c)
const ClassDefinitionTable *joiningTypes = (const ClassDefinitionTable *) ArabicShaping::shapingTypeTable;
le_int32 joiningType = joiningTypes->getGlyphClass(c);
- if (joiningType == JT_RIGHT_JOINING) { // check for Syriac exceptions ALAPH, DALATH, RISH
+ if (joiningType == ArabicShaping::JT_RIGHT_JOINING) { // check for Syriac exceptions ALAPH, DALATH, RISH
if (c == 0x0710)
- return ST_ALAPH;
+ return ArabicShaping::ST_ALAPH;
if (c == 0x0715 || c == 0x0716 || c == 0x072A || c == 0x072F)
- return ST_DALATH_RISH;
+ return ArabicShaping::ST_DALATH_RISH;
}
if (joiningType == 0) { // check for Mongolian range, not supported by ArabicShaping::shapingTypeTable
if (c >= 0x1800 && c <= 0x18af)
- return mongolianTypes[c - 0x1800];
+ return ArabicShaping::mongolianTypes[c - 0x1800];
}
- if (joiningType >= 0 && joiningType < JT_COUNT) {
- return shapeTypes[joiningType];
+ if (joiningType >= 0 && joiningType < ArabicShaping::JT_COUNT) {
+ return ArabicShaping::shapeTypes[joiningType];
}
- return ST_NOSHAPE_NONE;
+ return ArabicShaping::ST_NOSHAPE_NONE;
}
#define isolFeatureTag LE_ISOL_FEATURE_TAG
diff --git a/Build/source/libs/icu/icu-49.1/layout/LEGlyphStorage.h b/Build/source/libs/icu/icu-49.1/layout/LEGlyphStorage.h
index 6316b22fe07..76604085dfd 100644
--- a/Build/source/libs/icu/icu-49.1/layout/LEGlyphStorage.h
+++ b/Build/source/libs/icu/icu-49.1/layout/LEGlyphStorage.h
@@ -63,7 +63,7 @@ private:
float *fPositions;
/**
- * The auxillary data arrays.
+ * The auxiliary data arrays.
*
* @internal
*/