pango 2.2.5-x64-mingw32 → 3.0.0-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (232) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +19 -3
  3. data/ext/pango/depend +0 -1
  4. data/ext/pango/extconf.rb +0 -2
  5. data/ext/pango/rbpango.c +44 -6
  6. data/ext/pango/rbpango.h +0 -1
  7. data/ext/pango/rbpangoattribute.c +2 -2
  8. data/ext/pango/rbpangocairo.c +4 -4
  9. data/ext/pango/rbpangocontext.c +2 -2
  10. data/ext/pango/rbpangofontdescription.c +2 -2
  11. data/ext/pango/rbpangogravity.c +2 -2
  12. data/ext/pango/rbpangolanguage.c +8 -0
  13. data/ext/pango/rbpangolayout.c +15 -4
  14. data/ext/pango/rbpangomatrix.c +2 -2
  15. data/ext/pango/rbpangoscript.c +3 -3
  16. data/lib/2.0/pango.so +0 -0
  17. data/lib/2.1/pango.so +0 -0
  18. data/lib/2.2/pango.so +0 -0
  19. data/test/test-language.rb +5 -0
  20. data/test/test-layout.rb +7 -1
  21. data/vendor/local/bin/derb.exe +0 -0
  22. data/vendor/local/bin/genbrk.exe +0 -0
  23. data/vendor/local/bin/genccode.exe +0 -0
  24. data/vendor/local/bin/gencfu.exe +0 -0
  25. data/vendor/local/bin/gencmn.exe +0 -0
  26. data/vendor/local/bin/gencnval.exe +0 -0
  27. data/vendor/local/bin/gendict.exe +0 -0
  28. data/vendor/local/bin/gennorm2.exe +0 -0
  29. data/vendor/local/bin/genrb.exe +0 -0
  30. data/vendor/local/bin/gensprep.exe +0 -0
  31. data/vendor/local/bin/hb-ot-shape-closure.exe +0 -0
  32. data/vendor/local/bin/hb-shape.exe +0 -0
  33. data/vendor/local/bin/hb-view.exe +0 -0
  34. data/vendor/local/bin/icu-config +6 -6
  35. data/vendor/local/bin/icuinfo.exe +0 -0
  36. data/vendor/local/bin/icupkg.exe +0 -0
  37. data/vendor/local/bin/libharfbuzz-0.dll +0 -0
  38. data/vendor/local/bin/libpango-1.0-0.dll +0 -0
  39. data/vendor/local/bin/libpangocairo-1.0-0.dll +0 -0
  40. data/vendor/local/bin/libpangoft2-1.0-0.dll +0 -0
  41. data/vendor/local/bin/libpangowin32-1.0-0.dll +0 -0
  42. data/vendor/local/bin/makeconv.exe +0 -0
  43. data/vendor/local/bin/pango-querymodules.exe +0 -0
  44. data/vendor/local/bin/pango-view.exe +0 -0
  45. data/vendor/local/bin/pkgdata.exe +0 -0
  46. data/vendor/local/bin/uconv.exe +0 -0
  47. data/vendor/local/etc/pango/pango.modules +1 -1
  48. data/vendor/local/include/harfbuzz/hb-buffer.h +26 -1
  49. data/vendor/local/include/harfbuzz/hb-common.h +7 -0
  50. data/vendor/local/include/harfbuzz/hb-font.h +7 -6
  51. data/vendor/local/include/harfbuzz/hb-ft.h +58 -1
  52. data/vendor/local/include/harfbuzz/hb-glib.h +3 -0
  53. data/vendor/local/include/harfbuzz/hb-ot-font.h +4 -0
  54. data/vendor/local/include/harfbuzz/hb-shape.h +0 -3
  55. data/vendor/local/include/harfbuzz/hb-unicode.h +28 -3
  56. data/vendor/local/include/harfbuzz/hb-version.h +4 -4
  57. data/vendor/local/include/layout/LEFontInstance.h +2 -28
  58. data/vendor/local/include/layout/LETableReference.h +7 -2
  59. data/vendor/local/include/unicode/calendar.h +32 -2
  60. data/vendor/local/include/unicode/coll.h +9 -7
  61. data/vendor/local/include/unicode/datefmt.h +102 -13
  62. data/vendor/local/include/unicode/dcfmtsym.h +4 -2
  63. data/vendor/local/include/unicode/decimfmt.h +4 -5
  64. data/vendor/local/include/unicode/dtfmtsym.h +60 -1
  65. data/vendor/local/include/unicode/dtptngen.h +21 -7
  66. data/vendor/local/include/unicode/localpointer.h +49 -1
  67. data/vendor/local/include/unicode/locid.h +2 -3
  68. data/vendor/local/include/unicode/measfmt.h +30 -37
  69. data/vendor/local/include/unicode/measunit.h +65 -152
  70. data/vendor/local/include/unicode/measure.h +3 -3
  71. data/vendor/local/include/unicode/numfmt.h +3 -5
  72. data/vendor/local/include/unicode/platform.h +12 -2
  73. data/vendor/local/include/unicode/plurrule.h +18 -14
  74. data/vendor/local/include/unicode/rbnf.h +3 -4
  75. data/vendor/local/include/unicode/regex.h +42 -26
  76. data/vendor/local/include/unicode/region.h +9 -9
  77. data/vendor/local/include/unicode/reldatefmt.h +50 -45
  78. data/vendor/local/include/unicode/scientificnumberformatter.h +222 -0
  79. data/vendor/local/include/unicode/smpdtfmt.h +30 -24
  80. data/vendor/local/include/unicode/tblcoll.h +5 -4
  81. data/vendor/local/include/unicode/timezone.h +18 -1
  82. data/vendor/local/include/unicode/ucal.h +2 -2
  83. data/vendor/local/include/unicode/ucol.h +22 -18
  84. data/vendor/local/include/unicode/uconfig.h +17 -2
  85. data/vendor/local/include/unicode/udat.h +164 -56
  86. data/vendor/local/include/unicode/udatpg.h +9 -7
  87. data/vendor/local/include/unicode/ufieldpositer.h +121 -0
  88. data/vendor/local/include/unicode/uidna.h +21 -13
  89. data/vendor/local/include/unicode/ulistformatter.h +130 -0
  90. data/vendor/local/include/unicode/ulocdata.h +4 -3
  91. data/vendor/local/include/unicode/unistr.h +101 -53
  92. data/vendor/local/include/unicode/unum.h +7 -10
  93. data/vendor/local/include/unicode/uregex.h +52 -29
  94. data/vendor/local/include/unicode/urename.h +14 -3
  95. data/vendor/local/include/unicode/uscript.h +30 -16
  96. data/vendor/local/include/unicode/uspoof.h +13 -9
  97. data/vendor/local/include/unicode/utrans.h +5 -7
  98. data/vendor/local/include/unicode/utypes.h +9 -3
  99. data/vendor/local/include/unicode/uvernum.h +8 -8
  100. data/vendor/local/lib/icu/{54.1 → 55.1}/Makefile.inc +5 -5
  101. data/vendor/local/lib/icu/{54.1 → 55.1}/pkgdata.inc +1 -1
  102. data/vendor/local/lib/icu/Makefile.inc +5 -5
  103. data/vendor/local/lib/icu/pkgdata.inc +1 -1
  104. data/vendor/local/lib/icudt.dll +0 -0
  105. data/vendor/local/lib/{icudt54.dll → icudt55.dll} +0 -0
  106. data/vendor/local/lib/icuin.dll +0 -0
  107. data/vendor/local/lib/icuin55.dll +0 -0
  108. data/vendor/local/lib/icuio.dll +0 -0
  109. data/vendor/local/lib/icuio55.dll +0 -0
  110. data/vendor/local/lib/icule.dll +0 -0
  111. data/vendor/local/lib/icule55.dll +0 -0
  112. data/vendor/local/lib/iculx.dll +0 -0
  113. data/vendor/local/lib/iculx55.dll +0 -0
  114. data/vendor/local/lib/icutest.dll +0 -0
  115. data/vendor/local/lib/icutest55.dll +0 -0
  116. data/vendor/local/lib/icutu.dll +0 -0
  117. data/vendor/local/lib/icutu55.dll +0 -0
  118. data/vendor/local/lib/icuuc.dll +0 -0
  119. data/vendor/local/lib/icuuc55.dll +0 -0
  120. data/vendor/local/lib/libharfbuzz-icu.a +0 -0
  121. data/vendor/local/lib/libharfbuzz-icu.la +7 -7
  122. data/vendor/local/lib/libharfbuzz.dll.a +0 -0
  123. data/vendor/local/lib/libharfbuzz.la +7 -7
  124. data/vendor/local/lib/libicudt.dll.a +0 -0
  125. data/vendor/local/lib/libicuin.dll.a +0 -0
  126. data/vendor/local/lib/libicuio.dll.a +0 -0
  127. data/vendor/local/lib/libicule.dll.a +0 -0
  128. data/vendor/local/lib/libiculx.dll.a +0 -0
  129. data/vendor/local/lib/libicutest.dll.a +0 -0
  130. data/vendor/local/lib/libicutu.dll.a +0 -0
  131. data/vendor/local/lib/libicuuc.dll.a +0 -0
  132. data/vendor/local/lib/libpango-1.0.dll.a +0 -0
  133. data/vendor/local/lib/libpango-1.0.la +2 -2
  134. data/vendor/local/lib/libpangocairo-1.0.dll.a +0 -0
  135. data/vendor/local/lib/libpangocairo-1.0.la +1 -1
  136. data/vendor/local/lib/libpangoft2-1.0.dll.a +0 -0
  137. data/vendor/local/lib/libpangoft2-1.0.la +2 -2
  138. data/vendor/local/lib/libpangowin32-1.0.dll.a +0 -0
  139. data/vendor/local/lib/libpangowin32-1.0.la +2 -2
  140. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.dll +0 -0
  141. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.dll.a +0 -0
  142. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.la +2 -2
  143. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.dll +0 -0
  144. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.dll.a +0 -0
  145. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.la +2 -2
  146. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.dll +0 -0
  147. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.dll.a +0 -0
  148. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.la +2 -2
  149. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.dll +0 -0
  150. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.dll.a +0 -0
  151. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.la +2 -2
  152. data/vendor/local/lib/pkgconfig/harfbuzz-icu.pc +1 -1
  153. data/vendor/local/lib/pkgconfig/harfbuzz.pc +3 -1
  154. data/vendor/local/lib/pkgconfig/icu-i18n.pc +5 -5
  155. data/vendor/local/lib/pkgconfig/icu-io.pc +5 -5
  156. data/vendor/local/lib/pkgconfig/icu-le.pc +5 -5
  157. data/vendor/local/lib/pkgconfig/icu-lx.pc +5 -5
  158. data/vendor/local/lib/pkgconfig/icu-uc.pc +5 -5
  159. data/vendor/local/share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html +35 -0
  160. data/vendor/local/share/gtk-doc/html/harfbuzz/annotation-glossary.html +30 -35
  161. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-full.html +158 -27
  162. data/vendor/local/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html +87 -0
  163. data/vendor/local/share/gtk-doc/html/harfbuzz/{ch01.html → ch06.html} +12 -13
  164. data/vendor/local/share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html +31 -0
  165. data/vendor/local/share/gtk-doc/html/harfbuzz/deprecated-api-index.html +7 -8
  166. data/vendor/local/share/gtk-doc/html/harfbuzz/fonts-and-faces.html +40 -0
  167. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-Shaping.html +352 -0
  168. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html +88 -47
  169. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html +128 -204
  170. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html +290 -304
  171. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html +14 -23
  172. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html +14 -17
  173. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html +40 -51
  174. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html +126 -190
  175. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html +19 -24
  176. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html +14 -29
  177. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html +438 -11
  178. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html +14 -25
  179. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html +14 -29
  180. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html +19 -160
  181. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-tag.html +21 -36
  182. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot.html +14 -11
  183. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html +70 -81
  184. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html +33 -44
  185. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html +290 -323
  186. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html +14 -23
  187. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html +59 -27
  188. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb.html +16 -13
  189. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2 +415 -104
  190. data/vendor/local/share/gtk-doc/html/harfbuzz/hello-harfbuzz.html +181 -0
  191. data/vendor/local/share/gtk-doc/html/harfbuzz/index.html +43 -12
  192. data/vendor/local/share/gtk-doc/html/harfbuzz/object-tree.html +11 -13
  193. data/vendor/local/share/gtk-doc/html/harfbuzz/plans-and-caching.html +31 -0
  194. data/vendor/local/share/gtk-doc/html/harfbuzz/pt01.html +70 -0
  195. data/vendor/local/share/gtk-doc/html/harfbuzz/pt02.html +107 -0
  196. data/vendor/local/share/gtk-doc/html/harfbuzz/setting-buffer-properties.html +31 -0
  197. data/vendor/local/share/gtk-doc/html/harfbuzz/shaping-and-shape-plans.html +39 -0
  198. data/vendor/local/share/gtk-doc/html/harfbuzz/style.css +9 -6
  199. data/vendor/local/share/gtk-doc/html/harfbuzz/using-harfbuzzs-native-opentype-implementation.html +31 -0
  200. data/vendor/local/share/gtk-doc/html/harfbuzz/using-your-own-font-functions.html +31 -0
  201. data/vendor/local/share/gtk-doc/html/harfbuzz/what-about-the-other-scripts.html +31 -0
  202. data/vendor/local/share/gtk-doc/html/harfbuzz/what-is-harfbuzz.html +124 -0
  203. data/vendor/local/share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html +38 -0
  204. data/vendor/local/share/icu/{54.1 → 55.1}/config/mh-mingw64 +0 -0
  205. data/vendor/local/share/icu/{54.1 → 55.1}/install-sh +0 -0
  206. data/vendor/local/share/icu/{54.1 → 55.1}/license.html +3 -4
  207. data/vendor/local/share/icu/{54.1 → 55.1}/mkinstalldirs +0 -0
  208. data/vendor/local/share/man/man1/derb.1 +2 -2
  209. data/vendor/local/share/man/man1/genbrk.1 +2 -2
  210. data/vendor/local/share/man/man1/gencfu.1 +1 -1
  211. data/vendor/local/share/man/man1/gencnval.1 +3 -3
  212. data/vendor/local/share/man/man1/gendict.1 +2 -2
  213. data/vendor/local/share/man/man1/genrb.1 +3 -3
  214. data/vendor/local/share/man/man1/icu-config.1 +2 -2
  215. data/vendor/local/share/man/man1/makeconv.1 +3 -3
  216. data/vendor/local/share/man/man1/pkgdata.1 +2 -2
  217. data/vendor/local/share/man/man1/uconv.1 +2 -2
  218. data/vendor/local/share/man/man8/genccode.8 +2 -2
  219. data/vendor/local/share/man/man8/gencmn.8 +3 -3
  220. data/vendor/local/share/man/man8/gensprep.8 +3 -3
  221. data/vendor/local/share/man/man8/icupkg.8 +1 -1
  222. metadata +38 -22
  223. data/vendor/local/include/unicode/scientificformathelper.h +0 -139
  224. data/vendor/local/lib/icuin54.dll +0 -0
  225. data/vendor/local/lib/icuio54.dll +0 -0
  226. data/vendor/local/lib/icule54.dll +0 -0
  227. data/vendor/local/lib/iculx54.dll +0 -0
  228. data/vendor/local/lib/icutest54.dll +0 -0
  229. data/vendor/local/lib/icutu54.dll +0 -0
  230. data/vendor/local/lib/icuuc54.dll +0 -0
  231. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html +0 -286
  232. data/vendor/local/share/gtk-doc/html/harfbuzz/index.sgml +0 -496
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  **********************************************************************
3
- * Copyright (c) 2004-2014, International Business Machines
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
- * @draft ICU 53
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
- * @draft ICU 53
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-2014, International Business Machines Corporation and others.
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
- * @draft ICU 53
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
- * @draft ICU 53
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-2014, International Business Machines
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 <= U_PF_ANDROID
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-2014, International Business Machines Corporation and
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
- * Returns a unique value for this keyword if it exists, else the constant
365
- * UPLRULES_NO_UNIQUE_VALUE.
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 The unique value that generates the keyword, or
369
- * UPLRULES_NO_UNIQUE_VALUE if the keyword is undefined or there is no
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
- * Returns all the values for which select() would return the keyword. If
377
- * the keyword is unknown, returns no values, but this is not an error. If
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
- * @stable ICU 4.8
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-2014, International Business Machines Corporation and others.
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
- * @draft ICU 53
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-2014, International Business Machines
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 subclasses, <code>clone()</code> and the copy construction are
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
- * @internal
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 51
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 51
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 51
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 51
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
  /**
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  *****************************************************************************
3
- * Copyright (C) 2014, International Business Machines Corporation and
3
+ * Copyright (C) 2014-2015, International Business Machines Corporation and
4
4
  * others.
5
5
  * All Rights Reserved.
6
6
  *****************************************************************************
@@ -57,65 +57,67 @@ typedef enum UDateRelativeDateTimeFormatterStyle {
57
57
  UDAT_STYLE_COUNT
58
58
  } UDateRelativeDateTimeFormatterStyle;
59
59
 
60
+ #endif /* U_HIDE_DRAFT_API */
61
+
60
62
  /**
61
63
  * Represents the unit for formatting a relative date. e.g "in 5 days"
62
64
  * or "in 3 months"
63
- * @draft ICU 53
65
+ * @stable ICU 53
64
66
  */
65
67
  typedef enum UDateRelativeUnit {
66
68
 
67
69
  /**
68
70
  * Seconds
69
- * @draft ICU 53
71
+ * @stable ICU 53
70
72
  */
71
73
  UDAT_RELATIVE_SECONDS,
72
74
 
73
75
  /**
74
76
  * Minutes
75
- * @draft ICU 53
77
+ * @stable ICU 53
76
78
  */
77
79
  UDAT_RELATIVE_MINUTES,
78
80
 
79
81
  /**
80
82
  * Hours
81
- * @draft ICU 53
83
+ * @stable ICU 53
82
84
  */
83
85
  UDAT_RELATIVE_HOURS,
84
86
 
85
87
  /**
86
88
  * Days
87
- * @draft ICU 53
89
+ * @stable ICU 53
88
90
  */
89
91
  UDAT_RELATIVE_DAYS,
90
92
 
91
93
  /**
92
94
  * Weeks
93
- * @draft ICU 53
95
+ * @stable ICU 53
94
96
  */
95
97
  UDAT_RELATIVE_WEEKS,
96
98
 
97
99
  /**
98
100
  * Months
99
- * @draft ICU 53
101
+ * @stable ICU 53
100
102
  */
101
103
  UDAT_RELATIVE_MONTHS,
102
104
 
103
105
  /**
104
106
  * Years
105
- * @draft ICU 53
107
+ * @stable ICU 53
106
108
  */
107
109
  UDAT_RELATIVE_YEARS,
108
110
 
109
111
  /**
110
112
  * Count of items in this enum.
111
- * @draft ICU 53
113
+ * @stable ICU 53
112
114
  */
113
115
  UDAT_RELATIVE_UNIT_COUNT
114
116
  } UDateRelativeUnit;
115
117
 
116
118
  /**
117
119
  * Represents an absolute unit.
118
- * @draft ICU 53
120
+ * @stable ICU 53
119
121
  */
120
122
  typedef enum UDateAbsoluteUnit {
121
123
 
@@ -123,79 +125,79 @@ typedef enum UDateAbsoluteUnit {
123
125
  // Saturday.
124
126
  /**
125
127
  * Sunday
126
- * @draft ICU 53
128
+ * @stable ICU 53
127
129
  */
128
130
  UDAT_ABSOLUTE_SUNDAY,
129
131
 
130
132
  /**
131
133
  * Monday
132
- * @draft ICU 53
134
+ * @stable ICU 53
133
135
  */
134
136
  UDAT_ABSOLUTE_MONDAY,
135
137
 
136
138
  /**
137
139
  * Tuesday
138
- * @draft ICU 53
140
+ * @stable ICU 53
139
141
  */
140
142
  UDAT_ABSOLUTE_TUESDAY,
141
143
 
142
144
  /**
143
145
  * Wednesday
144
- * @draft ICU 53
146
+ * @stable ICU 53
145
147
  */
146
148
  UDAT_ABSOLUTE_WEDNESDAY,
147
149
 
148
150
  /**
149
151
  * Thursday
150
- * @draft ICU 53
152
+ * @stable ICU 53
151
153
  */
152
154
  UDAT_ABSOLUTE_THURSDAY,
153
155
 
154
156
  /**
155
157
  * Friday
156
- * @draft ICU 53
158
+ * @stable ICU 53
157
159
  */
158
160
  UDAT_ABSOLUTE_FRIDAY,
159
161
 
160
162
  /**
161
163
  * Saturday
162
- * @draft ICU 53
164
+ * @stable ICU 53
163
165
  */
164
166
  UDAT_ABSOLUTE_SATURDAY,
165
167
 
166
168
  /**
167
169
  * Day
168
- * @draft ICU 53
170
+ * @stable ICU 53
169
171
  */
170
172
  UDAT_ABSOLUTE_DAY,
171
173
 
172
174
  /**
173
175
  * Week
174
- * @draft ICU 53
176
+ * @stable ICU 53
175
177
  */
176
178
  UDAT_ABSOLUTE_WEEK,
177
179
 
178
180
  /**
179
181
  * Month
180
- * @draft ICU 53
182
+ * @stable ICU 53
181
183
  */
182
184
  UDAT_ABSOLUTE_MONTH,
183
185
 
184
186
  /**
185
187
  * Year
186
- * @draft ICU 53
188
+ * @stable ICU 53
187
189
  */
188
190
  UDAT_ABSOLUTE_YEAR,
189
191
 
190
192
  /**
191
193
  * Now
192
- * @draft ICU 53
194
+ * @stable ICU 53
193
195
  */
194
196
  UDAT_ABSOLUTE_NOW,
195
197
 
196
198
  /**
197
199
  * Count of items in this enum.
198
- * @draft ICU 53
200
+ * @stable ICU 53
199
201
  */
200
202
  UDAT_ABSOLUTE_UNIT_COUNT
201
203
  } UDateAbsoluteUnit;
@@ -203,49 +205,49 @@ typedef enum UDateAbsoluteUnit {
203
205
  /**
204
206
  * Represents a direction for an absolute unit e.g "Next Tuesday"
205
207
  * or "Last Tuesday"
206
- * @draft ICU 53
208
+ * @stable ICU 53
207
209
  */
208
210
  typedef enum UDateDirection {
209
211
 
210
212
  /**
211
213
  * Two before. Not fully supported in every locale.
212
- * @draft ICU 53
214
+ * @stable ICU 53
213
215
  */
214
216
  UDAT_DIRECTION_LAST_2,
215
217
 
216
218
  /**
217
219
  * Last
218
- * @draft ICU 53
220
+ * @stable ICU 53
219
221
  */
220
222
  UDAT_DIRECTION_LAST,
221
223
 
222
224
  /**
223
225
  * This
224
- * @draft ICU 53
226
+ * @stable ICU 53
225
227
  */
226
228
  UDAT_DIRECTION_THIS,
227
229
 
228
230
  /**
229
231
  * Next
230
- * @draft ICU 53
232
+ * @stable ICU 53
231
233
  */
232
234
  UDAT_DIRECTION_NEXT,
233
235
 
234
236
  /**
235
237
  * Two after. Not fully supported in every locale.
236
- * @draft ICU 53
238
+ * @stable ICU 53
237
239
  */
238
240
  UDAT_DIRECTION_NEXT_2,
239
241
 
240
242
  /**
241
243
  * Plain, which means the absence of a qualifier.
242
- * @draft ICU 53
244
+ * @stable ICU 53
243
245
  */
244
246
  UDAT_DIRECTION_PLAIN,
245
247
 
246
248
  /**
247
249
  * Count of items in this enum.
248
- * @draft ICU 53
250
+ * @stable ICU 53
249
251
  */
250
252
  UDAT_DIRECTION_COUNT
251
253
  } UDateDirection;
@@ -326,20 +328,20 @@ class UnicodeString;
326
328
  *
327
329
  * The RelativeDateTimeFormatter class is not intended for public subclassing.
328
330
  *
329
- * @draft ICU 53
331
+ * @stable ICU 53
330
332
  */
331
333
  class U_I18N_API RelativeDateTimeFormatter : public UObject {
332
334
  public:
333
335
 
334
336
  /**
335
337
  * Create RelativeDateTimeFormatter with default locale.
336
- * @draft ICU 53
338
+ * @stable ICU 53
337
339
  */
338
340
  RelativeDateTimeFormatter(UErrorCode& status);
339
341
 
340
342
  /**
341
343
  * Create RelativeDateTimeFormatter with given locale.
342
- * @draft ICU 53
344
+ * @stable ICU 53
343
345
  */
344
346
  RelativeDateTimeFormatter(const Locale& locale, UErrorCode& status);
345
347
 
@@ -351,11 +353,12 @@ public:
351
353
  * It is an error for caller to delete this pointer or change its
352
354
  * contents after calling this constructor.
353
355
  * @status Any error is returned here.
354
- * @draft ICU 53
356
+ * @stable ICU 53
355
357
  */
356
358
  RelativeDateTimeFormatter(
357
359
  const Locale& locale, NumberFormat *nfToAdopt, UErrorCode& status);
358
360
 
361
+ #ifndef U_HIDE_DRAFT_API
359
362
  /**
360
363
  * Create RelativeDateTimeFormatter with given locale, NumberFormat,
361
364
  * and capitalization context.
@@ -377,23 +380,24 @@ public:
377
380
  UDateRelativeDateTimeFormatterStyle style,
378
381
  UDisplayContext capitalizationContext,
379
382
  UErrorCode& status);
383
+ #endif /* U_HIDE_DRAFT_API */
380
384
 
381
385
  /**
382
386
  * Copy constructor.
383
- * @draft ICU 53
387
+ * @stable ICU 53
384
388
  */
385
389
  RelativeDateTimeFormatter(const RelativeDateTimeFormatter& other);
386
390
 
387
391
  /**
388
392
  * Assignment operator.
389
- * @draft ICU 53
393
+ * @stable ICU 53
390
394
  */
391
395
  RelativeDateTimeFormatter& operator=(
392
396
  const RelativeDateTimeFormatter& other);
393
397
 
394
398
  /**
395
399
  * Destructor.
396
- * @draft ICU 53
400
+ * @stable ICU 53
397
401
  */
398
402
  virtual ~RelativeDateTimeFormatter();
399
403
 
@@ -410,7 +414,7 @@ public:
410
414
  * appended
411
415
  * @param status ICU error code returned here.
412
416
  * @return appendTo
413
- * @draft ICU 53
417
+ * @stable ICU 53
414
418
  */
415
419
  UnicodeString& format(
416
420
  double quantity,
@@ -429,7 +433,7 @@ public:
429
433
  * no format string is available.
430
434
  * @param status ICU error code returned here.
431
435
  * @return appendTo
432
- * @draft ICU 53
436
+ * @stable ICU 53
433
437
  */
434
438
  UnicodeString& format(
435
439
  UDateDirection direction,
@@ -447,7 +451,7 @@ public:
447
451
  * @param appendTo concatenated date and time appended here
448
452
  * @param status ICU error code returned here.
449
453
  * @return appendTo
450
- * @draft ICU 53
454
+ * @stable ICU 53
451
455
  */
452
456
  UnicodeString& combineDateAndTime(
453
457
  const UnicodeString& relativeDateString,
@@ -458,10 +462,11 @@ public:
458
462
  /**
459
463
  * Returns the NumberFormat this object is using.
460
464
  *
461
- * @draft ICU 53
465
+ * @stable ICU 53
462
466
  */
463
467
  const NumberFormat& getNumberFormat() const;
464
468
 
469
+ #ifndef U_HIDE_DRAFT_API
465
470
  /**
466
471
  * Returns the capitalization context.
467
472
  *
@@ -475,6 +480,8 @@ public:
475
480
  * @draft ICU 54
476
481
  */
477
482
  UDateRelativeDateTimeFormatterStyle getFormatStyle() const;
483
+ #endif /* U_HIDE_DRAFT_API */
484
+
478
485
  private:
479
486
  const RelativeDateTimeCacheData* fCache;
480
487
  const SharedNumberFormat *fNumberFormat;
@@ -492,7 +499,5 @@ private:
492
499
 
493
500
  U_NAMESPACE_END
494
501
 
495
- #endif /* U_HIDE_DRAFT_API */
496
-
497
502
  #endif /* !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION*/
498
503
  #endif