pango 2.2.5-x86-mingw32 → 3.0.0-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Rakefile +19 -3
- data/ext/pango/depend +0 -1
- data/ext/pango/extconf.rb +0 -2
- data/ext/pango/rbpango.c +44 -6
- data/ext/pango/rbpango.h +0 -1
- data/ext/pango/rbpangoattribute.c +2 -2
- data/ext/pango/rbpangocairo.c +4 -4
- data/ext/pango/rbpangocontext.c +2 -2
- data/ext/pango/rbpangofontdescription.c +2 -2
- data/ext/pango/rbpangogravity.c +2 -2
- data/ext/pango/rbpangolanguage.c +8 -0
- data/ext/pango/rbpangolayout.c +15 -4
- data/ext/pango/rbpangomatrix.c +2 -2
- data/ext/pango/rbpangoscript.c +3 -3
- data/lib/2.0/pango.so +0 -0
- data/lib/2.1/pango.so +0 -0
- data/lib/2.2/pango.so +0 -0
- data/test/test-language.rb +5 -0
- data/test/test-layout.rb +7 -1
- data/vendor/local/bin/derb.exe +0 -0
- data/vendor/local/bin/genbrk.exe +0 -0
- data/vendor/local/bin/genccode.exe +0 -0
- data/vendor/local/bin/gencfu.exe +0 -0
- data/vendor/local/bin/gencmn.exe +0 -0
- data/vendor/local/bin/gencnval.exe +0 -0
- data/vendor/local/bin/gendict.exe +0 -0
- data/vendor/local/bin/gennorm2.exe +0 -0
- data/vendor/local/bin/genrb.exe +0 -0
- data/vendor/local/bin/gensprep.exe +0 -0
- data/vendor/local/bin/hb-ot-shape-closure.exe +0 -0
- data/vendor/local/bin/hb-shape.exe +0 -0
- data/vendor/local/bin/hb-view.exe +0 -0
- data/vendor/local/bin/icu-config +6 -6
- data/vendor/local/bin/icuinfo.exe +0 -0
- data/vendor/local/bin/icupkg.exe +0 -0
- data/vendor/local/bin/libharfbuzz-0.dll +0 -0
- data/vendor/local/bin/libpango-1.0-0.dll +0 -0
- data/vendor/local/bin/libpangocairo-1.0-0.dll +0 -0
- data/vendor/local/bin/libpangoft2-1.0-0.dll +0 -0
- data/vendor/local/bin/libpangowin32-1.0-0.dll +0 -0
- data/vendor/local/bin/makeconv.exe +0 -0
- data/vendor/local/bin/pango-querymodules.exe +0 -0
- data/vendor/local/bin/pango-view.exe +0 -0
- data/vendor/local/bin/pkgdata.exe +0 -0
- data/vendor/local/bin/uconv.exe +0 -0
- data/vendor/local/etc/pango/pango.modules +1 -1
- data/vendor/local/include/harfbuzz/hb-buffer.h +26 -1
- data/vendor/local/include/harfbuzz/hb-common.h +7 -0
- data/vendor/local/include/harfbuzz/hb-font.h +7 -6
- data/vendor/local/include/harfbuzz/hb-ft.h +58 -1
- data/vendor/local/include/harfbuzz/hb-glib.h +3 -0
- data/vendor/local/include/harfbuzz/hb-ot-font.h +4 -0
- data/vendor/local/include/harfbuzz/hb-shape.h +0 -3
- data/vendor/local/include/harfbuzz/hb-unicode.h +28 -3
- data/vendor/local/include/harfbuzz/hb-version.h +4 -4
- data/vendor/local/include/layout/LEFontInstance.h +2 -28
- data/vendor/local/include/layout/LETableReference.h +7 -2
- data/vendor/local/include/unicode/calendar.h +32 -2
- data/vendor/local/include/unicode/coll.h +9 -7
- data/vendor/local/include/unicode/datefmt.h +102 -13
- data/vendor/local/include/unicode/dcfmtsym.h +4 -2
- data/vendor/local/include/unicode/decimfmt.h +4 -5
- data/vendor/local/include/unicode/dtfmtsym.h +60 -1
- data/vendor/local/include/unicode/dtptngen.h +21 -7
- data/vendor/local/include/unicode/localpointer.h +49 -1
- data/vendor/local/include/unicode/locid.h +2 -3
- data/vendor/local/include/unicode/measfmt.h +30 -37
- data/vendor/local/include/unicode/measunit.h +65 -152
- data/vendor/local/include/unicode/measure.h +3 -3
- data/vendor/local/include/unicode/numfmt.h +3 -5
- data/vendor/local/include/unicode/platform.h +12 -2
- data/vendor/local/include/unicode/plurrule.h +18 -14
- data/vendor/local/include/unicode/rbnf.h +3 -4
- data/vendor/local/include/unicode/regex.h +42 -26
- data/vendor/local/include/unicode/region.h +9 -9
- data/vendor/local/include/unicode/reldatefmt.h +50 -45
- data/vendor/local/include/unicode/scientificnumberformatter.h +222 -0
- data/vendor/local/include/unicode/smpdtfmt.h +30 -24
- data/vendor/local/include/unicode/tblcoll.h +5 -4
- data/vendor/local/include/unicode/timezone.h +18 -1
- data/vendor/local/include/unicode/ucal.h +2 -2
- data/vendor/local/include/unicode/ucol.h +22 -18
- data/vendor/local/include/unicode/uconfig.h +17 -2
- data/vendor/local/include/unicode/udat.h +164 -56
- data/vendor/local/include/unicode/udatpg.h +9 -7
- data/vendor/local/include/unicode/ufieldpositer.h +121 -0
- data/vendor/local/include/unicode/uidna.h +21 -13
- data/vendor/local/include/unicode/ulistformatter.h +130 -0
- data/vendor/local/include/unicode/ulocdata.h +4 -3
- data/vendor/local/include/unicode/unistr.h +101 -53
- data/vendor/local/include/unicode/unum.h +7 -10
- data/vendor/local/include/unicode/uregex.h +52 -29
- data/vendor/local/include/unicode/urename.h +14 -3
- data/vendor/local/include/unicode/uscript.h +30 -16
- data/vendor/local/include/unicode/uspoof.h +13 -9
- data/vendor/local/include/unicode/utrans.h +5 -7
- data/vendor/local/include/unicode/utypes.h +9 -3
- data/vendor/local/include/unicode/uvernum.h +8 -8
- data/vendor/local/lib/icu/{54.1 → 55.1}/Makefile.inc +5 -5
- data/vendor/local/lib/icu/{54.1 → 55.1}/pkgdata.inc +1 -1
- data/vendor/local/lib/icu/Makefile.inc +5 -5
- data/vendor/local/lib/icu/pkgdata.inc +1 -1
- data/vendor/local/lib/icudt.dll +0 -0
- data/vendor/local/lib/{icudt54.dll → icudt55.dll} +0 -0
- data/vendor/local/lib/icuin.dll +0 -0
- data/vendor/local/lib/icuin55.dll +0 -0
- data/vendor/local/lib/icuio.dll +0 -0
- data/vendor/local/lib/icuio55.dll +0 -0
- data/vendor/local/lib/icule.dll +0 -0
- data/vendor/local/lib/icule55.dll +0 -0
- data/vendor/local/lib/iculx.dll +0 -0
- data/vendor/local/lib/iculx55.dll +0 -0
- data/vendor/local/lib/icutest.dll +0 -0
- data/vendor/local/lib/icutest55.dll +0 -0
- data/vendor/local/lib/icutu.dll +0 -0
- data/vendor/local/lib/icutu55.dll +0 -0
- data/vendor/local/lib/icuuc.dll +0 -0
- data/vendor/local/lib/icuuc55.dll +0 -0
- data/vendor/local/lib/libharfbuzz-icu.a +0 -0
- data/vendor/local/lib/libharfbuzz-icu.la +7 -7
- data/vendor/local/lib/libharfbuzz.dll.a +0 -0
- data/vendor/local/lib/libharfbuzz.la +7 -7
- data/vendor/local/lib/libicudt.dll.a +0 -0
- data/vendor/local/lib/libicuin.dll.a +0 -0
- data/vendor/local/lib/libicuio.dll.a +0 -0
- data/vendor/local/lib/libicule.dll.a +0 -0
- data/vendor/local/lib/libiculx.dll.a +0 -0
- data/vendor/local/lib/libicutest.dll.a +0 -0
- data/vendor/local/lib/libicutu.dll.a +0 -0
- data/vendor/local/lib/libicuuc.dll.a +0 -0
- data/vendor/local/lib/libpango-1.0.dll.a +0 -0
- data/vendor/local/lib/libpango-1.0.la +2 -2
- data/vendor/local/lib/libpangocairo-1.0.dll.a +0 -0
- data/vendor/local/lib/libpangocairo-1.0.la +1 -1
- data/vendor/local/lib/libpangoft2-1.0.dll.a +0 -0
- data/vendor/local/lib/libpangoft2-1.0.la +2 -2
- data/vendor/local/lib/libpangowin32-1.0.dll.a +0 -0
- data/vendor/local/lib/libpangowin32-1.0.la +2 -2
- data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.dll +0 -0
- data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.dll.a +0 -0
- data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.la +2 -2
- data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.dll +0 -0
- data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.dll.a +0 -0
- data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.la +2 -2
- data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.dll +0 -0
- data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.dll.a +0 -0
- data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.la +2 -2
- data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.dll +0 -0
- data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.dll.a +0 -0
- data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.la +2 -2
- data/vendor/local/lib/pkgconfig/harfbuzz-icu.pc +1 -1
- data/vendor/local/lib/pkgconfig/harfbuzz.pc +3 -1
- data/vendor/local/lib/pkgconfig/icu-i18n.pc +5 -5
- data/vendor/local/lib/pkgconfig/icu-io.pc +5 -5
- data/vendor/local/lib/pkgconfig/icu-le.pc +5 -5
- data/vendor/local/lib/pkgconfig/icu-lx.pc +5 -5
- data/vendor/local/lib/pkgconfig/icu-uc.pc +5 -5
- data/vendor/local/share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html +35 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/annotation-glossary.html +30 -35
- data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-full.html +158 -27
- data/vendor/local/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html +87 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/{ch01.html → ch06.html} +12 -13
- data/vendor/local/share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html +31 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/deprecated-api-index.html +7 -8
- data/vendor/local/share/gtk-doc/html/harfbuzz/fonts-and-faces.html +40 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-Shaping.html +352 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html +88 -47
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html +128 -204
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html +290 -304
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html +14 -23
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html +14 -17
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html +40 -51
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html +126 -190
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html +19 -24
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html +14 -29
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html +438 -11
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html +14 -25
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html +14 -29
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html +19 -160
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-tag.html +21 -36
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot.html +14 -11
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html +70 -81
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html +33 -44
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html +290 -323
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html +14 -23
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html +59 -27
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb.html +16 -13
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2 +415 -104
- data/vendor/local/share/gtk-doc/html/harfbuzz/hello-harfbuzz.html +181 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/index.html +43 -12
- data/vendor/local/share/gtk-doc/html/harfbuzz/object-tree.html +11 -13
- data/vendor/local/share/gtk-doc/html/harfbuzz/plans-and-caching.html +31 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/pt01.html +70 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/pt02.html +107 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/setting-buffer-properties.html +31 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/shaping-and-shape-plans.html +39 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/style.css +9 -6
- data/vendor/local/share/gtk-doc/html/harfbuzz/using-harfbuzzs-native-opentype-implementation.html +31 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/using-your-own-font-functions.html +31 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/what-about-the-other-scripts.html +31 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/what-is-harfbuzz.html +124 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html +38 -0
- data/vendor/local/share/icu/{54.1 → 55.1}/config/mh-mingw +0 -0
- data/vendor/local/share/icu/{54.1 → 55.1}/install-sh +0 -0
- data/vendor/local/share/icu/{54.1 → 55.1}/license.html +3 -4
- data/vendor/local/share/icu/{54.1 → 55.1}/mkinstalldirs +0 -0
- data/vendor/local/share/man/man1/derb.1 +2 -2
- data/vendor/local/share/man/man1/genbrk.1 +2 -2
- data/vendor/local/share/man/man1/gencfu.1 +1 -1
- data/vendor/local/share/man/man1/gencnval.1 +3 -3
- data/vendor/local/share/man/man1/gendict.1 +2 -2
- data/vendor/local/share/man/man1/genrb.1 +3 -3
- data/vendor/local/share/man/man1/icu-config.1 +2 -2
- data/vendor/local/share/man/man1/makeconv.1 +3 -3
- data/vendor/local/share/man/man1/pkgdata.1 +2 -2
- data/vendor/local/share/man/man1/uconv.1 +2 -2
- data/vendor/local/share/man/man8/genccode.8 +2 -2
- data/vendor/local/share/man/man8/gencmn.8 +3 -3
- data/vendor/local/share/man/man8/gensprep.8 +3 -3
- data/vendor/local/share/man/man8/icupkg.8 +1 -1
- metadata +38 -22
- data/vendor/local/include/unicode/scientificformathelper.h +0 -139
- data/vendor/local/lib/icuin54.dll +0 -0
- data/vendor/local/lib/icuio54.dll +0 -0
- data/vendor/local/lib/icule54.dll +0 -0
- data/vendor/local/lib/iculx54.dll +0 -0
- data/vendor/local/lib/icutest54.dll +0 -0
- data/vendor/local/lib/icutu54.dll +0 -0
- data/vendor/local/lib/icuuc54.dll +0 -0
- data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html +0 -286
- data/vendor/local/share/gtk-doc/html/harfbuzz/index.sgml +0 -496
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
**********************************************************************
|
3
|
-
* Copyright (c) 2004-
|
3
|
+
* Copyright (c) 2004-2015, International Business Machines
|
4
4
|
* Corporation and others. All Rights Reserved.
|
5
5
|
**********************************************************************
|
6
6
|
* Author: Alan Liu
|
@@ -108,7 +108,7 @@ class U_I18N_API Measure: public UObject {
|
|
108
108
|
* . erived::getStaticClassID()) ...
|
109
109
|
* </pre>
|
110
110
|
* @return The class ID for all objects of this class.
|
111
|
-
* @
|
111
|
+
* @stable ICU 53
|
112
112
|
*/
|
113
113
|
static UClassID U_EXPORT2 getStaticClassID(void);
|
114
114
|
|
@@ -121,7 +121,7 @@ class U_I18N_API Measure: public UObject {
|
|
121
121
|
* @return The class ID for this object. All objects of a
|
122
122
|
* given class have the same class ID. Objects of
|
123
123
|
* other classes have different class IDs.
|
124
|
-
* @
|
124
|
+
* @stable ICU 53
|
125
125
|
*/
|
126
126
|
virtual UClassID getDynamicClassID(void) const;
|
127
127
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
********************************************************************************
|
3
|
-
* Copyright (C) 1997-
|
3
|
+
* Copyright (C) 1997-2015, International Business Machines Corporation and others.
|
4
4
|
* All Rights Reserved.
|
5
5
|
********************************************************************************
|
6
6
|
*
|
@@ -949,7 +949,6 @@ public:
|
|
949
949
|
*/
|
950
950
|
const UChar* getCurrency() const;
|
951
951
|
|
952
|
-
/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
|
953
952
|
/**
|
954
953
|
* Set a particular UDisplayContext value in the formatter, such as
|
955
954
|
* UDISPCTX_CAPITALIZATION_FOR_STANDALONE.
|
@@ -957,11 +956,10 @@ public:
|
|
957
956
|
* @param status Input/output status. If at entry this indicates a failure
|
958
957
|
* status, the function will do nothing; otherwise this will be
|
959
958
|
* updated with any new status from the function.
|
960
|
-
* @
|
959
|
+
* @stable ICU 53
|
961
960
|
*/
|
962
961
|
virtual void setContext(UDisplayContext value, UErrorCode& status);
|
963
962
|
|
964
|
-
/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
|
965
963
|
/**
|
966
964
|
* Get the formatter's UDisplayContext value for the specified UDisplayContextType,
|
967
965
|
* such as UDISPCTX_TYPE_CAPITALIZATION.
|
@@ -970,7 +968,7 @@ public:
|
|
970
968
|
* status, the function will do nothing; otherwise this will be
|
971
969
|
* updated with any new status from the function.
|
972
970
|
* @return The UDisplayContextValue for the specified type.
|
973
|
-
* @
|
971
|
+
* @stable ICU 53
|
974
972
|
*/
|
975
973
|
virtual UDisplayContext getContext(UDisplayContextType type, UErrorCode& status) const;
|
976
974
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
/*
|
2
2
|
******************************************************************************
|
3
3
|
*
|
4
|
-
* Copyright (C) 1997-
|
4
|
+
* Copyright (C) 1997-2015, International Business Machines
|
5
5
|
* Corporation and others. All Rights Reserved.
|
6
6
|
*
|
7
7
|
******************************************************************************
|
@@ -121,8 +121,16 @@
|
|
121
121
|
#define U_PF_QNX 3700
|
122
122
|
/** Linux is a Unix-like operating system. @internal */
|
123
123
|
#define U_PF_LINUX 4000
|
124
|
+
/**
|
125
|
+
* Native Client is pretty close to Linux.
|
126
|
+
* See https://developer.chrome.com/native-client and
|
127
|
+
* http://www.chromium.org/nativeclient
|
128
|
+
* @internal
|
129
|
+
*/
|
130
|
+
#define U_PF_BROWSER_NATIVE_CLIENT 4020
|
124
131
|
/** Android is based on Linux. @internal */
|
125
132
|
#define U_PF_ANDROID 4050
|
133
|
+
/* Maximum value for Linux-based platform is 4499 */
|
126
134
|
/** z/OS is the successor to OS/390 which was the successor to MVS. @internal */
|
127
135
|
#define U_PF_OS390 9000
|
128
136
|
/** "IBM i" is the current name of what used to be i5/OS and earlier OS/400. @internal */
|
@@ -140,6 +148,8 @@
|
|
140
148
|
# define U_PLATFORM U_PF_ANDROID
|
141
149
|
/* Android wchar_t support depends on the API level. */
|
142
150
|
# include <android/api-level.h>
|
151
|
+
#elif defined(__native_client__)
|
152
|
+
# define U_PLATFORM U_PF_BROWSER_NATIVE_CLIENT
|
143
153
|
#elif defined(linux) || defined(__linux__) || defined(__linux)
|
144
154
|
# define U_PLATFORM U_PF_LINUX
|
145
155
|
#elif defined(__APPLE__) && defined(__MACH__)
|
@@ -239,7 +249,7 @@
|
|
239
249
|
*/
|
240
250
|
#ifdef U_PLATFORM_IS_LINUX_BASED
|
241
251
|
/* Use the predefined value. */
|
242
|
-
#elif U_PF_LINUX <= U_PLATFORM && U_PLATFORM <=
|
252
|
+
#elif U_PF_LINUX <= U_PLATFORM && U_PLATFORM <= 4499
|
243
253
|
# define U_PLATFORM_IS_LINUX_BASED 1
|
244
254
|
#else
|
245
255
|
# define U_PLATFORM_IS_LINUX_BASED 0
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
*******************************************************************************
|
3
|
-
* Copyright (C) 2008-
|
3
|
+
* Copyright (C) 2008-2015, International Business Machines Corporation and
|
4
4
|
* others. All Rights Reserved.
|
5
5
|
*******************************************************************************
|
6
6
|
*
|
@@ -163,7 +163,7 @@ class SharedPluralRules;
|
|
163
163
|
* <p>
|
164
164
|
* The difference between 'in' and 'within' is that 'in' only includes
|
165
165
|
* integers in the specified range, while 'within' includes all values.
|
166
|
-
* Using 'within' with a range_list consisting entirely of values is the
|
166
|
+
* Using 'within' with a range_list consisting entirely of values is the
|
167
167
|
* same as using 'in' (it's not an error).
|
168
168
|
*</p>
|
169
169
|
* <p>
|
@@ -301,7 +301,7 @@ public:
|
|
301
301
|
|
302
302
|
/**
|
303
303
|
* For ICU use only.
|
304
|
-
* creates a SharedPluralRules object
|
304
|
+
* creates a SharedPluralRules object
|
305
305
|
* @internal
|
306
306
|
*/
|
307
307
|
static PluralRules* U_EXPORT2 internalForLocale(const Locale& locale, UPluralType type, UErrorCode& status);
|
@@ -316,7 +316,7 @@ public:
|
|
316
316
|
static const SharedPluralRules* U_EXPORT2 createSharedInstance(
|
317
317
|
const Locale& locale, UPluralType type, UErrorCode& status);
|
318
318
|
|
319
|
-
|
319
|
+
|
320
320
|
#endif /* U_HIDE_INTERNAL_API */
|
321
321
|
|
322
322
|
/**
|
@@ -360,21 +360,24 @@ public:
|
|
360
360
|
*/
|
361
361
|
StringEnumeration* getKeywords(UErrorCode& status) const;
|
362
362
|
|
363
|
+
#ifndef U_HIDE_DEPRECATED_API
|
363
364
|
/**
|
364
|
-
*
|
365
|
-
*
|
365
|
+
* Deprecated Function, does not return useful results.
|
366
|
+
*
|
367
|
+
* Originally intended to return a unique value for this keyword if it exists,
|
368
|
+
* else the constant UPLRULES_NO_UNIQUE_VALUE.
|
366
369
|
*
|
367
370
|
* @param keyword The keyword.
|
368
|
-
* @return
|
369
|
-
*
|
370
|
-
* unique value that generates this keyword.
|
371
|
-
* @stable ICU 4.8
|
371
|
+
* @return Stub deprecated function returns UPLRULES_NO_UNIQUE_VALUE always.
|
372
|
+
* @deprecated ICU 55
|
372
373
|
*/
|
373
374
|
double getUniqueKeywordValue(const UnicodeString& keyword);
|
374
375
|
|
375
376
|
/**
|
376
|
-
*
|
377
|
-
*
|
377
|
+
* Deprecated Function, does not produce useful results.
|
378
|
+
*
|
379
|
+
* Orginally intended to return all the values for which select() would return the keyword.
|
380
|
+
* If the keyword is unknown, returns no values, but this is not an error. If
|
378
381
|
* the number of values is unlimited, returns no values and -1 as the
|
379
382
|
* count.
|
380
383
|
*
|
@@ -384,15 +387,16 @@ public:
|
|
384
387
|
* @param dest Array into which to put the returned values. May
|
385
388
|
* be NULL if destCapacity is 0.
|
386
389
|
* @param destCapacity The capacity of the array, must be at least 0.
|
387
|
-
* @param status The error code.
|
390
|
+
* @param status The error code. Deprecated function, always sets U_UNSUPPORTED_ERROR.
|
388
391
|
* @return The count of values available, or -1. This count
|
389
392
|
* can be larger than destCapacity, but no more than
|
390
393
|
* destCapacity values will be written.
|
391
|
-
* @
|
394
|
+
* @deprecated ICU 55
|
392
395
|
*/
|
393
396
|
int32_t getAllKeywordValues(const UnicodeString &keyword,
|
394
397
|
double *dest, int32_t destCapacity,
|
395
398
|
UErrorCode& status);
|
399
|
+
#endif /* U_HIDE_DEPRECATED_API */
|
396
400
|
|
397
401
|
/**
|
398
402
|
* Returns sample values for which select() would return the keyword. If
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
*******************************************************************************
|
3
|
-
* Copyright (C) 1997-
|
3
|
+
* Copyright (C) 1997-2015, International Business Machines Corporation and others.
|
4
4
|
* All Rights Reserved.
|
5
5
|
*******************************************************************************
|
6
6
|
*/
|
@@ -619,7 +619,7 @@ public:
|
|
619
619
|
* locale. There are four legal values: URBNF_SPELLOUT, which creates a formatter that
|
620
620
|
* spells out a value in words in the desired language, URBNF_ORDINAL, which attaches
|
621
621
|
* an ordinal suffix from the desired language to the end of a number (e.g. "123rd"),
|
622
|
-
* URBNF_DURATION, which formats a duration in seconds as hours, minutes, and seconds,
|
622
|
+
* URBNF_DURATION, which formats a duration in seconds as hours, minutes, and seconds always rounding down,
|
623
623
|
* and URBNF_NUMBERING_SYSTEM, which is used to invoke rules for alternate numbering
|
624
624
|
* systems such as the Hebrew numbering system, or for Roman Numerals, etc.
|
625
625
|
* @param locale The locale for the formatter.
|
@@ -913,7 +913,6 @@ public:
|
|
913
913
|
*/
|
914
914
|
virtual UnicodeString getDefaultRuleSetName() const;
|
915
915
|
|
916
|
-
/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
|
917
916
|
/**
|
918
917
|
* Set a particular UDisplayContext value in the formatter, such as
|
919
918
|
* UDISPCTX_CAPITALIZATION_FOR_STANDALONE. Note: For getContext, see
|
@@ -922,7 +921,7 @@ public:
|
|
922
921
|
* @param status Input/output status. If at entry this indicates a failure
|
923
922
|
* status, the function will do nothing; otherwise this will be
|
924
923
|
* updated with any new status from the function.
|
925
|
-
* @
|
924
|
+
* @stable ICU 53
|
926
925
|
*/
|
927
926
|
virtual void setContext(UDisplayContext value, UErrorCode& status);
|
928
927
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
**********************************************************************
|
3
|
-
* Copyright (C) 2002-
|
3
|
+
* Copyright (C) 2002-2015, International Business Machines
|
4
4
|
* Corporation and others. All Rights Reserved.
|
5
5
|
**********************************************************************
|
6
6
|
* file name: regex.h
|
@@ -55,6 +55,8 @@
|
|
55
55
|
|
56
56
|
// Forward Declarations
|
57
57
|
|
58
|
+
struct UHashtable;
|
59
|
+
|
58
60
|
U_NAMESPACE_BEGIN
|
59
61
|
|
60
62
|
struct Regex8BitSet;
|
@@ -136,7 +138,7 @@ public:
|
|
136
138
|
|
137
139
|
/**
|
138
140
|
* Create an exact copy of this RegexPattern object. Since RegexPattern is not
|
139
|
-
* intended to be
|
141
|
+
* intended to be subclassed, <code>clone()</code> and the copy construction are
|
140
142
|
* equivalent operations.
|
141
143
|
* @return the copy of this RegexPattern
|
142
144
|
* @stable ICU 2.4
|
@@ -437,6 +439,41 @@ public:
|
|
437
439
|
virtual UText *patternText(UErrorCode &status) const;
|
438
440
|
|
439
441
|
|
442
|
+
/**
|
443
|
+
* Get the group number corresponding to a named capture group.
|
444
|
+
* The returned number can be used with any function that access
|
445
|
+
* capture groups by number.
|
446
|
+
*
|
447
|
+
* The function returns an error status if the specified name does not
|
448
|
+
* appear in the pattern.
|
449
|
+
*
|
450
|
+
* @param groupName The capture group name.
|
451
|
+
* @param status A UErrorCode to receive any errors.
|
452
|
+
*
|
453
|
+
* @draft ICU 55
|
454
|
+
*/
|
455
|
+
virtual int32_t groupNumberFromName(const UnicodeString &groupName, UErrorCode &status) const;
|
456
|
+
|
457
|
+
|
458
|
+
/**
|
459
|
+
* Get the group number corresponding to a named capture group.
|
460
|
+
* The returned number can be used with any function that access
|
461
|
+
* capture groups by number.
|
462
|
+
*
|
463
|
+
* The function returns an error status if the specified name does not
|
464
|
+
* appear in the pattern.
|
465
|
+
*
|
466
|
+
* @param groupName The capture group name,
|
467
|
+
* platform invariant characters only.
|
468
|
+
* @param nameLength The length of the name, or -1 if the name is
|
469
|
+
* nul-terminated.
|
470
|
+
* @param status A UErrorCode to receive any errors.
|
471
|
+
*
|
472
|
+
* @draft ICU 55
|
473
|
+
*/
|
474
|
+
virtual int32_t groupNumberFromName(const char *groupName, int32_t nameLength, UErrorCode &status) const;
|
475
|
+
|
476
|
+
|
440
477
|
/**
|
441
478
|
* Split a string into fields. Somewhat like split() from Perl or Java.
|
442
479
|
* Pattern matches identify delimiters that separate the input
|
@@ -573,8 +610,6 @@ private:
|
|
573
610
|
UVector32 *fGroupMap; // Map from capture group number to position of
|
574
611
|
// the group's variables in the matcher stack frame.
|
575
612
|
|
576
|
-
int32_t fMaxCaptureDigits;
|
577
|
-
|
578
613
|
UnicodeSet **fStaticSets; // Ptr to static (shared) sets for predefined
|
579
614
|
// regex character classes, e.g. Word.
|
580
615
|
|
@@ -589,6 +624,8 @@ private:
|
|
589
624
|
Regex8BitSet *fInitialChars8;
|
590
625
|
UBool fNeedsAltInput;
|
591
626
|
|
627
|
+
UHashtable *fNamedCaptureMap; // Map from capture group names to numbers.
|
628
|
+
|
592
629
|
friend class RegexCompile;
|
593
630
|
friend class RegexMatcher;
|
594
631
|
friend class RegexCImpl;
|
@@ -812,7 +849,7 @@ public:
|
|
812
849
|
* position may not be valid with the altered input string.</p>
|
813
850
|
* @param status A reference to a UErrorCode to receive any errors.
|
814
851
|
* @return TRUE if a match is found.
|
815
|
-
* @
|
852
|
+
* @draft ICU 55
|
816
853
|
*/
|
817
854
|
virtual UBool find(UErrorCode &status);
|
818
855
|
|
@@ -854,7 +891,6 @@ public:
|
|
854
891
|
*/
|
855
892
|
virtual UnicodeString group(int32_t groupNum, UErrorCode &status) const;
|
856
893
|
|
857
|
-
|
858
894
|
/**
|
859
895
|
* Returns the number of capturing groups in this matcher's pattern.
|
860
896
|
* @return the number of capture groups
|
@@ -896,24 +932,6 @@ public:
|
|
896
932
|
*/
|
897
933
|
virtual UText *group(int32_t groupNum, UText *dest, int64_t &group_len, UErrorCode &status) const;
|
898
934
|
|
899
|
-
/**
|
900
|
-
* Returns a string containing the text captured by the given group
|
901
|
-
* during the previous match operation. Group(0) is the entire match.
|
902
|
-
*
|
903
|
-
* @param groupNum the capture group number
|
904
|
-
* @param dest A mutable UText in which the matching text is placed.
|
905
|
-
* If NULL, a new UText will be created (which may not be mutable).
|
906
|
-
* @param status A reference to a UErrorCode to receive any errors.
|
907
|
-
* Possible errors are U_REGEX_INVALID_STATE if no match
|
908
|
-
* has been attempted or the last match failed.
|
909
|
-
* @return A string containing the matched input text. If a pre-allocated UText
|
910
|
-
* was provided, it will always be used and returned.
|
911
|
-
*
|
912
|
-
* @internal ICU 4.4 technology preview
|
913
|
-
*/
|
914
|
-
virtual UText *group(int32_t groupNum, UText *dest, UErrorCode &status) const;
|
915
|
-
|
916
|
-
|
917
935
|
/**
|
918
936
|
* Returns the index in the input string of the start of the text matched
|
919
937
|
* during the previous match operation.
|
@@ -963,7 +981,6 @@ public:
|
|
963
981
|
*/
|
964
982
|
virtual int64_t start64(int32_t group, UErrorCode &status) const;
|
965
983
|
|
966
|
-
|
967
984
|
/**
|
968
985
|
* Returns the index in the input string of the first character following the
|
969
986
|
* text matched during the previous match operation.
|
@@ -1033,7 +1050,6 @@ public:
|
|
1033
1050
|
*/
|
1034
1051
|
virtual int64_t end64(int32_t group, UErrorCode &status) const;
|
1035
1052
|
|
1036
|
-
|
1037
1053
|
/**
|
1038
1054
|
* Resets this matcher. The effect is to remove any memory of previous matches,
|
1039
1055
|
* and to cause subsequent find() operations to begin at the beginning of
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
*******************************************************************************
|
3
|
-
* Copyright (C) 2014, International Business Machines Corporation and others.
|
3
|
+
* Copyright (C) 2014-2015, International Business Machines Corporation and others.
|
4
4
|
* All Rights Reserved.
|
5
5
|
*******************************************************************************
|
6
6
|
*/
|
@@ -104,9 +104,9 @@ public:
|
|
104
104
|
#ifndef U_HIDE_DRAFT_API
|
105
105
|
/**
|
106
106
|
* Returns an enumeration over the IDs of all known regions that match the given type.
|
107
|
-
* @draft ICU
|
107
|
+
* @draft ICU 55
|
108
108
|
*/
|
109
|
-
static StringEnumeration* U_EXPORT2 getAvailable(URegionType type);
|
109
|
+
static StringEnumeration* U_EXPORT2 getAvailable(URegionType type, UErrorCode &status);
|
110
110
|
#endif /* U_HIDE_DRAFT_API */
|
111
111
|
|
112
112
|
/**
|
@@ -135,18 +135,18 @@ public:
|
|
135
135
|
* any sub-regions. For example, calling this method with region "150" (Europe) returns an enumeration containing
|
136
136
|
* the various sub regions of Europe - "039" (Southern Europe) - "151" (Eastern Europe) - "154" (Northern Europe)
|
137
137
|
* and "155" (Western Europe).
|
138
|
-
* @draft ICU
|
138
|
+
* @draft ICU 55
|
139
139
|
*/
|
140
|
-
StringEnumeration* getContainedRegions() const;
|
140
|
+
StringEnumeration* getContainedRegions(UErrorCode &status) const;
|
141
141
|
|
142
142
|
/**
|
143
143
|
* Returns an enumeration over the IDs of all the regions that are children of this region anywhere in the region
|
144
144
|
* hierarchy and match the given type. This API may return an empty enumeration if this region doesn't have any
|
145
145
|
* sub-regions that match the given type. For example, calling this method with region "150" (Europe) and type
|
146
146
|
* "URGN_TERRITORY" returns a set containing all the territories in Europe ( "FR" (France) - "IT" (Italy) - "DE" (Germany) etc. )
|
147
|
-
* @draft ICU
|
147
|
+
* @draft ICU 55
|
148
148
|
*/
|
149
|
-
StringEnumeration* getContainedRegions( URegionType type ) const;
|
149
|
+
StringEnumeration* getContainedRegions( URegionType type, UErrorCode &status ) const;
|
150
150
|
#endif /* U_HIDE_DRAFT_API */
|
151
151
|
|
152
152
|
/**
|
@@ -160,9 +160,9 @@ public:
|
|
160
160
|
* For deprecated regions, return an enumeration over the IDs of the regions that are the preferred replacement
|
161
161
|
* regions for this region. Returns null for a non-deprecated region. For example, calling this method with region
|
162
162
|
* "SU" (Soviet Union) would return a list of the regions containing "RU" (Russia), "AM" (Armenia), "AZ" (Azerbaijan), etc...
|
163
|
-
* @draft ICU
|
163
|
+
* @draft ICU 55
|
164
164
|
*/
|
165
|
-
StringEnumeration* getPreferredValues() const;
|
165
|
+
StringEnumeration* getPreferredValues(UErrorCode &status) const;
|
166
166
|
#endif /* U_HIDE_DRAFT_API */
|
167
167
|
|
168
168
|
/**
|