pango 3.0.7-x86-mingw32 → 3.0.8-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (351) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +6 -6
  3. data/ext/pango/extconf.rb +1 -0
  4. data/lib/2.2/pango.so +0 -0
  5. data/lib/2.3/pango.so +0 -0
  6. data/lib/pango.rb +2 -10
  7. data/vendor/local/bin/derb.exe +0 -0
  8. data/vendor/local/bin/genbrk.exe +0 -0
  9. data/vendor/local/bin/genccode.exe +0 -0
  10. data/vendor/local/bin/gencfu.exe +0 -0
  11. data/vendor/local/bin/gencmn.exe +0 -0
  12. data/vendor/local/bin/gencnval.exe +0 -0
  13. data/vendor/local/bin/gendict.exe +0 -0
  14. data/vendor/local/bin/gennorm2.exe +0 -0
  15. data/vendor/local/bin/genrb.exe +0 -0
  16. data/vendor/local/bin/gensprep.exe +0 -0
  17. data/vendor/local/bin/hb-ot-shape-closure.exe +0 -0
  18. data/vendor/local/bin/hb-shape.exe +0 -0
  19. data/vendor/local/bin/hb-view.exe +0 -0
  20. data/vendor/local/bin/icu-config +6 -7
  21. data/vendor/local/bin/icuinfo.exe +0 -0
  22. data/vendor/local/bin/icupkg.exe +0 -0
  23. data/vendor/local/bin/libharfbuzz-0.dll +0 -0
  24. data/vendor/local/bin/libpango-1.0-0.dll +0 -0
  25. data/vendor/local/bin/libpangocairo-1.0-0.dll +0 -0
  26. data/vendor/local/bin/libpangoft2-1.0-0.dll +0 -0
  27. data/vendor/local/bin/libpangowin32-1.0-0.dll +0 -0
  28. data/vendor/local/bin/makeconv.exe +0 -0
  29. data/vendor/local/bin/pango-view.exe +0 -0
  30. data/vendor/local/bin/pkgdata.exe +0 -0
  31. data/vendor/local/bin/uconv.exe +0 -0
  32. data/vendor/local/include/harfbuzz/hb-blob.h +12 -12
  33. data/vendor/local/include/harfbuzz/hb-buffer.h +181 -78
  34. data/vendor/local/include/harfbuzz/hb-common.h +23 -17
  35. data/vendor/local/include/harfbuzz/hb-deprecated.h +10 -0
  36. data/vendor/local/include/harfbuzz/hb-face.h +17 -17
  37. data/vendor/local/include/harfbuzz/hb-font.h +180 -79
  38. data/vendor/local/include/harfbuzz/hb-ft.h +16 -9
  39. data/vendor/local/include/harfbuzz/hb-glib.h +4 -4
  40. data/vendor/local/include/harfbuzz/hb-icu.h +3 -3
  41. data/vendor/local/include/harfbuzz/hb-ot-font.h +1 -1
  42. data/vendor/local/include/harfbuzz/hb-ot-layout.h +28 -28
  43. data/vendor/local/include/harfbuzz/hb-ot-shape.h +2 -2
  44. data/vendor/local/include/harfbuzz/hb-ot-tag.h +4 -4
  45. data/vendor/local/include/harfbuzz/hb-set.h +29 -26
  46. data/vendor/local/include/harfbuzz/hb-shape-plan.h +9 -9
  47. data/vendor/local/include/harfbuzz/hb-shape.h +5 -5
  48. data/vendor/local/include/harfbuzz/hb-unicode.h +47 -31
  49. data/vendor/local/include/harfbuzz/hb-version.h +6 -6
  50. data/vendor/local/include/harfbuzz/hb.h +4 -0
  51. data/vendor/local/include/layout/LELanguages.h +2 -5
  52. data/vendor/local/include/layout/LEScripts.h +3 -62
  53. data/vendor/local/include/layout/LETableReference.h +15 -3
  54. data/vendor/local/include/pango-1.0/pango/pango-attributes.h +27 -1
  55. data/vendor/local/include/pango-1.0/pango/pango-engine.h +50 -31
  56. data/vendor/local/include/pango-1.0/pango/pango-features.h +3 -3
  57. data/vendor/local/include/pango-1.0/pango/pango-font.h +1 -0
  58. data/vendor/local/include/pango-1.0/pango/pango-glyph-item.h +2 -0
  59. data/vendor/local/include/pango-1.0/pango/pango-glyph.h +5 -0
  60. data/vendor/local/include/pango-1.0/pango/pango-item.h +4 -0
  61. data/vendor/local/include/pango-1.0/pango/pango-layout.h +3 -0
  62. data/vendor/local/include/pango-1.0/pango/pango-matrix.h +2 -0
  63. data/vendor/local/include/pango-1.0/pango/pango-modules.h +6 -0
  64. data/vendor/local/include/pango-1.0/pango/pango-ot.h +8 -5
  65. data/vendor/local/include/pango-1.0/pango/pango-renderer.h +9 -2
  66. data/vendor/local/include/pango-1.0/pango/pango-script.h +63 -1
  67. data/vendor/local/include/pango-1.0/pango/pango-utils.h +12 -0
  68. data/vendor/local/include/pango-1.0/pango/pangofc-font.h +7 -10
  69. data/vendor/local/include/pango-1.0/pango/pangofc-fontmap.h +25 -16
  70. data/vendor/local/include/unicode/brkiter.h +6 -3
  71. data/vendor/local/include/unicode/bytestriebuilder.h +3 -1
  72. data/vendor/local/include/unicode/coll.h +21 -18
  73. data/vendor/local/include/unicode/compactdecimalformat.h +87 -3
  74. data/vendor/local/include/unicode/currpinf.h +2 -1
  75. data/vendor/local/include/unicode/datefmt.h +19 -41
  76. data/vendor/local/include/unicode/dcfmtsym.h +28 -9
  77. data/vendor/local/include/unicode/decimfmt.h +126 -304
  78. data/vendor/local/include/unicode/dtfmtsym.h +50 -19
  79. data/vendor/local/include/unicode/dtitvfmt.h +89 -30
  80. data/vendor/local/include/unicode/dtitvinf.h +63 -60
  81. data/vendor/local/include/unicode/dtptngen.h +81 -30
  82. data/vendor/local/include/unicode/filteredbrk.h +14 -24
  83. data/vendor/local/include/unicode/icuplug.h +9 -2
  84. data/vendor/local/include/unicode/listformatter.h +2 -2
  85. data/vendor/local/include/unicode/localpointer.h +231 -13
  86. data/vendor/local/include/unicode/locdspnm.h +2 -2
  87. data/vendor/local/include/unicode/locid.h +1 -3
  88. data/vendor/local/include/unicode/measfmt.h +14 -14
  89. data/vendor/local/include/unicode/measunit.h +213 -225
  90. data/vendor/local/include/unicode/normlzr.h +55 -43
  91. data/vendor/local/include/unicode/numfmt.h +60 -67
  92. data/vendor/local/include/unicode/platform.h +96 -3
  93. data/vendor/local/include/unicode/plurrule.h +5 -0
  94. data/vendor/local/include/unicode/rbnf.h +43 -4
  95. data/vendor/local/include/unicode/regex.h +14 -4
  96. data/vendor/local/include/unicode/region.h +5 -11
  97. data/vendor/local/include/unicode/reldatefmt.h +53 -43
  98. data/vendor/local/include/unicode/scientificnumberformatter.h +9 -11
  99. data/vendor/local/include/unicode/simpleformatter.h +295 -0
  100. data/vendor/local/include/unicode/smpdtfmt.h +36 -22
  101. data/vendor/local/include/unicode/tblcoll.h +32 -31
  102. data/vendor/local/include/unicode/timezone.h +4 -6
  103. data/vendor/local/include/unicode/tmunit.h +13 -13
  104. data/vendor/local/include/unicode/tzfmt.h +3 -6
  105. data/vendor/local/include/unicode/tznames.h +2 -4
  106. data/vendor/local/include/unicode/ubrk.h +14 -2
  107. data/vendor/local/include/unicode/uchar.h +61 -8
  108. data/vendor/local/include/unicode/ucharstriebuilder.h +1 -1
  109. data/vendor/local/include/unicode/ucol.h +2 -0
  110. data/vendor/local/include/unicode/uconfig.h +11 -6
  111. data/vendor/local/include/unicode/ucurr.h +24 -32
  112. data/vendor/local/include/unicode/udat.h +103 -87
  113. data/vendor/local/include/unicode/udateintervalformat.h +4 -1
  114. data/vendor/local/include/unicode/udatpg.h +6 -4
  115. data/vendor/local/include/unicode/udisplaycontext.h +6 -12
  116. data/vendor/local/include/unicode/ufieldpositer.h +10 -12
  117. data/vendor/local/include/unicode/uldnames.h +2 -2
  118. data/vendor/local/include/unicode/ulistformatter.h +9 -11
  119. data/vendor/local/include/unicode/uloc.h +13 -16
  120. data/vendor/local/include/unicode/umachine.h +2 -2
  121. data/vendor/local/include/unicode/uniset.h +25 -3
  122. data/vendor/local/include/unicode/unistr.h +168 -27
  123. data/vendor/local/include/unicode/unorm.h +40 -133
  124. data/vendor/local/include/unicode/unorm2.h +97 -1
  125. data/vendor/local/include/unicode/unum.h +61 -24
  126. data/vendor/local/include/unicode/uregex.h +7 -9
  127. data/vendor/local/include/unicode/ureldatefmt.h +365 -0
  128. data/vendor/local/include/unicode/urename.h +12 -1
  129. data/vendor/local/include/unicode/ures.h +157 -142
  130. data/vendor/local/include/unicode/uscript.h +1 -1
  131. data/vendor/local/include/unicode/ustdio.h +3 -5
  132. data/vendor/local/include/unicode/utf8.h +2 -2
  133. data/vendor/local/include/unicode/utypes.h +4 -6
  134. data/vendor/local/include/unicode/uvernum.h +7 -7
  135. data/vendor/local/lib/girepository-1.0/Pango-1.0.typelib +0 -0
  136. data/vendor/local/lib/girepository-1.0/PangoCairo-1.0.typelib +0 -0
  137. data/vendor/local/lib/girepository-1.0/PangoFT2-1.0.typelib +0 -0
  138. data/vendor/local/lib/icu/{55.1 → 57.1}/Makefile.inc +6 -6
  139. data/vendor/local/lib/icu/{55.1 → 57.1}/pkgdata.inc +1 -1
  140. data/vendor/local/lib/icu/Makefile.inc +6 -6
  141. data/vendor/local/lib/icu/pkgdata.inc +1 -1
  142. data/vendor/local/lib/icudt.dll +0 -0
  143. data/vendor/local/lib/{icudt55.dll → icudt57.dll} +0 -0
  144. data/vendor/local/lib/icuin.dll +0 -0
  145. data/vendor/local/lib/icuin57.dll +0 -0
  146. data/vendor/local/lib/icuio.dll +0 -0
  147. data/vendor/local/lib/icuio57.dll +0 -0
  148. data/vendor/local/lib/icule.dll +0 -0
  149. data/vendor/local/lib/icule57.dll +0 -0
  150. data/vendor/local/lib/iculx.dll +0 -0
  151. data/vendor/local/lib/iculx57.dll +0 -0
  152. data/vendor/local/lib/icutest.dll +0 -0
  153. data/vendor/local/lib/icutest57.dll +0 -0
  154. data/vendor/local/lib/icutu.dll +0 -0
  155. data/vendor/local/lib/icutu57.dll +0 -0
  156. data/vendor/local/lib/icuuc.dll +0 -0
  157. data/vendor/local/lib/icuuc57.dll +0 -0
  158. data/vendor/local/lib/libharfbuzz-icu.a +0 -0
  159. data/vendor/local/lib/libharfbuzz-icu.la +4 -4
  160. data/vendor/local/lib/libharfbuzz.dll.a +0 -0
  161. data/vendor/local/lib/libharfbuzz.la +4 -4
  162. data/vendor/local/lib/libicudt.dll.a +0 -0
  163. data/vendor/local/lib/libicuin.dll.a +0 -0
  164. data/vendor/local/lib/libicuio.dll.a +0 -0
  165. data/vendor/local/lib/libicule.dll.a +0 -0
  166. data/vendor/local/lib/libiculx.dll.a +0 -0
  167. data/vendor/local/lib/libicutest.dll.a +0 -0
  168. data/vendor/local/lib/libicutu.dll.a +0 -0
  169. data/vendor/local/lib/libicuuc.dll.a +0 -0
  170. data/vendor/local/lib/libpango-1.0.dll.a +0 -0
  171. data/vendor/local/lib/libpango-1.0.la +6 -6
  172. data/vendor/local/lib/libpangocairo-1.0.dll.a +0 -0
  173. data/vendor/local/lib/libpangocairo-1.0.la +6 -6
  174. data/vendor/local/lib/libpangoft2-1.0.dll.a +0 -0
  175. data/vendor/local/lib/libpangoft2-1.0.la +6 -6
  176. data/vendor/local/lib/libpangowin32-1.0.dll.a +0 -0
  177. data/vendor/local/lib/libpangowin32-1.0.la +6 -6
  178. data/vendor/local/lib/pkgconfig/harfbuzz-icu.pc +1 -1
  179. data/vendor/local/lib/pkgconfig/harfbuzz.pc +2 -2
  180. data/vendor/local/lib/pkgconfig/icu-i18n.pc +6 -6
  181. data/vendor/local/lib/pkgconfig/icu-io.pc +6 -6
  182. data/vendor/local/lib/pkgconfig/icu-le.pc +6 -6
  183. data/vendor/local/lib/pkgconfig/icu-lx.pc +6 -6
  184. data/vendor/local/lib/pkgconfig/icu-uc.pc +6 -6
  185. data/vendor/local/lib/pkgconfig/pango.pc +3 -5
  186. data/vendor/local/lib/pkgconfig/pangocairo.pc +3 -2
  187. data/vendor/local/lib/pkgconfig/pangoft2.pc +1 -1
  188. data/vendor/local/lib/pkgconfig/pangowin32.pc +3 -2
  189. data/vendor/local/share/gir-1.0/Pango-1.0.gir +891 -307
  190. data/vendor/local/share/gir-1.0/PangoCairo-1.0.gir +45 -27
  191. data/vendor/local/share/gir-1.0/PangoFT2-1.0.gir +12 -5
  192. data/vendor/local/share/gtk-doc/html/harfbuzz/HarfBuzz.png +0 -0
  193. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-10.html +41 -0
  194. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-11.html +34 -0
  195. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-2.html +722 -0
  196. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-20.html +38 -0
  197. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-22.html +34 -0
  198. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-28.html +34 -0
  199. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-30.html +41 -0
  200. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-31.html +46 -0
  201. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-38.html +45 -0
  202. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-39.html +34 -0
  203. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-41.html +34 -0
  204. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-42.html +38 -0
  205. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-5.html +56 -0
  206. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-7.html +191 -0
  207. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-0-9-8.html +34 -0
  208. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-1-0-5.html +42 -0
  209. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-1-1-2.html +38 -0
  210. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-1-1-3.html +49 -0
  211. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-full.html +226 -58
  212. data/vendor/local/share/gtk-doc/html/harfbuzz/building.html +80 -0
  213. data/vendor/local/share/gtk-doc/html/harfbuzz/{ch06.html → ch07.html} +8 -2
  214. data/vendor/local/share/gtk-doc/html/harfbuzz/deprecated-api-index.html +13 -2
  215. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-Buffers.html +2738 -0
  216. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-Shaping.html +20 -22
  217. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html +38 -38
  218. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html +287 -189
  219. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html +2 -2
  220. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html +2 -2
  221. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html +38 -38
  222. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html +403 -126
  223. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html +85 -10
  224. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html +17 -2
  225. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html +172 -2
  226. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html +2 -2
  227. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html +2 -2
  228. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-font.html +76 -0
  229. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html +43 -3
  230. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-shape.html +80 -0
  231. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-tag.html +6 -6
  232. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot.html +2 -2
  233. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html +39 -39
  234. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html +21 -21
  235. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html +51 -46
  236. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html +2 -2
  237. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html +11 -11
  238. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb.html +4 -4
  239. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2 +262 -190
  240. data/vendor/local/share/gtk-doc/html/harfbuzz/hello-harfbuzz.html +2 -2
  241. data/vendor/local/share/gtk-doc/html/harfbuzz/index.html +61 -7
  242. data/vendor/local/share/gtk-doc/html/harfbuzz/install-harfbuzz.html +59 -0
  243. data/vendor/local/share/gtk-doc/html/harfbuzz/object-tree.html +9 -8
  244. data/vendor/local/share/gtk-doc/html/harfbuzz/pt01.html +5 -0
  245. data/vendor/local/share/gtk-doc/html/harfbuzz/pt02.html +37 -6
  246. data/vendor/local/share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html +2 -2
  247. data/vendor/local/share/gtk-doc/html/pango/PangoEngineLang.html +22 -19
  248. data/vendor/local/share/gtk-doc/html/pango/PangoEngineShape.html +15 -12
  249. data/vendor/local/share/gtk-doc/html/pango/PangoFcDecoder.html +9 -12
  250. data/vendor/local/share/gtk-doc/html/pango/PangoFcFont.html +29 -35
  251. data/vendor/local/share/gtk-doc/html/pango/PangoFcFontMap.html +206 -97
  252. data/vendor/local/share/gtk-doc/html/pango/PangoMarkupFormat.html +33 -8
  253. data/vendor/local/share/gtk-doc/html/pango/PangoRenderer.html +150 -57
  254. data/vendor/local/share/gtk-doc/html/pango/annotation-glossary.html +12 -4
  255. data/vendor/local/share/gtk-doc/html/pango/api-index-1-10.html +3 -4
  256. data/vendor/local/share/gtk-doc/html/pango/api-index-1-12.html +3 -4
  257. data/vendor/local/share/gtk-doc/html/pango/api-index-1-14.html +3 -4
  258. data/vendor/local/share/gtk-doc/html/pango/api-index-1-16.html +3 -4
  259. data/vendor/local/share/gtk-doc/html/pango/api-index-1-18.html +3 -4
  260. data/vendor/local/share/gtk-doc/html/pango/api-index-1-2.html +3 -4
  261. data/vendor/local/share/gtk-doc/html/pango/api-index-1-20.html +3 -4
  262. data/vendor/local/share/gtk-doc/html/pango/api-index-1-22.html +3 -4
  263. data/vendor/local/share/gtk-doc/html/pango/api-index-1-24.html +3 -4
  264. data/vendor/local/share/gtk-doc/html/pango/api-index-1-26.html +3 -4
  265. data/vendor/local/share/gtk-doc/html/pango/api-index-1-30.html +4 -5
  266. data/vendor/local/share/gtk-doc/html/pango/api-index-1-31-0.html +4 -5
  267. data/vendor/local/share/gtk-doc/html/pango/api-index-1-32-4.html +5 -6
  268. data/vendor/local/share/gtk-doc/html/pango/api-index-1-32.html +5 -6
  269. data/vendor/local/share/gtk-doc/html/pango/api-index-1-34.html +7 -7
  270. data/vendor/local/share/gtk-doc/html/pango/api-index-1-38.html +79 -0
  271. data/vendor/local/share/gtk-doc/html/pango/api-index-1-4.html +3 -4
  272. data/vendor/local/share/gtk-doc/html/pango/{tools.html → api-index-1-40.html} +9 -13
  273. data/vendor/local/share/gtk-doc/html/pango/api-index-1-6.html +3 -4
  274. data/vendor/local/share/gtk-doc/html/pango/api-index-1-8.html +3 -4
  275. data/vendor/local/share/gtk-doc/html/pango/api-index-deprecated.html +161 -4
  276. data/vendor/local/share/gtk-doc/html/pango/api-index-full.html +51 -8
  277. data/vendor/local/share/gtk-doc/html/pango/index.html +8 -11
  278. data/vendor/local/share/gtk-doc/html/pango/index.sgml +251 -4
  279. data/vendor/local/share/gtk-doc/html/pango/lowlevel.html +3 -4
  280. data/vendor/local/share/gtk-doc/html/pango/pango-Bidirectional-Text.html +18 -23
  281. data/vendor/local/share/gtk-doc/html/pango/pango-Cairo-Rendering.html +121 -123
  282. data/vendor/local/share/gtk-doc/html/pango/pango-CoreText-Fonts.html +5 -7
  283. data/vendor/local/share/gtk-doc/html/pango/pango-Coverage-Maps.html +10 -14
  284. data/vendor/local/share/gtk-doc/html/pango/pango-Engines.html +28 -37
  285. data/vendor/local/share/gtk-doc/html/pango/pango-Fonts.html +170 -224
  286. data/vendor/local/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html +35 -38
  287. data/vendor/local/share/gtk-doc/html/pango/pango-Glyph-Storage.html +257 -170
  288. data/vendor/local/share/gtk-doc/html/pango/pango-Layout-Objects.html +186 -214
  289. data/vendor/local/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html +117 -132
  290. data/vendor/local/share/gtk-doc/html/pango/pango-Modules.html +26 -41
  291. data/vendor/local/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html +140 -153
  292. data/vendor/local/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html +270 -75
  293. data/vendor/local/share/gtk-doc/html/pango/pango-Tab-Stops.html +28 -34
  294. data/vendor/local/share/gtk-doc/html/pango/pango-Text-Attributes.html +361 -203
  295. data/vendor/local/share/gtk-doc/html/pango/pango-Text-Processing.html +194 -161
  296. data/vendor/local/share/gtk-doc/html/pango/pango-Version-Checking.html +16 -19
  297. data/vendor/local/share/gtk-doc/html/pango/pango-Vertical-Text.html +21 -28
  298. data/vendor/local/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html +34 -48
  299. data/vendor/local/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html +52 -57
  300. data/vendor/local/share/gtk-doc/html/pango/pango-hierarchy.html +10 -11
  301. data/vendor/local/share/gtk-doc/html/pango/pango.devhelp2 +285 -39
  302. data/vendor/local/share/gtk-doc/html/pango/pango.html +3 -4
  303. data/vendor/local/share/gtk-doc/html/pango/rendering.html +3 -4
  304. data/vendor/local/share/gtk-doc/html/pango/style.css +9 -6
  305. data/vendor/local/share/icu/57.1/LICENSE +393 -0
  306. data/vendor/local/share/icu/{55.1 → 57.1}/config/mh-mingw +0 -0
  307. data/vendor/local/share/icu/{55.1 → 57.1}/install-sh +0 -0
  308. data/vendor/local/share/icu/{55.1 → 57.1}/mkinstalldirs +0 -0
  309. data/vendor/local/share/man/man1/derb.1 +2 -2
  310. data/vendor/local/share/man/man1/genbrk.1 +2 -2
  311. data/vendor/local/share/man/man1/gencfu.1 +1 -1
  312. data/vendor/local/share/man/man1/gencnval.1 +3 -3
  313. data/vendor/local/share/man/man1/gendict.1 +2 -2
  314. data/vendor/local/share/man/man1/genrb.1 +3 -3
  315. data/vendor/local/share/man/man1/icu-config.1 +2 -2
  316. data/vendor/local/share/man/man1/makeconv.1 +3 -3
  317. data/vendor/local/share/man/man1/pango-view.1 +113 -1
  318. data/vendor/local/share/man/man1/pkgdata.1 +2 -2
  319. data/vendor/local/share/man/man1/uconv.1 +2 -2
  320. data/vendor/local/share/man/man8/genccode.8 +2 -2
  321. data/vendor/local/share/man/man8/gencmn.8 +3 -3
  322. data/vendor/local/share/man/man8/gensprep.8 +3 -3
  323. data/vendor/local/share/man/man8/icupkg.8 +1 -1
  324. metadata +49 -40
  325. data/lib/2.0/pango.so +0 -0
  326. data/lib/2.1/pango.so +0 -0
  327. data/vendor/local/bin/pango-querymodules.exe +0 -0
  328. data/vendor/local/etc/pango/pango.modules +0 -19
  329. data/vendor/local/lib/icuin55.dll +0 -0
  330. data/vendor/local/lib/icuio55.dll +0 -0
  331. data/vendor/local/lib/icule55.dll +0 -0
  332. data/vendor/local/lib/iculx55.dll +0 -0
  333. data/vendor/local/lib/icutest55.dll +0 -0
  334. data/vendor/local/lib/icutu55.dll +0 -0
  335. data/vendor/local/lib/icuuc55.dll +0 -0
  336. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.dll +0 -0
  337. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.dll.a +0 -0
  338. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.la +0 -41
  339. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.dll +0 -0
  340. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.dll.a +0 -0
  341. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.la +0 -41
  342. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.dll +0 -0
  343. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.dll.a +0 -0
  344. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.la +0 -41
  345. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.dll +0 -0
  346. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.dll.a +0 -0
  347. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.la +0 -41
  348. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html +0 -1704
  349. data/vendor/local/share/gtk-doc/html/pango/pango-querymodules.html +0 -131
  350. data/vendor/local/share/icu/55.1/license.html +0 -384
  351. data/vendor/local/share/man/man1/pango-querymodules.1 +0 -106
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  ******************************************************************************
3
- * Copyright (C) 2010-2014, International Business Machines Corporation and
3
+ * Copyright (C) 2010-2016, International Business Machines Corporation and
4
4
  * others. All Rights Reserved.
5
5
  ******************************************************************************
6
6
  */
@@ -30,7 +30,7 @@ U_NAMESPACE_BEGIN
30
30
  * values, see Locale.
31
31
  * @stable ICU 4.4
32
32
  */
33
- class U_I18N_API LocaleDisplayNames : public UObject {
33
+ class U_COMMON_API LocaleDisplayNames : public UObject {
34
34
  public:
35
35
  /**
36
36
  * Destructor.
@@ -493,7 +493,6 @@ public:
493
493
  */
494
494
  uint32_t getLCID(void) const;
495
495
 
496
- #ifndef U_HIDE_DRAFT_API
497
496
  /**
498
497
  * Returns whether this locale's script is written right-to-left.
499
498
  * If there is no script subtag, then the likely script is used, see uloc_addLikelySubtags().
@@ -505,10 +504,9 @@ public:
505
504
  * Returns TRUE for "ar" and "en-Hebr", FALSE for "zh" and "fa-Cyrl".
506
505
  *
507
506
  * @return TRUE if the locale's script is written right-to-left
508
- * @draft ICU 54
507
+ * @stable ICU 54
509
508
  */
510
509
  UBool isRightToLeft() const;
511
- #endif /* U_HIDE_DRAFT_API */
512
510
 
513
511
  /**
514
512
  * Fills in "dispLang" with the name of this locale's language in a format suitable for
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  **********************************************************************
3
- * Copyright (c) 2004-2015, International Business Machines
3
+ * Copyright (c) 2004-2016, International Business Machines
4
4
  * Corporation and others. All Rights Reserved.
5
5
  **********************************************************************
6
6
  * Author: Alan Liu
@@ -78,7 +78,7 @@ class MeasureFormatCacheData;
78
78
  class SharedNumberFormat;
79
79
  class SharedPluralRules;
80
80
  class QuantityFormatter;
81
- class SimplePatternFormatter;
81
+ class SimpleFormatter;
82
82
  class ListFormatter;
83
83
  class DateFormat;
84
84
 
@@ -186,7 +186,6 @@ class U_I18N_API MeasureFormat : public Format {
186
186
  FieldPosition &pos,
187
187
  UErrorCode &status) const;
188
188
 
189
- #ifndef U_HIDE_DRAFT_API
190
189
  /**
191
190
  * Formats a single measure per unit. An example of such a
192
191
  * formatted string is 3.5 meters per second.
@@ -198,7 +197,7 @@ class U_I18N_API MeasureFormat : public Format {
198
197
  * @param status the error.
199
198
  * @return appendTo reference
200
199
  *
201
- * @draft ICU 55
200
+ * @stable ICU 55
202
201
  */
203
202
  UnicodeString &formatMeasurePerUnit(
204
203
  const Measure &measure,
@@ -207,7 +206,6 @@ class U_I18N_API MeasureFormat : public Format {
207
206
  FieldPosition &pos,
208
207
  UErrorCode &status) const;
209
208
 
210
- #endif /* U_HIDE_DRAFT_API */
211
209
 
212
210
  /**
213
211
  * Return a formatter for CurrencyAmount objects in the given
@@ -327,17 +325,19 @@ class U_I18N_API MeasureFormat : public Format {
327
325
  // shared across instances.
328
326
  ListFormatter *listFormatter;
329
327
 
330
- const QuantityFormatter *getQuantityFormatter(
331
- int32_t index,
332
- int32_t widthIndex,
333
- UErrorCode &status) const;
328
+ const SimpleFormatter *getFormatterOrNull(
329
+ const MeasureUnit &unit, UMeasureFormatWidth width, int32_t index) const;
330
+
331
+ const SimpleFormatter *getFormatter(
332
+ const MeasureUnit &unit, UMeasureFormatWidth width, int32_t index,
333
+ UErrorCode &errorCode) const;
334
334
 
335
- const SimplePatternFormatter *getPerUnitFormatter(
336
- int32_t index,
337
- int32_t widthIndex) const;
335
+ const SimpleFormatter *getPluralFormatter(
336
+ const MeasureUnit &unit, UMeasureFormatWidth width, int32_t index,
337
+ UErrorCode &errorCode) const;
338
338
 
339
- const SimplePatternFormatter *getPerFormatter(
340
- int32_t widthIndex,
339
+ const SimpleFormatter *getPerFormatter(
340
+ UMeasureFormatWidth width,
341
341
  UErrorCode &status) const;
342
342
 
343
343
  int32_t withPerUnitAndAppend(
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  **********************************************************************
3
- * Copyright (c) 2004-2015, International Business Machines
3
+ * Copyright (c) 2004-2016, International Business Machines
4
4
  * Corporation and others. All Rights Reserved.
5
5
  **********************************************************************
6
6
  * Author: Alan Liu
@@ -183,6 +183,14 @@ class U_I18N_API MeasureUnit: public UObject {
183
183
  */
184
184
  static int32_t getIndexCount();
185
185
 
186
+ /**
187
+ * ICU use only.
188
+ * @return the unit.getIndex() of the unit which has this unit.getType() and unit.getSubtype(),
189
+ * or a negative value if there is no such unit
190
+ * @internal
191
+ */
192
+ static int32_t internalGetIndexForTypeAndSubtype(const char *type, const char *subtype);
193
+
186
194
  /**
187
195
  * ICU use only.
188
196
  * @internal
@@ -207,16 +215,14 @@ class U_I18N_API MeasureUnit: public UObject {
207
215
  */
208
216
  static MeasureUnit *createGForce(UErrorCode &status);
209
217
 
210
- #ifndef U_HIDE_DRAFT_API
211
218
  /**
212
219
  * Returns unit of acceleration: meter-per-second-squared.
213
220
  * Caller owns returned value and must free it.
214
221
  * @param status ICU error code.
215
- * @draft ICU 54
222
+ * @stable ICU 54
216
223
  */
217
224
  static MeasureUnit *createMeterPerSecondSquared(UErrorCode &status);
218
225
 
219
- #endif /* U_HIDE_DRAFT_API */
220
226
  /**
221
227
  * Returns unit of angle: arc-minute.
222
228
  * Caller owns returned value and must free it.
@@ -241,16 +247,24 @@ class U_I18N_API MeasureUnit: public UObject {
241
247
  */
242
248
  static MeasureUnit *createDegree(UErrorCode &status);
243
249
 
244
- #ifndef U_HIDE_DRAFT_API
245
250
  /**
246
251
  * Returns unit of angle: radian.
247
252
  * Caller owns returned value and must free it.
248
253
  * @param status ICU error code.
249
- * @draft ICU 54
254
+ * @stable ICU 54
250
255
  */
251
256
  static MeasureUnit *createRadian(UErrorCode &status);
252
257
 
253
- #endif /* U_HIDE_DRAFT_API */
258
+ #ifndef U_HIDE_DRAFT_API
259
+ /**
260
+ * Returns unit of angle: revolution.
261
+ * Caller owns returned value and must free it.
262
+ * @param status ICU error code.
263
+ * @draft ICU 56
264
+ */
265
+ static MeasureUnit *createRevolutionAngle(UErrorCode &status);
266
+ #endif /* U_HIDE_DRAFT_API */
267
+
254
268
  /**
255
269
  * Returns unit of area: acre.
256
270
  * Caller owns returned value and must free it.
@@ -267,16 +281,14 @@ class U_I18N_API MeasureUnit: public UObject {
267
281
  */
268
282
  static MeasureUnit *createHectare(UErrorCode &status);
269
283
 
270
- #ifndef U_HIDE_DRAFT_API
271
284
  /**
272
285
  * Returns unit of area: square-centimeter.
273
286
  * Caller owns returned value and must free it.
274
287
  * @param status ICU error code.
275
- * @draft ICU 54
288
+ * @stable ICU 54
276
289
  */
277
290
  static MeasureUnit *createSquareCentimeter(UErrorCode &status);
278
291
 
279
- #endif /* U_HIDE_DRAFT_API */
280
292
  /**
281
293
  * Returns unit of area: square-foot.
282
294
  * Caller owns returned value and must free it.
@@ -285,16 +297,14 @@ class U_I18N_API MeasureUnit: public UObject {
285
297
  */
286
298
  static MeasureUnit *createSquareFoot(UErrorCode &status);
287
299
 
288
- #ifndef U_HIDE_DRAFT_API
289
300
  /**
290
301
  * Returns unit of area: square-inch.
291
302
  * Caller owns returned value and must free it.
292
303
  * @param status ICU error code.
293
- * @draft ICU 54
304
+ * @stable ICU 54
294
305
  */
295
306
  static MeasureUnit *createSquareInch(UErrorCode &status);
296
307
 
297
- #endif /* U_HIDE_DRAFT_API */
298
308
  /**
299
309
  * Returns unit of area: square-kilometer.
300
310
  * Caller owns returned value and must free it.
@@ -319,136 +329,178 @@ class U_I18N_API MeasureUnit: public UObject {
319
329
  */
320
330
  static MeasureUnit *createSquareMile(UErrorCode &status);
321
331
 
322
- #ifndef U_HIDE_DRAFT_API
323
332
  /**
324
333
  * Returns unit of area: square-yard.
325
334
  * Caller owns returned value and must free it.
326
335
  * @param status ICU error code.
327
- * @draft ICU 54
336
+ * @stable ICU 54
328
337
  */
329
338
  static MeasureUnit *createSquareYard(UErrorCode &status);
330
339
 
331
- #endif /* U_HIDE_DRAFT_API */
340
+ /**
341
+ * Returns unit of concentr: karat.
342
+ * Caller owns returned value and must free it.
343
+ * @param status ICU error code.
344
+ * @stable ICU 54
345
+ */
346
+ static MeasureUnit *createKarat(UErrorCode &status);
347
+
348
+ #ifndef U_HIDE_DRAFT_API
349
+ /**
350
+ * Returns unit of concentr: milligram-per-deciliter.
351
+ * Caller owns returned value and must free it.
352
+ * @param status ICU error code.
353
+ * @draft ICU 57
354
+ */
355
+ static MeasureUnit *createMilligramPerDeciliter(UErrorCode &status);
356
+ #endif /* U_HIDE_DRAFT_API */
357
+
332
358
  #ifndef U_HIDE_DRAFT_API
359
+ /**
360
+ * Returns unit of concentr: millimole-per-liter.
361
+ * Caller owns returned value and must free it.
362
+ * @param status ICU error code.
363
+ * @draft ICU 57
364
+ */
365
+ static MeasureUnit *createMillimolePerLiter(UErrorCode &status);
366
+ #endif /* U_HIDE_DRAFT_API */
367
+
368
+ #ifndef U_HIDE_DRAFT_API
369
+ /**
370
+ * Returns unit of concentr: part-per-million.
371
+ * Caller owns returned value and must free it.
372
+ * @param status ICU error code.
373
+ * @draft ICU 57
374
+ */
375
+ static MeasureUnit *createPartPerMillion(UErrorCode &status);
376
+ #endif /* U_HIDE_DRAFT_API */
377
+
378
+ #ifndef U_HIDE_DRAFT_API
379
+ /**
380
+ * Returns unit of consumption: liter-per-100kilometers.
381
+ * Caller owns returned value and must free it.
382
+ * @param status ICU error code.
383
+ * @draft ICU 56
384
+ */
385
+ static MeasureUnit *createLiterPer100Kilometers(UErrorCode &status);
386
+ #endif /* U_HIDE_DRAFT_API */
387
+
333
388
  /**
334
389
  * Returns unit of consumption: liter-per-kilometer.
335
390
  * Caller owns returned value and must free it.
336
391
  * @param status ICU error code.
337
- * @draft ICU 54
392
+ * @stable ICU 54
338
393
  */
339
394
  static MeasureUnit *createLiterPerKilometer(UErrorCode &status);
340
395
 
341
- #endif /* U_HIDE_DRAFT_API */
342
- #ifndef U_HIDE_DRAFT_API
343
396
  /**
344
397
  * Returns unit of consumption: mile-per-gallon.
345
398
  * Caller owns returned value and must free it.
346
399
  * @param status ICU error code.
347
- * @draft ICU 54
400
+ * @stable ICU 54
348
401
  */
349
402
  static MeasureUnit *createMilePerGallon(UErrorCode &status);
350
403
 
351
- #endif /* U_HIDE_DRAFT_API */
352
404
  #ifndef U_HIDE_DRAFT_API
405
+ /**
406
+ * Returns unit of consumption: mile-per-gallon-imperial.
407
+ * Caller owns returned value and must free it.
408
+ * @param status ICU error code.
409
+ * @draft ICU 57
410
+ */
411
+ static MeasureUnit *createMilePerGallonImperial(UErrorCode &status);
412
+ #endif /* U_HIDE_DRAFT_API */
413
+
353
414
  /**
354
415
  * Returns unit of digital: bit.
355
416
  * Caller owns returned value and must free it.
356
417
  * @param status ICU error code.
357
- * @draft ICU 54
418
+ * @stable ICU 54
358
419
  */
359
420
  static MeasureUnit *createBit(UErrorCode &status);
360
421
 
361
- #endif /* U_HIDE_DRAFT_API */
362
- #ifndef U_HIDE_DRAFT_API
363
422
  /**
364
423
  * Returns unit of digital: byte.
365
424
  * Caller owns returned value and must free it.
366
425
  * @param status ICU error code.
367
- * @draft ICU 54
426
+ * @stable ICU 54
368
427
  */
369
428
  static MeasureUnit *createByte(UErrorCode &status);
370
429
 
371
- #endif /* U_HIDE_DRAFT_API */
372
- #ifndef U_HIDE_DRAFT_API
373
430
  /**
374
431
  * Returns unit of digital: gigabit.
375
432
  * Caller owns returned value and must free it.
376
433
  * @param status ICU error code.
377
- * @draft ICU 54
434
+ * @stable ICU 54
378
435
  */
379
436
  static MeasureUnit *createGigabit(UErrorCode &status);
380
437
 
381
- #endif /* U_HIDE_DRAFT_API */
382
- #ifndef U_HIDE_DRAFT_API
383
438
  /**
384
439
  * Returns unit of digital: gigabyte.
385
440
  * Caller owns returned value and must free it.
386
441
  * @param status ICU error code.
387
- * @draft ICU 54
442
+ * @stable ICU 54
388
443
  */
389
444
  static MeasureUnit *createGigabyte(UErrorCode &status);
390
445
 
391
- #endif /* U_HIDE_DRAFT_API */
392
- #ifndef U_HIDE_DRAFT_API
393
446
  /**
394
447
  * Returns unit of digital: kilobit.
395
448
  * Caller owns returned value and must free it.
396
449
  * @param status ICU error code.
397
- * @draft ICU 54
450
+ * @stable ICU 54
398
451
  */
399
452
  static MeasureUnit *createKilobit(UErrorCode &status);
400
453
 
401
- #endif /* U_HIDE_DRAFT_API */
402
- #ifndef U_HIDE_DRAFT_API
403
454
  /**
404
455
  * Returns unit of digital: kilobyte.
405
456
  * Caller owns returned value and must free it.
406
457
  * @param status ICU error code.
407
- * @draft ICU 54
458
+ * @stable ICU 54
408
459
  */
409
460
  static MeasureUnit *createKilobyte(UErrorCode &status);
410
461
 
411
- #endif /* U_HIDE_DRAFT_API */
412
- #ifndef U_HIDE_DRAFT_API
413
462
  /**
414
463
  * Returns unit of digital: megabit.
415
464
  * Caller owns returned value and must free it.
416
465
  * @param status ICU error code.
417
- * @draft ICU 54
466
+ * @stable ICU 54
418
467
  */
419
468
  static MeasureUnit *createMegabit(UErrorCode &status);
420
469
 
421
- #endif /* U_HIDE_DRAFT_API */
422
- #ifndef U_HIDE_DRAFT_API
423
470
  /**
424
471
  * Returns unit of digital: megabyte.
425
472
  * Caller owns returned value and must free it.
426
473
  * @param status ICU error code.
427
- * @draft ICU 54
474
+ * @stable ICU 54
428
475
  */
429
476
  static MeasureUnit *createMegabyte(UErrorCode &status);
430
477
 
431
- #endif /* U_HIDE_DRAFT_API */
432
- #ifndef U_HIDE_DRAFT_API
433
478
  /**
434
479
  * Returns unit of digital: terabit.
435
480
  * Caller owns returned value and must free it.
436
481
  * @param status ICU error code.
437
- * @draft ICU 54
482
+ * @stable ICU 54
438
483
  */
439
484
  static MeasureUnit *createTerabit(UErrorCode &status);
440
485
 
441
- #endif /* U_HIDE_DRAFT_API */
442
- #ifndef U_HIDE_DRAFT_API
443
486
  /**
444
487
  * Returns unit of digital: terabyte.
445
488
  * Caller owns returned value and must free it.
446
489
  * @param status ICU error code.
447
- * @draft ICU 54
490
+ * @stable ICU 54
448
491
  */
449
492
  static MeasureUnit *createTerabyte(UErrorCode &status);
450
493
 
451
- #endif /* U_HIDE_DRAFT_API */
494
+ #ifndef U_HIDE_DRAFT_API
495
+ /**
496
+ * Returns unit of duration: century.
497
+ * Caller owns returned value and must free it.
498
+ * @param status ICU error code.
499
+ * @draft ICU 56
500
+ */
501
+ static MeasureUnit *createCentury(UErrorCode &status);
502
+ #endif /* U_HIDE_DRAFT_API */
503
+
452
504
  /**
453
505
  * Returns unit of duration: day.
454
506
  * Caller owns returned value and must free it.
@@ -465,16 +517,14 @@ class U_I18N_API MeasureUnit: public UObject {
465
517
  */
466
518
  static MeasureUnit *createHour(UErrorCode &status);
467
519
 
468
- #ifndef U_HIDE_DRAFT_API
469
520
  /**
470
521
  * Returns unit of duration: microsecond.
471
522
  * Caller owns returned value and must free it.
472
523
  * @param status ICU error code.
473
- * @draft ICU 54
524
+ * @stable ICU 54
474
525
  */
475
526
  static MeasureUnit *createMicrosecond(UErrorCode &status);
476
527
 
477
- #endif /* U_HIDE_DRAFT_API */
478
528
  /**
479
529
  * Returns unit of duration: millisecond.
480
530
  * Caller owns returned value and must free it.
@@ -499,16 +549,14 @@ class U_I18N_API MeasureUnit: public UObject {
499
549
  */
500
550
  static MeasureUnit *createMonth(UErrorCode &status);
501
551
 
502
- #ifndef U_HIDE_DRAFT_API
503
552
  /**
504
553
  * Returns unit of duration: nanosecond.
505
554
  * Caller owns returned value and must free it.
506
555
  * @param status ICU error code.
507
- * @draft ICU 54
556
+ * @stable ICU 54
508
557
  */
509
558
  static MeasureUnit *createNanosecond(UErrorCode &status);
510
559
 
511
- #endif /* U_HIDE_DRAFT_API */
512
560
  /**
513
561
  * Returns unit of duration: second.
514
562
  * Caller owns returned value and must free it.
@@ -533,156 +581,126 @@ class U_I18N_API MeasureUnit: public UObject {
533
581
  */
534
582
  static MeasureUnit *createYear(UErrorCode &status);
535
583
 
536
- #ifndef U_HIDE_DRAFT_API
537
584
  /**
538
585
  * Returns unit of electric: ampere.
539
586
  * Caller owns returned value and must free it.
540
587
  * @param status ICU error code.
541
- * @draft ICU 54
588
+ * @stable ICU 54
542
589
  */
543
590
  static MeasureUnit *createAmpere(UErrorCode &status);
544
591
 
545
- #endif /* U_HIDE_DRAFT_API */
546
- #ifndef U_HIDE_DRAFT_API
547
592
  /**
548
593
  * Returns unit of electric: milliampere.
549
594
  * Caller owns returned value and must free it.
550
595
  * @param status ICU error code.
551
- * @draft ICU 54
596
+ * @stable ICU 54
552
597
  */
553
598
  static MeasureUnit *createMilliampere(UErrorCode &status);
554
599
 
555
- #endif /* U_HIDE_DRAFT_API */
556
- #ifndef U_HIDE_DRAFT_API
557
600
  /**
558
601
  * Returns unit of electric: ohm.
559
602
  * Caller owns returned value and must free it.
560
603
  * @param status ICU error code.
561
- * @draft ICU 54
604
+ * @stable ICU 54
562
605
  */
563
606
  static MeasureUnit *createOhm(UErrorCode &status);
564
607
 
565
- #endif /* U_HIDE_DRAFT_API */
566
- #ifndef U_HIDE_DRAFT_API
567
608
  /**
568
609
  * Returns unit of electric: volt.
569
610
  * Caller owns returned value and must free it.
570
611
  * @param status ICU error code.
571
- * @draft ICU 54
612
+ * @stable ICU 54
572
613
  */
573
614
  static MeasureUnit *createVolt(UErrorCode &status);
574
615
 
575
- #endif /* U_HIDE_DRAFT_API */
576
- #ifndef U_HIDE_DRAFT_API
577
616
  /**
578
617
  * Returns unit of energy: calorie.
579
618
  * Caller owns returned value and must free it.
580
619
  * @param status ICU error code.
581
- * @draft ICU 54
620
+ * @stable ICU 54
582
621
  */
583
622
  static MeasureUnit *createCalorie(UErrorCode &status);
584
623
 
585
- #endif /* U_HIDE_DRAFT_API */
586
- #ifndef U_HIDE_DRAFT_API
587
624
  /**
588
625
  * Returns unit of energy: foodcalorie.
589
626
  * Caller owns returned value and must free it.
590
627
  * @param status ICU error code.
591
- * @draft ICU 54
628
+ * @stable ICU 54
592
629
  */
593
630
  static MeasureUnit *createFoodcalorie(UErrorCode &status);
594
631
 
595
- #endif /* U_HIDE_DRAFT_API */
596
- #ifndef U_HIDE_DRAFT_API
597
632
  /**
598
633
  * Returns unit of energy: joule.
599
634
  * Caller owns returned value and must free it.
600
635
  * @param status ICU error code.
601
- * @draft ICU 54
636
+ * @stable ICU 54
602
637
  */
603
638
  static MeasureUnit *createJoule(UErrorCode &status);
604
639
 
605
- #endif /* U_HIDE_DRAFT_API */
606
- #ifndef U_HIDE_DRAFT_API
607
640
  /**
608
641
  * Returns unit of energy: kilocalorie.
609
642
  * Caller owns returned value and must free it.
610
643
  * @param status ICU error code.
611
- * @draft ICU 54
644
+ * @stable ICU 54
612
645
  */
613
646
  static MeasureUnit *createKilocalorie(UErrorCode &status);
614
647
 
615
- #endif /* U_HIDE_DRAFT_API */
616
- #ifndef U_HIDE_DRAFT_API
617
648
  /**
618
649
  * Returns unit of energy: kilojoule.
619
650
  * Caller owns returned value and must free it.
620
651
  * @param status ICU error code.
621
- * @draft ICU 54
652
+ * @stable ICU 54
622
653
  */
623
654
  static MeasureUnit *createKilojoule(UErrorCode &status);
624
655
 
625
- #endif /* U_HIDE_DRAFT_API */
626
- #ifndef U_HIDE_DRAFT_API
627
656
  /**
628
657
  * Returns unit of energy: kilowatt-hour.
629
658
  * Caller owns returned value and must free it.
630
659
  * @param status ICU error code.
631
- * @draft ICU 54
660
+ * @stable ICU 54
632
661
  */
633
662
  static MeasureUnit *createKilowattHour(UErrorCode &status);
634
663
 
635
- #endif /* U_HIDE_DRAFT_API */
636
- #ifndef U_HIDE_DRAFT_API
637
664
  /**
638
665
  * Returns unit of frequency: gigahertz.
639
666
  * Caller owns returned value and must free it.
640
667
  * @param status ICU error code.
641
- * @draft ICU 54
668
+ * @stable ICU 54
642
669
  */
643
670
  static MeasureUnit *createGigahertz(UErrorCode &status);
644
671
 
645
- #endif /* U_HIDE_DRAFT_API */
646
- #ifndef U_HIDE_DRAFT_API
647
672
  /**
648
673
  * Returns unit of frequency: hertz.
649
674
  * Caller owns returned value and must free it.
650
675
  * @param status ICU error code.
651
- * @draft ICU 54
676
+ * @stable ICU 54
652
677
  */
653
678
  static MeasureUnit *createHertz(UErrorCode &status);
654
679
 
655
- #endif /* U_HIDE_DRAFT_API */
656
- #ifndef U_HIDE_DRAFT_API
657
680
  /**
658
681
  * Returns unit of frequency: kilohertz.
659
682
  * Caller owns returned value and must free it.
660
683
  * @param status ICU error code.
661
- * @draft ICU 54
684
+ * @stable ICU 54
662
685
  */
663
686
  static MeasureUnit *createKilohertz(UErrorCode &status);
664
687
 
665
- #endif /* U_HIDE_DRAFT_API */
666
- #ifndef U_HIDE_DRAFT_API
667
688
  /**
668
689
  * Returns unit of frequency: megahertz.
669
690
  * Caller owns returned value and must free it.
670
691
  * @param status ICU error code.
671
- * @draft ICU 54
692
+ * @stable ICU 54
672
693
  */
673
694
  static MeasureUnit *createMegahertz(UErrorCode &status);
674
695
 
675
- #endif /* U_HIDE_DRAFT_API */
676
- #ifndef U_HIDE_DRAFT_API
677
696
  /**
678
697
  * Returns unit of length: astronomical-unit.
679
698
  * Caller owns returned value and must free it.
680
699
  * @param status ICU error code.
681
- * @draft ICU 54
700
+ * @stable ICU 54
682
701
  */
683
702
  static MeasureUnit *createAstronomicalUnit(UErrorCode &status);
684
703
 
685
- #endif /* U_HIDE_DRAFT_API */
686
704
  /**
687
705
  * Returns unit of length: centimeter.
688
706
  * Caller owns returned value and must free it.
@@ -691,26 +709,22 @@ class U_I18N_API MeasureUnit: public UObject {
691
709
  */
692
710
  static MeasureUnit *createCentimeter(UErrorCode &status);
693
711
 
694
- #ifndef U_HIDE_DRAFT_API
695
712
  /**
696
713
  * Returns unit of length: decimeter.
697
714
  * Caller owns returned value and must free it.
698
715
  * @param status ICU error code.
699
- * @draft ICU 54
716
+ * @stable ICU 54
700
717
  */
701
718
  static MeasureUnit *createDecimeter(UErrorCode &status);
702
719
 
703
- #endif /* U_HIDE_DRAFT_API */
704
- #ifndef U_HIDE_DRAFT_API
705
720
  /**
706
721
  * Returns unit of length: fathom.
707
722
  * Caller owns returned value and must free it.
708
723
  * @param status ICU error code.
709
- * @draft ICU 54
724
+ * @stable ICU 54
710
725
  */
711
726
  static MeasureUnit *createFathom(UErrorCode &status);
712
727
 
713
- #endif /* U_HIDE_DRAFT_API */
714
728
  /**
715
729
  * Returns unit of length: foot.
716
730
  * Caller owns returned value and must free it.
@@ -719,16 +733,14 @@ class U_I18N_API MeasureUnit: public UObject {
719
733
  */
720
734
  static MeasureUnit *createFoot(UErrorCode &status);
721
735
 
722
- #ifndef U_HIDE_DRAFT_API
723
736
  /**
724
737
  * Returns unit of length: furlong.
725
738
  * Caller owns returned value and must free it.
726
739
  * @param status ICU error code.
727
- * @draft ICU 54
740
+ * @stable ICU 54
728
741
  */
729
742
  static MeasureUnit *createFurlong(UErrorCode &status);
730
743
 
731
- #endif /* U_HIDE_DRAFT_API */
732
744
  /**
733
745
  * Returns unit of length: inch.
734
746
  * Caller owns returned value and must free it.
@@ -761,16 +773,14 @@ class U_I18N_API MeasureUnit: public UObject {
761
773
  */
762
774
  static MeasureUnit *createMeter(UErrorCode &status);
763
775
 
764
- #ifndef U_HIDE_DRAFT_API
765
776
  /**
766
777
  * Returns unit of length: micrometer.
767
778
  * Caller owns returned value and must free it.
768
779
  * @param status ICU error code.
769
- * @draft ICU 54
780
+ * @stable ICU 54
770
781
  */
771
782
  static MeasureUnit *createMicrometer(UErrorCode &status);
772
783
 
773
- #endif /* U_HIDE_DRAFT_API */
774
784
  /**
775
785
  * Returns unit of length: mile.
776
786
  * Caller owns returned value and must free it.
@@ -779,6 +789,16 @@ class U_I18N_API MeasureUnit: public UObject {
779
789
  */
780
790
  static MeasureUnit *createMile(UErrorCode &status);
781
791
 
792
+ #ifndef U_HIDE_DRAFT_API
793
+ /**
794
+ * Returns unit of length: mile-scandinavian.
795
+ * Caller owns returned value and must free it.
796
+ * @param status ICU error code.
797
+ * @draft ICU 56
798
+ */
799
+ static MeasureUnit *createMileScandinavian(UErrorCode &status);
800
+ #endif /* U_HIDE_DRAFT_API */
801
+
782
802
  /**
783
803
  * Returns unit of length: millimeter.
784
804
  * Caller owns returned value and must free it.
@@ -787,36 +807,30 @@ class U_I18N_API MeasureUnit: public UObject {
787
807
  */
788
808
  static MeasureUnit *createMillimeter(UErrorCode &status);
789
809
 
790
- #ifndef U_HIDE_DRAFT_API
791
810
  /**
792
811
  * Returns unit of length: nanometer.
793
812
  * Caller owns returned value and must free it.
794
813
  * @param status ICU error code.
795
- * @draft ICU 54
814
+ * @stable ICU 54
796
815
  */
797
816
  static MeasureUnit *createNanometer(UErrorCode &status);
798
817
 
799
- #endif /* U_HIDE_DRAFT_API */
800
- #ifndef U_HIDE_DRAFT_API
801
818
  /**
802
819
  * Returns unit of length: nautical-mile.
803
820
  * Caller owns returned value and must free it.
804
821
  * @param status ICU error code.
805
- * @draft ICU 54
822
+ * @stable ICU 54
806
823
  */
807
824
  static MeasureUnit *createNauticalMile(UErrorCode &status);
808
825
 
809
- #endif /* U_HIDE_DRAFT_API */
810
- #ifndef U_HIDE_DRAFT_API
811
826
  /**
812
827
  * Returns unit of length: parsec.
813
828
  * Caller owns returned value and must free it.
814
829
  * @param status ICU error code.
815
- * @draft ICU 54
830
+ * @stable ICU 54
816
831
  */
817
832
  static MeasureUnit *createParsec(UErrorCode &status);
818
833
 
819
- #endif /* U_HIDE_DRAFT_API */
820
834
  /**
821
835
  * Returns unit of length: picometer.
822
836
  * Caller owns returned value and must free it.
@@ -833,26 +847,22 @@ class U_I18N_API MeasureUnit: public UObject {
833
847
  */
834
848
  static MeasureUnit *createYard(UErrorCode &status);
835
849
 
836
- #ifndef U_HIDE_DRAFT_API
837
850
  /**
838
851
  * Returns unit of light: lux.
839
852
  * Caller owns returned value and must free it.
840
853
  * @param status ICU error code.
841
- * @draft ICU 54
854
+ * @stable ICU 54
842
855
  */
843
856
  static MeasureUnit *createLux(UErrorCode &status);
844
857
 
845
- #endif /* U_HIDE_DRAFT_API */
846
- #ifndef U_HIDE_DRAFT_API
847
858
  /**
848
859
  * Returns unit of mass: carat.
849
860
  * Caller owns returned value and must free it.
850
861
  * @param status ICU error code.
851
- * @draft ICU 54
862
+ * @stable ICU 54
852
863
  */
853
864
  static MeasureUnit *createCarat(UErrorCode &status);
854
865
 
855
- #endif /* U_HIDE_DRAFT_API */
856
866
  /**
857
867
  * Returns unit of mass: gram.
858
868
  * Caller owns returned value and must free it.
@@ -869,36 +879,30 @@ class U_I18N_API MeasureUnit: public UObject {
869
879
  */
870
880
  static MeasureUnit *createKilogram(UErrorCode &status);
871
881
 
872
- #ifndef U_HIDE_DRAFT_API
873
882
  /**
874
883
  * Returns unit of mass: metric-ton.
875
884
  * Caller owns returned value and must free it.
876
885
  * @param status ICU error code.
877
- * @draft ICU 54
886
+ * @stable ICU 54
878
887
  */
879
888
  static MeasureUnit *createMetricTon(UErrorCode &status);
880
889
 
881
- #endif /* U_HIDE_DRAFT_API */
882
- #ifndef U_HIDE_DRAFT_API
883
890
  /**
884
891
  * Returns unit of mass: microgram.
885
892
  * Caller owns returned value and must free it.
886
893
  * @param status ICU error code.
887
- * @draft ICU 54
894
+ * @stable ICU 54
888
895
  */
889
896
  static MeasureUnit *createMicrogram(UErrorCode &status);
890
897
 
891
- #endif /* U_HIDE_DRAFT_API */
892
- #ifndef U_HIDE_DRAFT_API
893
898
  /**
894
899
  * Returns unit of mass: milligram.
895
900
  * Caller owns returned value and must free it.
896
901
  * @param status ICU error code.
897
- * @draft ICU 54
902
+ * @stable ICU 54
898
903
  */
899
904
  static MeasureUnit *createMilligram(UErrorCode &status);
900
905
 
901
- #endif /* U_HIDE_DRAFT_API */
902
906
  /**
903
907
  * Returns unit of mass: ounce.
904
908
  * Caller owns returned value and must free it.
@@ -907,16 +911,14 @@ class U_I18N_API MeasureUnit: public UObject {
907
911
  */
908
912
  static MeasureUnit *createOunce(UErrorCode &status);
909
913
 
910
- #ifndef U_HIDE_DRAFT_API
911
914
  /**
912
915
  * Returns unit of mass: ounce-troy.
913
916
  * Caller owns returned value and must free it.
914
917
  * @param status ICU error code.
915
- * @draft ICU 54
918
+ * @stable ICU 54
916
919
  */
917
920
  static MeasureUnit *createOunceTroy(UErrorCode &status);
918
921
 
919
- #endif /* U_HIDE_DRAFT_API */
920
922
  /**
921
923
  * Returns unit of mass: pound.
922
924
  * Caller owns returned value and must free it.
@@ -925,36 +927,30 @@ class U_I18N_API MeasureUnit: public UObject {
925
927
  */
926
928
  static MeasureUnit *createPound(UErrorCode &status);
927
929
 
928
- #ifndef U_HIDE_DRAFT_API
929
930
  /**
930
931
  * Returns unit of mass: stone.
931
932
  * Caller owns returned value and must free it.
932
933
  * @param status ICU error code.
933
- * @draft ICU 54
934
+ * @stable ICU 54
934
935
  */
935
936
  static MeasureUnit *createStone(UErrorCode &status);
936
937
 
937
- #endif /* U_HIDE_DRAFT_API */
938
- #ifndef U_HIDE_DRAFT_API
939
938
  /**
940
939
  * Returns unit of mass: ton.
941
940
  * Caller owns returned value and must free it.
942
941
  * @param status ICU error code.
943
- * @draft ICU 54
942
+ * @stable ICU 54
944
943
  */
945
944
  static MeasureUnit *createTon(UErrorCode &status);
946
945
 
947
- #endif /* U_HIDE_DRAFT_API */
948
- #ifndef U_HIDE_DRAFT_API
949
946
  /**
950
947
  * Returns unit of power: gigawatt.
951
948
  * Caller owns returned value and must free it.
952
949
  * @param status ICU error code.
953
- * @draft ICU 54
950
+ * @stable ICU 54
954
951
  */
955
952
  static MeasureUnit *createGigawatt(UErrorCode &status);
956
953
 
957
- #endif /* U_HIDE_DRAFT_API */
958
954
  /**
959
955
  * Returns unit of power: horsepower.
960
956
  * Caller owns returned value and must free it.
@@ -971,26 +967,22 @@ class U_I18N_API MeasureUnit: public UObject {
971
967
  */
972
968
  static MeasureUnit *createKilowatt(UErrorCode &status);
973
969
 
974
- #ifndef U_HIDE_DRAFT_API
975
970
  /**
976
971
  * Returns unit of power: megawatt.
977
972
  * Caller owns returned value and must free it.
978
973
  * @param status ICU error code.
979
- * @draft ICU 54
974
+ * @stable ICU 54
980
975
  */
981
976
  static MeasureUnit *createMegawatt(UErrorCode &status);
982
977
 
983
- #endif /* U_HIDE_DRAFT_API */
984
- #ifndef U_HIDE_DRAFT_API
985
978
  /**
986
979
  * Returns unit of power: milliwatt.
987
980
  * Caller owns returned value and must free it.
988
981
  * @param status ICU error code.
989
- * @draft ICU 54
982
+ * @stable ICU 54
990
983
  */
991
984
  static MeasureUnit *createMilliwatt(UErrorCode &status);
992
985
 
993
- #endif /* U_HIDE_DRAFT_API */
994
986
  /**
995
987
  * Returns unit of power: watt.
996
988
  * Caller owns returned value and must free it.
@@ -1023,43 +1015,39 @@ class U_I18N_API MeasureUnit: public UObject {
1023
1015
  */
1024
1016
  static MeasureUnit *createMillibar(UErrorCode &status);
1025
1017
 
1026
- #ifndef U_HIDE_DRAFT_API
1027
1018
  /**
1028
1019
  * Returns unit of pressure: millimeter-of-mercury.
1029
1020
  * Caller owns returned value and must free it.
1030
1021
  * @param status ICU error code.
1031
- * @draft ICU 54
1022
+ * @stable ICU 54
1032
1023
  */
1033
1024
  static MeasureUnit *createMillimeterOfMercury(UErrorCode &status);
1034
1025
 
1035
- #endif /* U_HIDE_DRAFT_API */
1036
- #ifndef U_HIDE_DRAFT_API
1037
1026
  /**
1038
1027
  * Returns unit of pressure: pound-per-square-inch.
1039
1028
  * Caller owns returned value and must free it.
1040
1029
  * @param status ICU error code.
1041
- * @draft ICU 54
1030
+ * @stable ICU 54
1042
1031
  */
1043
1032
  static MeasureUnit *createPoundPerSquareInch(UErrorCode &status);
1044
1033
 
1045
- #endif /* U_HIDE_DRAFT_API */
1046
- #ifndef U_HIDE_DRAFT_API
1047
1034
  /**
1048
- * Returns unit of proportion: karat.
1035
+ * Returns unit of speed: kilometer-per-hour.
1049
1036
  * Caller owns returned value and must free it.
1050
1037
  * @param status ICU error code.
1051
- * @draft ICU 54
1038
+ * @stable ICU 53
1052
1039
  */
1053
- static MeasureUnit *createKarat(UErrorCode &status);
1040
+ static MeasureUnit *createKilometerPerHour(UErrorCode &status);
1054
1041
 
1055
- #endif /* U_HIDE_DRAFT_API */
1042
+ #ifndef U_HIDE_DRAFT_API
1056
1043
  /**
1057
- * Returns unit of speed: kilometer-per-hour.
1044
+ * Returns unit of speed: knot.
1058
1045
  * Caller owns returned value and must free it.
1059
1046
  * @param status ICU error code.
1060
- * @stable ICU 53
1047
+ * @draft ICU 56
1061
1048
  */
1062
- static MeasureUnit *createKilometerPerHour(UErrorCode &status);
1049
+ static MeasureUnit *createKnot(UErrorCode &status);
1050
+ #endif /* U_HIDE_DRAFT_API */
1063
1051
 
1064
1052
  /**
1065
1053
  * Returns unit of speed: meter-per-second.
@@ -1094,75 +1082,71 @@ class U_I18N_API MeasureUnit: public UObject {
1094
1082
  static MeasureUnit *createFahrenheit(UErrorCode &status);
1095
1083
 
1096
1084
  #ifndef U_HIDE_DRAFT_API
1085
+ /**
1086
+ * Returns unit of temperature: generic.
1087
+ * Caller owns returned value and must free it.
1088
+ * @param status ICU error code.
1089
+ * @draft ICU 56
1090
+ */
1091
+ static MeasureUnit *createGenericTemperature(UErrorCode &status);
1092
+ #endif /* U_HIDE_DRAFT_API */
1093
+
1097
1094
  /**
1098
1095
  * Returns unit of temperature: kelvin.
1099
1096
  * Caller owns returned value and must free it.
1100
1097
  * @param status ICU error code.
1101
- * @draft ICU 54
1098
+ * @stable ICU 54
1102
1099
  */
1103
1100
  static MeasureUnit *createKelvin(UErrorCode &status);
1104
1101
 
1105
- #endif /* U_HIDE_DRAFT_API */
1106
- #ifndef U_HIDE_DRAFT_API
1107
1102
  /**
1108
1103
  * Returns unit of volume: acre-foot.
1109
1104
  * Caller owns returned value and must free it.
1110
1105
  * @param status ICU error code.
1111
- * @draft ICU 54
1106
+ * @stable ICU 54
1112
1107
  */
1113
1108
  static MeasureUnit *createAcreFoot(UErrorCode &status);
1114
1109
 
1115
- #endif /* U_HIDE_DRAFT_API */
1116
- #ifndef U_HIDE_DRAFT_API
1117
1110
  /**
1118
1111
  * Returns unit of volume: bushel.
1119
1112
  * Caller owns returned value and must free it.
1120
1113
  * @param status ICU error code.
1121
- * @draft ICU 54
1114
+ * @stable ICU 54
1122
1115
  */
1123
1116
  static MeasureUnit *createBushel(UErrorCode &status);
1124
1117
 
1125
- #endif /* U_HIDE_DRAFT_API */
1126
- #ifndef U_HIDE_DRAFT_API
1127
1118
  /**
1128
1119
  * Returns unit of volume: centiliter.
1129
1120
  * Caller owns returned value and must free it.
1130
1121
  * @param status ICU error code.
1131
- * @draft ICU 54
1122
+ * @stable ICU 54
1132
1123
  */
1133
1124
  static MeasureUnit *createCentiliter(UErrorCode &status);
1134
1125
 
1135
- #endif /* U_HIDE_DRAFT_API */
1136
- #ifndef U_HIDE_DRAFT_API
1137
1126
  /**
1138
1127
  * Returns unit of volume: cubic-centimeter.
1139
1128
  * Caller owns returned value and must free it.
1140
1129
  * @param status ICU error code.
1141
- * @draft ICU 54
1130
+ * @stable ICU 54
1142
1131
  */
1143
1132
  static MeasureUnit *createCubicCentimeter(UErrorCode &status);
1144
1133
 
1145
- #endif /* U_HIDE_DRAFT_API */
1146
- #ifndef U_HIDE_DRAFT_API
1147
1134
  /**
1148
1135
  * Returns unit of volume: cubic-foot.
1149
1136
  * Caller owns returned value and must free it.
1150
1137
  * @param status ICU error code.
1151
- * @draft ICU 54
1138
+ * @stable ICU 54
1152
1139
  */
1153
1140
  static MeasureUnit *createCubicFoot(UErrorCode &status);
1154
1141
 
1155
- #endif /* U_HIDE_DRAFT_API */
1156
- #ifndef U_HIDE_DRAFT_API
1157
1142
  /**
1158
1143
  * Returns unit of volume: cubic-inch.
1159
1144
  * Caller owns returned value and must free it.
1160
1145
  * @param status ICU error code.
1161
- * @draft ICU 54
1146
+ * @stable ICU 54
1162
1147
  */
1163
1148
  static MeasureUnit *createCubicInch(UErrorCode &status);
1164
1149
 
1165
- #endif /* U_HIDE_DRAFT_API */
1166
1150
  /**
1167
1151
  * Returns unit of volume: cubic-kilometer.
1168
1152
  * Caller owns returned value and must free it.
@@ -1171,16 +1155,14 @@ class U_I18N_API MeasureUnit: public UObject {
1171
1155
  */
1172
1156
  static MeasureUnit *createCubicKilometer(UErrorCode &status);
1173
1157
 
1174
- #ifndef U_HIDE_DRAFT_API
1175
1158
  /**
1176
1159
  * Returns unit of volume: cubic-meter.
1177
1160
  * Caller owns returned value and must free it.
1178
1161
  * @param status ICU error code.
1179
- * @draft ICU 54
1162
+ * @stable ICU 54
1180
1163
  */
1181
1164
  static MeasureUnit *createCubicMeter(UErrorCode &status);
1182
1165
 
1183
- #endif /* U_HIDE_DRAFT_API */
1184
1166
  /**
1185
1167
  * Returns unit of volume: cubic-mile.
1186
1168
  * Caller owns returned value and must free it.
@@ -1189,66 +1171,74 @@ class U_I18N_API MeasureUnit: public UObject {
1189
1171
  */
1190
1172
  static MeasureUnit *createCubicMile(UErrorCode &status);
1191
1173
 
1192
- #ifndef U_HIDE_DRAFT_API
1193
1174
  /**
1194
1175
  * Returns unit of volume: cubic-yard.
1195
1176
  * Caller owns returned value and must free it.
1196
1177
  * @param status ICU error code.
1197
- * @draft ICU 54
1178
+ * @stable ICU 54
1198
1179
  */
1199
1180
  static MeasureUnit *createCubicYard(UErrorCode &status);
1200
1181
 
1201
- #endif /* U_HIDE_DRAFT_API */
1202
- #ifndef U_HIDE_DRAFT_API
1203
1182
  /**
1204
1183
  * Returns unit of volume: cup.
1205
1184
  * Caller owns returned value and must free it.
1206
1185
  * @param status ICU error code.
1207
- * @draft ICU 54
1186
+ * @stable ICU 54
1208
1187
  */
1209
1188
  static MeasureUnit *createCup(UErrorCode &status);
1210
1189
 
1211
- #endif /* U_HIDE_DRAFT_API */
1212
1190
  #ifndef U_HIDE_DRAFT_API
1191
+ /**
1192
+ * Returns unit of volume: cup-metric.
1193
+ * Caller owns returned value and must free it.
1194
+ * @param status ICU error code.
1195
+ * @draft ICU 56
1196
+ */
1197
+ static MeasureUnit *createCupMetric(UErrorCode &status);
1198
+ #endif /* U_HIDE_DRAFT_API */
1199
+
1213
1200
  /**
1214
1201
  * Returns unit of volume: deciliter.
1215
1202
  * Caller owns returned value and must free it.
1216
1203
  * @param status ICU error code.
1217
- * @draft ICU 54
1204
+ * @stable ICU 54
1218
1205
  */
1219
1206
  static MeasureUnit *createDeciliter(UErrorCode &status);
1220
1207
 
1221
- #endif /* U_HIDE_DRAFT_API */
1222
- #ifndef U_HIDE_DRAFT_API
1223
1208
  /**
1224
1209
  * Returns unit of volume: fluid-ounce.
1225
1210
  * Caller owns returned value and must free it.
1226
1211
  * @param status ICU error code.
1227
- * @draft ICU 54
1212
+ * @stable ICU 54
1228
1213
  */
1229
1214
  static MeasureUnit *createFluidOunce(UErrorCode &status);
1230
1215
 
1231
- #endif /* U_HIDE_DRAFT_API */
1232
- #ifndef U_HIDE_DRAFT_API
1233
1216
  /**
1234
1217
  * Returns unit of volume: gallon.
1235
1218
  * Caller owns returned value and must free it.
1236
1219
  * @param status ICU error code.
1237
- * @draft ICU 54
1220
+ * @stable ICU 54
1238
1221
  */
1239
1222
  static MeasureUnit *createGallon(UErrorCode &status);
1240
1223
 
1241
- #endif /* U_HIDE_DRAFT_API */
1242
1224
  #ifndef U_HIDE_DRAFT_API
1225
+ /**
1226
+ * Returns unit of volume: gallon-imperial.
1227
+ * Caller owns returned value and must free it.
1228
+ * @param status ICU error code.
1229
+ * @draft ICU 57
1230
+ */
1231
+ static MeasureUnit *createGallonImperial(UErrorCode &status);
1232
+ #endif /* U_HIDE_DRAFT_API */
1233
+
1243
1234
  /**
1244
1235
  * Returns unit of volume: hectoliter.
1245
1236
  * Caller owns returned value and must free it.
1246
1237
  * @param status ICU error code.
1247
- * @draft ICU 54
1238
+ * @stable ICU 54
1248
1239
  */
1249
1240
  static MeasureUnit *createHectoliter(UErrorCode &status);
1250
1241
 
1251
- #endif /* U_HIDE_DRAFT_API */
1252
1242
  /**
1253
1243
  * Returns unit of volume: liter.
1254
1244
  * Caller owns returned value and must free it.
@@ -1257,66 +1247,64 @@ class U_I18N_API MeasureUnit: public UObject {
1257
1247
  */
1258
1248
  static MeasureUnit *createLiter(UErrorCode &status);
1259
1249
 
1260
- #ifndef U_HIDE_DRAFT_API
1261
1250
  /**
1262
1251
  * Returns unit of volume: megaliter.
1263
1252
  * Caller owns returned value and must free it.
1264
1253
  * @param status ICU error code.
1265
- * @draft ICU 54
1254
+ * @stable ICU 54
1266
1255
  */
1267
1256
  static MeasureUnit *createMegaliter(UErrorCode &status);
1268
1257
 
1269
- #endif /* U_HIDE_DRAFT_API */
1270
- #ifndef U_HIDE_DRAFT_API
1271
1258
  /**
1272
1259
  * Returns unit of volume: milliliter.
1273
1260
  * Caller owns returned value and must free it.
1274
1261
  * @param status ICU error code.
1275
- * @draft ICU 54
1262
+ * @stable ICU 54
1276
1263
  */
1277
1264
  static MeasureUnit *createMilliliter(UErrorCode &status);
1278
1265
 
1279
- #endif /* U_HIDE_DRAFT_API */
1280
- #ifndef U_HIDE_DRAFT_API
1281
1266
  /**
1282
1267
  * Returns unit of volume: pint.
1283
1268
  * Caller owns returned value and must free it.
1284
1269
  * @param status ICU error code.
1285
- * @draft ICU 54
1270
+ * @stable ICU 54
1286
1271
  */
1287
1272
  static MeasureUnit *createPint(UErrorCode &status);
1288
1273
 
1289
- #endif /* U_HIDE_DRAFT_API */
1290
1274
  #ifndef U_HIDE_DRAFT_API
1275
+ /**
1276
+ * Returns unit of volume: pint-metric.
1277
+ * Caller owns returned value and must free it.
1278
+ * @param status ICU error code.
1279
+ * @draft ICU 56
1280
+ */
1281
+ static MeasureUnit *createPintMetric(UErrorCode &status);
1282
+ #endif /* U_HIDE_DRAFT_API */
1283
+
1291
1284
  /**
1292
1285
  * Returns unit of volume: quart.
1293
1286
  * Caller owns returned value and must free it.
1294
1287
  * @param status ICU error code.
1295
- * @draft ICU 54
1288
+ * @stable ICU 54
1296
1289
  */
1297
1290
  static MeasureUnit *createQuart(UErrorCode &status);
1298
1291
 
1299
- #endif /* U_HIDE_DRAFT_API */
1300
- #ifndef U_HIDE_DRAFT_API
1301
1292
  /**
1302
1293
  * Returns unit of volume: tablespoon.
1303
1294
  * Caller owns returned value and must free it.
1304
1295
  * @param status ICU error code.
1305
- * @draft ICU 54
1296
+ * @stable ICU 54
1306
1297
  */
1307
1298
  static MeasureUnit *createTablespoon(UErrorCode &status);
1308
1299
 
1309
- #endif /* U_HIDE_DRAFT_API */
1310
- #ifndef U_HIDE_DRAFT_API
1311
1300
  /**
1312
1301
  * Returns unit of volume: teaspoon.
1313
1302
  * Caller owns returned value and must free it.
1314
1303
  * @param status ICU error code.
1315
- * @draft ICU 54
1304
+ * @stable ICU 54
1316
1305
  */
1317
1306
  static MeasureUnit *createTeaspoon(UErrorCode &status);
1318
1307
 
1319
- #endif /* U_HIDE_DRAFT_API */
1320
1308
 
1321
1309
  // End generated createXXX methods
1322
1310