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) 2014, International Business Machines
3
+ * Copyright (c) 2014-2016, International Business Machines
4
4
  * Corporation and others. All Rights Reserved.
5
5
  **********************************************************************
6
6
  */
@@ -11,7 +11,6 @@
11
11
 
12
12
  #if !UCONFIG_NO_FORMATTING
13
13
 
14
- #ifndef U_HIDE_DRAFT_API
15
14
 
16
15
  #include "unicode/unistr.h"
17
16
 
@@ -45,7 +44,7 @@ class Formattable;
45
44
  * fmt->format(1.23456e-78, appendTo, status);
46
45
  * </pre>
47
46
  *
48
- * @draft ICU 55
47
+ * @stable ICU 55
49
48
  */
50
49
  class U_I18N_API ScientificNumberFormatter : public UObject {
51
50
  public:
@@ -58,7 +57,7 @@ public:
58
57
  * @param status error returned here.
59
58
  * @return The new ScientificNumberFormatter instance.
60
59
  *
61
- * @draft ICU 55
60
+ * @stable ICU 55
62
61
  */
63
62
  static ScientificNumberFormatter *createSuperscriptInstance(
64
63
  DecimalFormat *fmtToAdopt, UErrorCode &status);
@@ -70,7 +69,7 @@ public:
70
69
  * @param status error returned here.
71
70
  * @return The ScientificNumberFormatter instance.
72
71
  *
73
- * @draft ICU 55
72
+ * @stable ICU 55
74
73
  */
75
74
  static ScientificNumberFormatter *createSuperscriptInstance(
76
75
  const Locale &locale, UErrorCode &status);
@@ -86,7 +85,7 @@ public:
86
85
  * @param status error returned here.
87
86
  * @return The new ScientificNumberFormatter instance.
88
87
  *
89
- * @draft ICU 55
88
+ * @stable ICU 55
90
89
  */
91
90
  static ScientificNumberFormatter *createMarkupInstance(
92
91
  DecimalFormat *fmtToAdopt,
@@ -103,7 +102,7 @@ public:
103
102
  * @param status error returned here.
104
103
  * @return The ScientificNumberFormatter instance.
105
104
  *
106
- * @draft ICU 55
105
+ * @stable ICU 55
107
106
  */
108
107
  static ScientificNumberFormatter *createMarkupInstance(
109
108
  const Locale &locale,
@@ -114,7 +113,7 @@ public:
114
113
 
115
114
  /**
116
115
  * Returns a copy of this object. Caller must free returned copy.
117
- * @draft ICU 55
116
+ * @stable ICU 55
118
117
  */
119
118
  ScientificNumberFormatter *clone() const {
120
119
  return new ScientificNumberFormatter(*this);
@@ -122,7 +121,7 @@ public:
122
121
 
123
122
  /**
124
123
  * Destructor.
125
- * @draft ICU 55
124
+ * @stable ICU 55
126
125
  */
127
126
  virtual ~ScientificNumberFormatter();
128
127
 
@@ -134,7 +133,7 @@ public:
134
133
  * @param status any error returned here.
135
134
  * @return appendTo
136
135
  *
137
- * @draft ICU 55
136
+ * @stable ICU 55
138
137
  */
139
138
  UnicodeString &format(
140
139
  const Formattable &number,
@@ -216,7 +215,6 @@ public:
216
215
 
217
216
  U_NAMESPACE_END
218
217
 
219
- #endif /* U_HIDE_DRAFT_API */
220
218
 
221
219
  #endif /* !UCONFIG_NO_FORMATTING */
222
220
  #endif
@@ -0,0 +1,295 @@
1
+ /*
2
+ ******************************************************************************
3
+ * Copyright (C) 2014-2016, International Business Machines
4
+ * Corporation and others. All Rights Reserved.
5
+ ******************************************************************************
6
+ * simpleformatter.h
7
+ */
8
+
9
+ #ifndef __SIMPLEFORMATTER_H__
10
+ #define __SIMPLEFORMATTER_H__
11
+
12
+ /**
13
+ * \file
14
+ * \brief C++ API: Simple formatter, minimal subset of MessageFormat.
15
+ */
16
+
17
+ #include "unicode/utypes.h"
18
+ #include "unicode/unistr.h"
19
+
20
+ #ifndef U_HIDE_DRAFT_API
21
+
22
+ U_NAMESPACE_BEGIN
23
+
24
+ /**
25
+ * Formats simple patterns like "{1} was born in {0}".
26
+ * Minimal subset of MessageFormat; fast, simple, minimal dependencies.
27
+ * Supports only numbered arguments with no type nor style parameters,
28
+ * and formats only string values.
29
+ * Quoting via ASCII apostrophe compatible with ICU MessageFormat default behavior.
30
+ *
31
+ * Factory methods set error codes for syntax errors
32
+ * and for too few or too many arguments/placeholders.
33
+ *
34
+ * SimpleFormatter objects are thread-safe except for assignment and applying new patterns.
35
+ *
36
+ * Example:
37
+ * <pre>
38
+ * UErrorCode errorCode = U_ZERO_ERROR;
39
+ * SimpleFormatter fmt("{1} '{born}' in {0}", errorCode);
40
+ * UnicodeString result;
41
+ *
42
+ * // Output: "paul {born} in england"
43
+ * fmt.format("england", "paul", result, errorCode);
44
+ * </pre>
45
+ *
46
+ * This class is not intended for public subclassing.
47
+ *
48
+ * @see MessageFormat
49
+ * @see UMessagePatternApostropheMode
50
+ * @draft ICU 57
51
+ */
52
+ class U_COMMON_API SimpleFormatter U_FINAL : public UMemory {
53
+ public:
54
+ /**
55
+ * Default constructor.
56
+ * @draft ICU 57
57
+ */
58
+ SimpleFormatter() : compiledPattern((UChar)0) {}
59
+
60
+ /**
61
+ * Constructs a formatter from the pattern string.
62
+ *
63
+ * @param pattern The pattern string.
64
+ * @param errorCode ICU error code in/out parameter.
65
+ * Must fulfill U_SUCCESS before the function call.
66
+ * Set to U_ILLEGAL_ARGUMENT_ERROR for bad argument syntax.
67
+ * @draft ICU 57
68
+ */
69
+ SimpleFormatter(const UnicodeString& pattern, UErrorCode &errorCode) {
70
+ applyPattern(pattern, errorCode);
71
+ }
72
+
73
+ /**
74
+ * Constructs a formatter from the pattern string.
75
+ * The number of arguments checked against the given limits is the
76
+ * highest argument number plus one, not the number of occurrences of arguments.
77
+ *
78
+ * @param pattern The pattern string.
79
+ * @param min The pattern must have at least this many arguments.
80
+ * @param max The pattern must have at most this many arguments.
81
+ * @param errorCode ICU error code in/out parameter.
82
+ * Must fulfill U_SUCCESS before the function call.
83
+ * Set to U_ILLEGAL_ARGUMENT_ERROR for bad argument syntax and
84
+ * too few or too many arguments.
85
+ * @draft ICU 57
86
+ */
87
+ SimpleFormatter(const UnicodeString& pattern, int32_t min, int32_t max,
88
+ UErrorCode &errorCode) {
89
+ applyPatternMinMaxArguments(pattern, min, max, errorCode);
90
+ }
91
+
92
+ /**
93
+ * Copy constructor.
94
+ * @draft ICU 57
95
+ */
96
+ SimpleFormatter(const SimpleFormatter& other)
97
+ : compiledPattern(other.compiledPattern) {}
98
+
99
+ /**
100
+ * Assignment operator.
101
+ * @draft ICU 57
102
+ */
103
+ SimpleFormatter &operator=(const SimpleFormatter& other);
104
+
105
+ /**
106
+ * Destructor.
107
+ * @draft ICU 57
108
+ */
109
+ ~SimpleFormatter();
110
+
111
+ /**
112
+ * Changes this object according to the new pattern.
113
+ *
114
+ * @param pattern The pattern string.
115
+ * @param errorCode ICU error code in/out parameter.
116
+ * Must fulfill U_SUCCESS before the function call.
117
+ * Set to U_ILLEGAL_ARGUMENT_ERROR for bad argument syntax.
118
+ * @return TRUE if U_SUCCESS(errorCode).
119
+ * @draft ICU 57
120
+ */
121
+ UBool applyPattern(const UnicodeString &pattern, UErrorCode &errorCode) {
122
+ return applyPatternMinMaxArguments(pattern, 0, INT32_MAX, errorCode);
123
+ }
124
+
125
+ /**
126
+ * Changes this object according to the new pattern.
127
+ * The number of arguments checked against the given limits is the
128
+ * highest argument number plus one, not the number of occurrences of arguments.
129
+ *
130
+ * @param pattern The pattern string.
131
+ * @param min The pattern must have at least this many arguments.
132
+ * @param max The pattern must have at most this many arguments.
133
+ * @param errorCode ICU error code in/out parameter.
134
+ * Must fulfill U_SUCCESS before the function call.
135
+ * Set to U_ILLEGAL_ARGUMENT_ERROR for bad argument syntax and
136
+ * too few or too many arguments.
137
+ * @return TRUE if U_SUCCESS(errorCode).
138
+ * @draft ICU 57
139
+ */
140
+ UBool applyPatternMinMaxArguments(const UnicodeString &pattern,
141
+ int32_t min, int32_t max, UErrorCode &errorCode);
142
+
143
+ /**
144
+ * @return The max argument number + 1.
145
+ * @draft ICU 57
146
+ */
147
+ int32_t getArgumentLimit() const {
148
+ return getArgumentLimit(compiledPattern.getBuffer(), compiledPattern.length());
149
+ }
150
+
151
+ /**
152
+ * Formats the given value, appending to the appendTo builder.
153
+ * The argument value must not be the same object as appendTo.
154
+ * getArgumentLimit() must be at most 1.
155
+ *
156
+ * @param value0 Value for argument {0}.
157
+ * @param appendTo Gets the formatted pattern and value appended.
158
+ * @param errorCode ICU error code in/out parameter.
159
+ * Must fulfill U_SUCCESS before the function call.
160
+ * @return appendTo
161
+ * @draft ICU 57
162
+ */
163
+ UnicodeString &format(
164
+ const UnicodeString &value0,
165
+ UnicodeString &appendTo, UErrorCode &errorCode) const;
166
+
167
+ /**
168
+ * Formats the given values, appending to the appendTo builder.
169
+ * An argument value must not be the same object as appendTo.
170
+ * getArgumentLimit() must be at most 2.
171
+ *
172
+ * @param value0 Value for argument {0}.
173
+ * @param value1 Value for argument {1}.
174
+ * @param appendTo Gets the formatted pattern and values appended.
175
+ * @param errorCode ICU error code in/out parameter.
176
+ * Must fulfill U_SUCCESS before the function call.
177
+ * @return appendTo
178
+ * @draft ICU 57
179
+ */
180
+ UnicodeString &format(
181
+ const UnicodeString &value0,
182
+ const UnicodeString &value1,
183
+ UnicodeString &appendTo, UErrorCode &errorCode) const;
184
+
185
+ /**
186
+ * Formats the given values, appending to the appendTo builder.
187
+ * An argument value must not be the same object as appendTo.
188
+ * getArgumentLimit() must be at most 3.
189
+ *
190
+ * @param value0 Value for argument {0}.
191
+ * @param value1 Value for argument {1}.
192
+ * @param value2 Value for argument {2}.
193
+ * @param appendTo Gets the formatted pattern and values appended.
194
+ * @param errorCode ICU error code in/out parameter.
195
+ * Must fulfill U_SUCCESS before the function call.
196
+ * @return appendTo
197
+ * @draft ICU 57
198
+ */
199
+ UnicodeString &format(
200
+ const UnicodeString &value0,
201
+ const UnicodeString &value1,
202
+ const UnicodeString &value2,
203
+ UnicodeString &appendTo, UErrorCode &errorCode) const;
204
+
205
+ /**
206
+ * Formats the given values, appending to the appendTo string.
207
+ *
208
+ * @param values The argument values.
209
+ * An argument value must not be the same object as appendTo.
210
+ * Can be NULL if valuesLength==getArgumentLimit()==0.
211
+ * @param valuesLength The length of the values array.
212
+ * Must be at least getArgumentLimit().
213
+ * @param appendTo Gets the formatted pattern and values appended.
214
+ * @param offsets offsets[i] receives the offset of where
215
+ * values[i] replaced pattern argument {i}.
216
+ * Can be shorter or longer than values. Can be NULL if offsetsLength==0.
217
+ * If there is no {i} in the pattern, then offsets[i] is set to -1.
218
+ * @param offsetsLength The length of the offsets array.
219
+ * @param errorCode ICU error code in/out parameter.
220
+ * Must fulfill U_SUCCESS before the function call.
221
+ * @return appendTo
222
+ * @draft ICU 57
223
+ */
224
+ UnicodeString &formatAndAppend(
225
+ const UnicodeString *const *values, int32_t valuesLength,
226
+ UnicodeString &appendTo,
227
+ int32_t *offsets, int32_t offsetsLength, UErrorCode &errorCode) const;
228
+
229
+ /**
230
+ * Formats the given values, replacing the contents of the result string.
231
+ * May optimize by actually appending to the result if it is the same object
232
+ * as the value corresponding to the initial argument in the pattern.
233
+ *
234
+ * @param values The argument values.
235
+ * An argument value may be the same object as result.
236
+ * Can be NULL if valuesLength==getArgumentLimit()==0.
237
+ * @param valuesLength The length of the values array.
238
+ * Must be at least getArgumentLimit().
239
+ * @param result Gets its contents replaced by the formatted pattern and values.
240
+ * @param offsets offsets[i] receives the offset of where
241
+ * values[i] replaced pattern argument {i}.
242
+ * Can be shorter or longer than values. Can be NULL if offsetsLength==0.
243
+ * If there is no {i} in the pattern, then offsets[i] is set to -1.
244
+ * @param offsetsLength The length of the offsets array.
245
+ * @param errorCode ICU error code in/out parameter.
246
+ * Must fulfill U_SUCCESS before the function call.
247
+ * @return result
248
+ * @draft ICU 57
249
+ */
250
+ UnicodeString &formatAndReplace(
251
+ const UnicodeString *const *values, int32_t valuesLength,
252
+ UnicodeString &result,
253
+ int32_t *offsets, int32_t offsetsLength, UErrorCode &errorCode) const;
254
+
255
+ /**
256
+ * Returns the pattern text with none of the arguments.
257
+ * Like formatting with all-empty string values.
258
+ * @draft ICU 57
259
+ */
260
+ UnicodeString getTextWithNoArguments() const {
261
+ return getTextWithNoArguments(compiledPattern.getBuffer(), compiledPattern.length());
262
+ }
263
+
264
+ private:
265
+ /**
266
+ * Binary representation of the compiled pattern.
267
+ * Index 0: One more than the highest argument number.
268
+ * Followed by zero or more arguments or literal-text segments.
269
+ *
270
+ * An argument is stored as its number, less than ARG_NUM_LIMIT.
271
+ * A literal-text segment is stored as its length (at least 1) offset by ARG_NUM_LIMIT,
272
+ * followed by that many chars.
273
+ */
274
+ UnicodeString compiledPattern;
275
+
276
+ static inline int32_t getArgumentLimit(const UChar *compiledPattern,
277
+ int32_t compiledPatternLength) {
278
+ return compiledPatternLength == 0 ? 0 : compiledPattern[0];
279
+ }
280
+
281
+ static UnicodeString getTextWithNoArguments(const UChar *compiledPattern, int32_t compiledPatternLength);
282
+
283
+ static UnicodeString &format(
284
+ const UChar *compiledPattern, int32_t compiledPatternLength,
285
+ const UnicodeString *const *values,
286
+ UnicodeString &result, const UnicodeString *resultCopy, UBool forbidResultAsValue,
287
+ int32_t *offsets, int32_t offsetsLength,
288
+ UErrorCode &errorCode);
289
+ };
290
+
291
+ U_NAMESPACE_END
292
+
293
+ #endif /* U_HIDE_DRAFT_API */
294
+
295
+ #endif // __SIMPLEFORMATTER_H__
@@ -1,5 +1,5 @@
1
1
  /*
2
- * Copyright (C) 1997-2015, International Business Machines Corporation and
2
+ * Copyright (C) 1997-2016, International Business Machines Corporation and
3
3
  * others. All Rights Reserved.
4
4
  *******************************************************************************
5
5
  *
@@ -89,7 +89,7 @@ class SimpleDateFormatMutableNFs;
89
89
  * <td style="text-align: center" rowspan="3">G</td>
90
90
  * <td style="text-align: center">1..3</td>
91
91
  * <td>AD</td>
92
- * <td rowspan="3">Era - Replaced with the Era string for the current date. One to three letters for the
92
+ * <td rowspan="3">Era - Replaced with the Era string for the current date. One to three letters for the
93
93
  * abbreviated form, four letters for the long (wide) form, five for the narrow form.</td>
94
94
  * </tr>
95
95
  * <tr>
@@ -218,7 +218,7 @@ class SimpleDateFormatMutableNFs;
218
218
  * <td rowspan="3" style="text-align: center">q</td>
219
219
  * <td style="text-align: center">1..2</td>
220
220
  * <td>02</td>
221
- * <td rowspan="3"><b>Stand-Alone</b> Quarter - Use one or two for the numerical quarter, three for the abbreviation,
221
+ * <td rowspan="3"><b>Stand-Alone</b> Quarter - Use one or two for the numerical quarter, three for the abbreviation,
222
222
  * or four for the full name (five for the narrow name is not yet supported).</td>
223
223
  * </tr>
224
224
  * <tr>
@@ -254,7 +254,7 @@ class SimpleDateFormatMutableNFs;
254
254
  * <td rowspan="4" style="text-align: center">L</td>
255
255
  * <td style="text-align: center">1..2</td>
256
256
  * <td>09</td>
257
- * <td rowspan="4"><b>Stand-Alone</b> Month - Use one or two for the numerical month, three for the abbreviation,
257
+ * <td rowspan="4"><b>Stand-Alone</b> Month - Use one or two for the numerical month, three for the abbreviation,
258
258
  * four for the full (wide) name, or 5 for the narrow name. With two ("LL"), the month number is zero-padded if
259
259
  * necessary (e.g. "08")</td>
260
260
  * </tr>
@@ -310,7 +310,7 @@ class SimpleDateFormatMutableNFs;
310
310
  * <td>2451334</td>
311
311
  * <td>Modified Julian day. This is different from the conventional Julian day number in two regards.
312
312
  * First, it demarcates days at local zone midnight, rather than noon GMT. Second, it is a local number;
313
- * that is, it depends on the local time zone. It can be thought of as a single number that encompasses
313
+ * that is, it depends on the local time zone. It can be thought of as a single number that encompasses
314
314
  * all the date-related fields.</td>
315
315
  * </tr>
316
316
  * <tr>
@@ -319,7 +319,7 @@ class SimpleDateFormatMutableNFs;
319
319
  * <td rowspan="4" style="text-align: center">E</td>
320
320
  * <td style="text-align: center">1..3</td>
321
321
  * <td>Tue</td>
322
- * <td rowspan="4">Day of week - Use one through three letters for the short day, four for the full (wide) name,
322
+ * <td rowspan="4">Day of week - Use one through three letters for the short day, four for the full (wide) name,
323
323
  * five for the narrow name, or six for the short name.</td>
324
324
  * </tr>
325
325
  * <tr>
@@ -539,7 +539,7 @@ class SimpleDateFormatMutableNFs;
539
539
  * <td>The <i>generic location format</i>.
540
540
  * Where that is unavailable, falls back to the <i>long localized GMT format</i> ("OOOO";
541
541
  * Note: Fallback is only necessary with a GMT-style Time Zone ID, like Etc/GMT-830.)<br>
542
- * This is especially useful when presenting possible timezone choices for user selection,
542
+ * This is especially useful when presenting possible timezone choices for user selection,
543
543
  * since the naming is more uniform than the "v" format.</td>
544
544
  * </tr>
545
545
  * <tr>
@@ -1126,18 +1126,17 @@ public:
1126
1126
  * @param value The UDisplayContext value to set.
1127
1127
  * @param status Input/output status. If at entry this indicates a failure
1128
1128
  * status, the function will do nothing; otherwise this will be
1129
- * updated with any new status from the function.
1129
+ * updated with any new status from the function.
1130
1130
  * @stable ICU 53
1131
1131
  */
1132
1132
  virtual void setContext(UDisplayContext value, UErrorCode& status);
1133
-
1134
- #ifndef U_HIDE_DRAFT_API
1133
+
1135
1134
  /**
1136
1135
  * Overrides base class method and
1137
- * This method clears per field NumberFormat instances
1138
- * previously set by {@see adoptNumberFormat(const UnicodeString&, NumberFormat*, UErrorCode)}
1136
+ * This method clears per field NumberFormat instances
1137
+ * previously set by {@see adoptNumberFormat(const UnicodeString&, NumberFormat*, UErrorCode)}
1139
1138
  * @param adoptNF the NumbeferFormat used
1140
- * @draft ICU 54
1139
+ * @stable ICU 54
1141
1140
  */
1142
1141
  void adoptNumberFormat(NumberFormat *formatToAdopt);
1143
1142
 
@@ -1145,7 +1144,7 @@ public:
1145
1144
  * Allow the user to set the NumberFormat for several fields
1146
1145
  * It can be a single field like: "y"(year) or "M"(month)
1147
1146
  * It can be several field combined together: "yM"(year and month)
1148
- * Note:
1147
+ * Note:
1149
1148
  * 1 symbol field is enough for multiple symbol field (so "y" will override "yy", "yyy")
1150
1149
  * If the field is not numeric, then override has no effect (like "MMM" will use abbreviation, not numerical field)
1151
1150
  * Per field NumberFormat can also be cleared in {@see DateFormat::setNumberFormat(const NumberFormat& newNumberFormat)}
@@ -1154,17 +1153,16 @@ public:
1154
1153
  * @param adoptNF the NumbeferFormat used
1155
1154
  * @param status Receives a status code, which will be U_ZERO_ERROR
1156
1155
  * if the operation succeeds.
1157
- * @draft ICU 54
1156
+ * @stable ICU 54
1158
1157
  */
1159
1158
  void adoptNumberFormat(const UnicodeString& fields, NumberFormat *formatToAdopt, UErrorCode &status);
1160
1159
 
1161
1160
  /**
1162
1161
  * Get the numbering system to be used for a particular field.
1163
1162
  * @param field The UDateFormatField to get
1164
- * @draft ICU 54
1163
+ * @stable ICU 54
1165
1164
  */
1166
1165
  const NumberFormat * getNumberFormatForField(UChar field) const;
1167
- #endif /* U_HIDE_DRAFT_API */
1168
1166
 
1169
1167
  #ifndef U_HIDE_INTERNAL_API
1170
1168
  /**
@@ -1271,7 +1269,7 @@ private:
1271
1269
  * having a number of digits between "minDigits" and
1272
1270
  * "maxDigits". Uses the DateFormat's NumberFormat.
1273
1271
  *
1274
- * @param currentNumberFormat
1272
+ * @param currentNumberFormat
1275
1273
  * @param appendTo Output parameter to receive result.
1276
1274
  * Formatted number is appended to existing contents.
1277
1275
  * @param value Value to format.
@@ -1359,7 +1357,14 @@ private:
1359
1357
  */
1360
1358
  int32_t matchQuarterString(const UnicodeString& text, int32_t start, UCalendarDateFields field,
1361
1359
  const UnicodeString* stringArray, int32_t stringArrayCount, Calendar& cal) const;
1362
-
1360
+
1361
+ /**
1362
+ * Used by subParse() to match localized day period strings.
1363
+ */
1364
+ int32_t matchDayPeriodStrings(const UnicodeString& text, int32_t start,
1365
+ const UnicodeString* stringArray, int32_t stringArrayCount,
1366
+ int32_t &dayPeriod) const;
1367
+
1363
1368
  /**
1364
1369
  * Private function used by subParse to match literal pattern text.
1365
1370
  *
@@ -1376,9 +1381,9 @@ private:
1376
1381
  * @return <code>TRUE</code> if the literal text could be matched, <code>FALSE</code> otherwise.
1377
1382
  */
1378
1383
  static UBool matchLiterals(const UnicodeString &pattern, int32_t &patternOffset,
1379
- const UnicodeString &text, int32_t &textOffset,
1384
+ const UnicodeString &text, int32_t &textOffset,
1380
1385
  UBool whitespaceLenient, UBool partialMatchLenient, UBool oldLeniency);
1381
-
1386
+
1382
1387
  /**
1383
1388
  * Private member function that converts the parsed date strings into
1384
1389
  * timeFields. Returns -start (for ParsePosition) if failed.
@@ -1401,7 +1406,8 @@ private:
1401
1406
  */
1402
1407
  int32_t subParse(const UnicodeString& text, int32_t& start, UChar ch, int32_t count,
1403
1408
  UBool obeyCount, UBool allowNegative, UBool ambiguousYear[], int32_t& saveHebrewMonth, Calendar& cal,
1404
- int32_t patLoc, MessageFormat * numericLeapMonthFormatter, UTimeZoneFormatTimeType *tzTimeType, SimpleDateFormatMutableNFs &mutableNFs) const;
1409
+ int32_t patLoc, MessageFormat * numericLeapMonthFormatter, UTimeZoneFormatTimeType *tzTimeType, SimpleDateFormatMutableNFs &mutableNFs,
1410
+ int32_t *dayPeriod=NULL) const;
1405
1411
 
1406
1412
  void parseInt(const UnicodeString& text,
1407
1413
  Formattable& number,
@@ -1558,6 +1564,14 @@ private:
1558
1564
  */
1559
1565
  UDate fDefaultCenturyStart;
1560
1566
 
1567
+ UBool fHasMinute;
1568
+ UBool fHasSecond;
1569
+
1570
+ /**
1571
+ * Sets fHasMinutes and fHasSeconds.
1572
+ */
1573
+ void parsePattern();
1574
+
1561
1575
  /**
1562
1576
  * See documentation for defaultCenturyStart.
1563
1577
  */