Skip to content

Commit 34deb7f

Browse files
behdadbehdad
committed
Update to latest script and language tags
This adds a shim OpenTypeLayoutEngine.h file. With that, the following files are copied verbatim from ICU repo [0]: LELanguages.h LEScripts.h ScriptAndLanguageTags.cpp ScriptAndLanguageTags.h [0] http://bugs.icu-project.org/trac/browser/icu/trunk/source/layout/
1 parent e545ad2 commit 34deb7f

7 files changed

+141
-73
lines changed

‎src/LELanguages.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
*
3-
* (C) Copyright IBM Corp. 1998-2010. All Rights Reserved.
3+
* (C) Copyright IBM Corp. 1998-2015. All Rights Reserved.
44
*
55
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
66
* YOU REALLY KNOW WHAT YOU'RE DOING.
77
*
8-
* Generated on: 10/26/2010 02:53:33 PM PDT
8+
* Generated on: 04/27/2015 10:39:37 AM PDT
99
*/
1010

1111
#ifndef __LELANGUAGES_H
@@ -25,7 +25,7 @@ U_NAMESPACE_BEGIN
2525
* this is just a list of languages which the LayoutEngine
2626
* supports.
2727
*
28-
* @stable ICU 2.6
28+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
2929
*/
3030

3131
enum LanguageCodes {
@@ -59,8 +59,6 @@ enum LanguageCodes {
5959
zhpLanguageCode = 27,
6060
zhsLanguageCode = 28,
6161
zhtLanguageCode = 29,
62-
63-
/** New language codes added 03/13/2008 @stable ICU 4.0 */
6462
afkLanguageCode = 30,
6563
belLanguageCode = 31,
6664
bgrLanguageCode = 32,

‎src/LEScripts.h

+36-17
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
*
3-
* (C) Copyright IBM Corp. 1998-2013. All Rights Reserved.
3+
* (C) Copyright IBM Corp. 1998-2014. All Rights Reserved.
44
*
55
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
66
* YOU REALLY KNOW WHAT YOU'RE DOING.
77
*
8-
* Generated on: 11/01/2011 04:08:09 PM PDT
8+
* Generated on: 04/08/2014 03:20:04 PM PDT
99
*/
1010

1111
#ifndef __LESCRIPTS_H
@@ -24,7 +24,7 @@ U_NAMESPACE_BEGIN
2424
* Constants for Unicode script values, generated using
2525
* ICU4J's <code>UScript</code> class.
2626
*
27-
* @stable ICU 2.2
27+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
2828
*/
2929

3030
enum ScriptCodes {
@@ -70,12 +70,12 @@ enum ScriptCodes {
7070
thaiScriptCode = 38,
7171
tibtScriptCode = 39,
7272
/**
73-
* @stable ICU 2.6
73+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
7474
*/
7575

7676
cansScriptCode = 40,
7777
/**
78-
* @stable ICU 2.2
78+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
7979
*/
8080

8181
yiiiScriptCode = 41,
@@ -84,7 +84,7 @@ enum ScriptCodes {
8484
buhdScriptCode = 44,
8585
tagbScriptCode = 45,
8686
/**
87-
* @stable ICU 2.6
87+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
8888
*/
8989

9090
braiScriptCode = 46,
@@ -96,12 +96,12 @@ enum ScriptCodes {
9696
taleScriptCode = 52,
9797
ugarScriptCode = 53,
9898
/**
99-
* @stable ICU 3.0
99+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
100100
*/
101101

102102
hrktScriptCode = 54,
103103
/**
104-
* @stable ICU 3.4
104+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
105105
*/
106106

107107
bugiScriptCode = 55,
@@ -112,7 +112,7 @@ enum ScriptCodes {
112112
tfngScriptCode = 60,
113113
xpeoScriptCode = 61,
114114
/**
115-
* @stable ICU 3.6
115+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
116116
*/
117117

118118
baliScriptCode = 62,
@@ -158,7 +158,7 @@ enum ScriptCodes {
158158
zxxxScriptCode = 102,
159159
zzzzScriptCode = 103,
160160
/**
161-
* @stable ICU 3.8
161+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
162162
*/
163163

164164
cariScriptCode = 104,
@@ -174,7 +174,7 @@ enum ScriptCodes {
174174
moonScriptCode = 114,
175175
mteiScriptCode = 115,
176176
/**
177-
* @stable ICU 4.0
177+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
178178
*/
179179

180180
armiScriptCode = 116,
@@ -192,15 +192,15 @@ enum ScriptCodes {
192192
zmthScriptCode = 128,
193193
zsymScriptCode = 129,
194194
/**
195-
* @stable ICU 4.4
195+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
196196
*/
197197

198198
bamuScriptCode = 130,
199199
lisuScriptCode = 131,
200200
nkgbScriptCode = 132,
201201
sarbScriptCode = 133,
202202
/**
203-
* @stable ICU 4.6
203+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
204204
*/
205205

206206
bassScriptCode = 134,
@@ -217,7 +217,7 @@ enum ScriptCodes {
217217
sindScriptCode = 145,
218218
waraScriptCode = 146,
219219
/**
220-
* @stable ICU 4.8
220+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
221221
*/
222222

223223
afakScriptCode = 147,
@@ -230,14 +230,33 @@ enum ScriptCodes {
230230
tangScriptCode = 154,
231231
woleScriptCode = 155,
232232
/**
233-
* @stable ICU 49
233+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
234234
*/
235235

236-
hluwScriptCode = 156, /* bump to match current ICU */
236+
hluwScriptCode = 156,
237237
khojScriptCode = 157,
238238
tirhScriptCode = 158,
239+
/**
240+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
241+
*/
242+
243+
aghbScriptCode = 159,
244+
mahjScriptCode = 160,
245+
/**
246+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
247+
*/
248+
249+
ahomScriptCode = 161,
250+
hatrScriptCode = 162,
251+
modiScriptCode = 163,
252+
multScriptCode = 164,
253+
paucScriptCode = 165,
254+
siddScriptCode = 166,
239255

240-
scriptCodeCount = 159
256+
/**
257+
* @deprecated ICU 54. See {@link icu::LayoutEngine}
258+
*/
259+
scriptCodeCount
241260
};
242261

243262
U_NAMESPACE_END

‎src/LayoutEngine.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "LEFontInstance.h"
1212
#include "LEGlyphStorage.h"
1313
#include "ScriptAndLanguageTags.h"
14+
#include "OpenTypeLayoutEngine.h"
1415

1516
#include "LayoutEngine.h"
1617

@@ -132,15 +133,15 @@ script_to_hb (le_int32 code)
132133
{
133134
if (code < 0 || code >= scriptCodeCount)
134135
return HB_SCRIPT_INVALID;
135-
return hb_ot_tag_to_script (scriptTags[code]);
136+
return hb_ot_tag_to_script (OpenTypeLayoutEngine::scriptTags[code]);
136137
}
137138

138139
static hb_language_t
139140
language_to_hb (le_int32 code)
140141
{
141142
if (code < 0 || code >= languageCodeCount)
142143
return HB_LANGUAGE_INVALID;
143-
return hb_ot_tag_to_language (languageTags[code]);
144+
return hb_ot_tag_to_language (OpenTypeLayoutEngine::languageTags[code]);
144145
}
145146

146147
LayoutEngine::LayoutEngine(const LEFontInstance *fontInstance,

‎src/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ libicu_le_hb_la_SOURCES = \
3333
LEGlyphStorage.cpp \
3434
LEInsertionList.cpp \
3535
loengine.cpp \
36+
OpenTypeLayoutEngine.h \
3637
ScriptAndLanguageTags.cpp \
3738
ScriptAndLanguageTags.h \
3839
$(NULL)

‎src/OpenTypeLayoutEngine.h

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved
3+
*
4+
*/
5+
6+
#ifndef __OPENTYPELAYOUTENGINE_H
7+
#define __OPENTYPELAYOUTENGINE_H
8+
9+
#include "LETypes.h"
10+
11+
U_NAMESPACE_BEGIN
12+
13+
class OpenTypeLayoutEngine
14+
{
15+
public:
16+
17+
/**
18+
* The array of language tags, indexed by language code.
19+
*
20+
* @internal
21+
*/
22+
static const LETag languageTags[];
23+
24+
/**
25+
* The array of script tags, indexed by script code.
26+
*/
27+
static const LETag scriptTags[];
28+
29+
};
30+
31+
U_NAMESPACE_END
32+
#endif
33+

‎src/ScriptAndLanguageTags.cpp

+34-24
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
/*
22
*
3-
* (C) Copyright IBM Corp. 1998-2011. All Rights Reserved.
3+
* (C) Copyright IBM Corp. 1998-2015. All Rights Reserved.
44
*
55
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
66
* YOU REALLY KNOW WHAT YOU'RE DOING.
77
*
8-
* Generated on: 11/01/2011 04:08:11 PM PDT
8+
* Generated on: 04/27/2015 10:39:37 AM PDT
99
*/
1010

1111
#include "LETypes.h"
1212
#include "ScriptAndLanguageTags.h"
13+
#include "OpenTypeLayoutEngine.h"
1314

1415
U_NAMESPACE_BEGIN
1516

16-
const LETag scriptTags[] = {
17+
const LETag OpenTypeLayoutEngine::scriptTags[] = {
1718
zyyyScriptTag, /* 'zyyy' (COMMON) */
1819
zinhScriptTag, /* 'zinh' (INHERITED) */
1920
arabScriptTag, /* 'arab' (ARABIC) */
@@ -89,21 +90,21 @@ const LETag scriptTags[] = {
8990
geokScriptTag, /* 'geok' (GEOK) */
9091
hansScriptTag, /* 'hans' (HANS) */
9192
hantScriptTag, /* 'hant' (HANT) */
92-
hmngScriptTag, /* 'hmng' (HMNG) */
93-
hungScriptTag, /* 'hung' (HUNG) */
93+
hmngScriptTag, /* 'hmng' (PAHAWH_HMONG) */
94+
hungScriptTag, /* 'hung' (OLD_HUNGARIAN) */
9495
indsScriptTag, /* 'inds' (INDS) */
9596
javaScriptTag, /* 'java' (JAVANESE) */
9697
kaliScriptTag, /* 'kali' (KAYAH_LI) */
9798
latfScriptTag, /* 'latf' (LATF) */
9899
latgScriptTag, /* 'latg' (LATG) */
99100
lepcScriptTag, /* 'lepc' (LEPCHA) */
100-
linaScriptTag, /* 'lina' (LINA) */
101+
linaScriptTag, /* 'lina' (LINEAR_A) */
101102
mandScriptTag, /* 'mand' (MANDAIC) */
102103
mayaScriptTag, /* 'maya' (MAYA) */
103104
meroScriptTag, /* 'mero' (MEROITIC_HIEROGLYPHS) */
104105
nkooScriptTag, /* 'nko ' (NKO) */
105106
orkhScriptTag, /* 'orkh' (OLD_TURKIC) */
106-
permScriptTag, /* 'perm' (PERM) */
107+
permScriptTag, /* 'perm' (OLD_PERMIC) */
107108
phagScriptTag, /* 'phag' (PHAGS_PA) */
108109
phnxScriptTag, /* 'phnx' (PHOENICIAN) */
109110
plrdScriptTag, /* 'plrd' (MIAO) */
@@ -126,7 +127,7 @@ const LETag scriptTags[] = {
126127
olckScriptTag, /* 'olck' (OL_CHIKI) */
127128
rjngScriptTag, /* 'rjng' (REJANG) */
128129
saurScriptTag, /* 'saur' (SAURASHTRA) */
129-
sgnwScriptTag, /* 'sgnw' (SGNW) */
130+
sgnwScriptTag, /* 'sgnw' (SIGNWRITING) */
130131
sundScriptTag, /* 'sund' (SUNDANESE) */
131132
moonScriptTag, /* 'moon' (MOON) */
132133
mteiScriptTag, /* 'mtei' (MEETEI_MAYEK) */
@@ -135,9 +136,9 @@ const LETag scriptTags[] = {
135136
cakmScriptTag, /* 'cakm' (CHAKMA) */
136137
koreScriptTag, /* 'kore' (KORE) */
137138
kthiScriptTag, /* 'kthi' (KAITHI) */
138-
maniScriptTag, /* 'mani' (MANI) */
139+
maniScriptTag, /* 'mani' (MANICHAEAN) */
139140
phliScriptTag, /* 'phli' (INSCRIPTIONAL_PAHLAVI) */
140-
phlpScriptTag, /* 'phlp' (PHLP) */
141+
phlpScriptTag, /* 'phlp' (PSALTER_PAHLAVI) */
141142
phlvScriptTag, /* 'phlv' (PHLV) */
142143
prtiScriptTag, /* 'prti' (INSCRIPTIONAL_PARTHIAN) */
143144
samrScriptTag, /* 'samr' (SAMARITAN) */
@@ -148,33 +149,42 @@ const LETag scriptTags[] = {
148149
lisuScriptTag, /* 'lisu' (LISU) */
149150
nkgbScriptTag, /* 'nkgb' (NKGB) */
150151
sarbScriptTag, /* 'sarb' (OLD_SOUTH_ARABIAN) */
151-
bassScriptTag, /* 'bass' (BASS) */
152-
duplScriptTag, /* 'dupl' (DUPL) */
153-
elbaScriptTag, /* 'elba' (ELBA) */
154-
granScriptTag, /* 'gran' (GRAN) */
152+
bassScriptTag, /* 'bass' (BASSA_VAH) */
153+
duplScriptTag, /* 'dupl' (DUPLOYAN) */
154+
elbaScriptTag, /* 'elba' (ELBASAN) */
155+
granScriptTag, /* 'gran' (GRANTHA) */
155156
kpelScriptTag, /* 'kpel' (KPEL) */
156157
lomaScriptTag, /* 'loma' (LOMA) */
157-
mendScriptTag, /* 'mend' (MEND) */
158+
mendScriptTag, /* 'mend' (MENDE_KIKAKUI) */
158159
mercScriptTag, /* 'merc' (MEROITIC_CURSIVE) */
159-
narbScriptTag, /* 'narb' (NARB) */
160-
nbatScriptTag, /* 'nbat' (NBAT) */
161-
palmScriptTag, /* 'palm' (PALM) */
162-
sindScriptTag, /* 'sind' (SIND) */
163-
waraScriptTag, /* 'wara' (WARA) */
160+
narbScriptTag, /* 'narb' (OLD_NORTH_ARABIAN) */
161+
nbatScriptTag, /* 'nbat' (NABATAEAN) */
162+
palmScriptTag, /* 'palm' (PALMYRENE) */
163+
sindScriptTag, /* 'sind' (KHUDAWADI) */
164+
waraScriptTag, /* 'wara' (WARANG_CITI) */
164165
afakScriptTag, /* 'afak' (AFAK) */
165166
jurcScriptTag, /* 'jurc' (JURC) */
166-
mrooScriptTag, /* 'mroo' (MROO) */
167+
mrooScriptTag, /* 'mroo' (MRO) */
167168
nshuScriptTag, /* 'nshu' (NSHU) */
168169
shrdScriptTag, /* 'shrd' (SHARADA) */
169170
soraScriptTag, /* 'sora' (SORA_SOMPENG) */
170171
takrScriptTag, /* 'takr' (TAKRI) */
171172
tangScriptTag, /* 'tang' (TANG) */
172173
woleScriptTag, /* 'wole' (WOLE) */
173-
khojScriptTag, /* 'khoj' (KHOJ) */
174-
tirhScriptTag /* 'tirh' (TIRH) */
174+
hluwScriptTag, /* 'hluw' (ANATOLIAN_HIEROGLYPHS) */
175+
khojScriptTag, /* 'khoj' (KHOJKI) */
176+
tirhScriptTag, /* 'tirh' (TIRHUTA) */
177+
aghbScriptTag, /* 'aghb' (CAUCASIAN_ALBANIAN) */
178+
mahjScriptTag, /* 'mahj' (MAHAJANI) */
179+
ahomScriptTag, /* 'ahom' (AHOM) */
180+
hatrScriptTag, /* 'hatr' (HATRAN) */
181+
modiScriptTag, /* 'modi' (MODI) */
182+
multScriptTag, /* 'mult' (MULTANI) */
183+
paucScriptTag, /* 'pauc' (PAU_CIN_HAU) */
184+
siddScriptTag /* 'sidd' (SIDDHAM) */
175185
};
176186

177-
const LETag languageTags[] = {
187+
const LETag OpenTypeLayoutEngine::languageTags[] = {
178188
nullLanguageTag, /* '' (null) */
179189
araLanguageTag, /* 'ARA' (Arabic) */
180190
asmLanguageTag, /* 'ASM' (Assamese) */

0 commit comments

Comments
 (0)