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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (232) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +19 -3
  3. data/ext/pango/depend +0 -1
  4. data/ext/pango/extconf.rb +0 -2
  5. data/ext/pango/rbpango.c +44 -6
  6. data/ext/pango/rbpango.h +0 -1
  7. data/ext/pango/rbpangoattribute.c +2 -2
  8. data/ext/pango/rbpangocairo.c +4 -4
  9. data/ext/pango/rbpangocontext.c +2 -2
  10. data/ext/pango/rbpangofontdescription.c +2 -2
  11. data/ext/pango/rbpangogravity.c +2 -2
  12. data/ext/pango/rbpangolanguage.c +8 -0
  13. data/ext/pango/rbpangolayout.c +15 -4
  14. data/ext/pango/rbpangomatrix.c +2 -2
  15. data/ext/pango/rbpangoscript.c +3 -3
  16. data/lib/2.0/pango.so +0 -0
  17. data/lib/2.1/pango.so +0 -0
  18. data/lib/2.2/pango.so +0 -0
  19. data/test/test-language.rb +5 -0
  20. data/test/test-layout.rb +7 -1
  21. data/vendor/local/bin/derb.exe +0 -0
  22. data/vendor/local/bin/genbrk.exe +0 -0
  23. data/vendor/local/bin/genccode.exe +0 -0
  24. data/vendor/local/bin/gencfu.exe +0 -0
  25. data/vendor/local/bin/gencmn.exe +0 -0
  26. data/vendor/local/bin/gencnval.exe +0 -0
  27. data/vendor/local/bin/gendict.exe +0 -0
  28. data/vendor/local/bin/gennorm2.exe +0 -0
  29. data/vendor/local/bin/genrb.exe +0 -0
  30. data/vendor/local/bin/gensprep.exe +0 -0
  31. data/vendor/local/bin/hb-ot-shape-closure.exe +0 -0
  32. data/vendor/local/bin/hb-shape.exe +0 -0
  33. data/vendor/local/bin/hb-view.exe +0 -0
  34. data/vendor/local/bin/icu-config +6 -6
  35. data/vendor/local/bin/icuinfo.exe +0 -0
  36. data/vendor/local/bin/icupkg.exe +0 -0
  37. data/vendor/local/bin/libharfbuzz-0.dll +0 -0
  38. data/vendor/local/bin/libpango-1.0-0.dll +0 -0
  39. data/vendor/local/bin/libpangocairo-1.0-0.dll +0 -0
  40. data/vendor/local/bin/libpangoft2-1.0-0.dll +0 -0
  41. data/vendor/local/bin/libpangowin32-1.0-0.dll +0 -0
  42. data/vendor/local/bin/makeconv.exe +0 -0
  43. data/vendor/local/bin/pango-querymodules.exe +0 -0
  44. data/vendor/local/bin/pango-view.exe +0 -0
  45. data/vendor/local/bin/pkgdata.exe +0 -0
  46. data/vendor/local/bin/uconv.exe +0 -0
  47. data/vendor/local/etc/pango/pango.modules +1 -1
  48. data/vendor/local/include/harfbuzz/hb-buffer.h +26 -1
  49. data/vendor/local/include/harfbuzz/hb-common.h +7 -0
  50. data/vendor/local/include/harfbuzz/hb-font.h +7 -6
  51. data/vendor/local/include/harfbuzz/hb-ft.h +58 -1
  52. data/vendor/local/include/harfbuzz/hb-glib.h +3 -0
  53. data/vendor/local/include/harfbuzz/hb-ot-font.h +4 -0
  54. data/vendor/local/include/harfbuzz/hb-shape.h +0 -3
  55. data/vendor/local/include/harfbuzz/hb-unicode.h +28 -3
  56. data/vendor/local/include/harfbuzz/hb-version.h +4 -4
  57. data/vendor/local/include/layout/LEFontInstance.h +2 -28
  58. data/vendor/local/include/layout/LETableReference.h +7 -2
  59. data/vendor/local/include/unicode/calendar.h +32 -2
  60. data/vendor/local/include/unicode/coll.h +9 -7
  61. data/vendor/local/include/unicode/datefmt.h +102 -13
  62. data/vendor/local/include/unicode/dcfmtsym.h +4 -2
  63. data/vendor/local/include/unicode/decimfmt.h +4 -5
  64. data/vendor/local/include/unicode/dtfmtsym.h +60 -1
  65. data/vendor/local/include/unicode/dtptngen.h +21 -7
  66. data/vendor/local/include/unicode/localpointer.h +49 -1
  67. data/vendor/local/include/unicode/locid.h +2 -3
  68. data/vendor/local/include/unicode/measfmt.h +30 -37
  69. data/vendor/local/include/unicode/measunit.h +65 -152
  70. data/vendor/local/include/unicode/measure.h +3 -3
  71. data/vendor/local/include/unicode/numfmt.h +3 -5
  72. data/vendor/local/include/unicode/platform.h +12 -2
  73. data/vendor/local/include/unicode/plurrule.h +18 -14
  74. data/vendor/local/include/unicode/rbnf.h +3 -4
  75. data/vendor/local/include/unicode/regex.h +42 -26
  76. data/vendor/local/include/unicode/region.h +9 -9
  77. data/vendor/local/include/unicode/reldatefmt.h +50 -45
  78. data/vendor/local/include/unicode/scientificnumberformatter.h +222 -0
  79. data/vendor/local/include/unicode/smpdtfmt.h +30 -24
  80. data/vendor/local/include/unicode/tblcoll.h +5 -4
  81. data/vendor/local/include/unicode/timezone.h +18 -1
  82. data/vendor/local/include/unicode/ucal.h +2 -2
  83. data/vendor/local/include/unicode/ucol.h +22 -18
  84. data/vendor/local/include/unicode/uconfig.h +17 -2
  85. data/vendor/local/include/unicode/udat.h +164 -56
  86. data/vendor/local/include/unicode/udatpg.h +9 -7
  87. data/vendor/local/include/unicode/ufieldpositer.h +121 -0
  88. data/vendor/local/include/unicode/uidna.h +21 -13
  89. data/vendor/local/include/unicode/ulistformatter.h +130 -0
  90. data/vendor/local/include/unicode/ulocdata.h +4 -3
  91. data/vendor/local/include/unicode/unistr.h +101 -53
  92. data/vendor/local/include/unicode/unum.h +7 -10
  93. data/vendor/local/include/unicode/uregex.h +52 -29
  94. data/vendor/local/include/unicode/urename.h +14 -3
  95. data/vendor/local/include/unicode/uscript.h +30 -16
  96. data/vendor/local/include/unicode/uspoof.h +13 -9
  97. data/vendor/local/include/unicode/utrans.h +5 -7
  98. data/vendor/local/include/unicode/utypes.h +9 -3
  99. data/vendor/local/include/unicode/uvernum.h +8 -8
  100. data/vendor/local/lib/icu/{54.1 → 55.1}/Makefile.inc +5 -5
  101. data/vendor/local/lib/icu/{54.1 → 55.1}/pkgdata.inc +1 -1
  102. data/vendor/local/lib/icu/Makefile.inc +5 -5
  103. data/vendor/local/lib/icu/pkgdata.inc +1 -1
  104. data/vendor/local/lib/icudt.dll +0 -0
  105. data/vendor/local/lib/{icudt54.dll → icudt55.dll} +0 -0
  106. data/vendor/local/lib/icuin.dll +0 -0
  107. data/vendor/local/lib/icuin55.dll +0 -0
  108. data/vendor/local/lib/icuio.dll +0 -0
  109. data/vendor/local/lib/icuio55.dll +0 -0
  110. data/vendor/local/lib/icule.dll +0 -0
  111. data/vendor/local/lib/icule55.dll +0 -0
  112. data/vendor/local/lib/iculx.dll +0 -0
  113. data/vendor/local/lib/iculx55.dll +0 -0
  114. data/vendor/local/lib/icutest.dll +0 -0
  115. data/vendor/local/lib/icutest55.dll +0 -0
  116. data/vendor/local/lib/icutu.dll +0 -0
  117. data/vendor/local/lib/icutu55.dll +0 -0
  118. data/vendor/local/lib/icuuc.dll +0 -0
  119. data/vendor/local/lib/icuuc55.dll +0 -0
  120. data/vendor/local/lib/libharfbuzz-icu.a +0 -0
  121. data/vendor/local/lib/libharfbuzz-icu.la +7 -7
  122. data/vendor/local/lib/libharfbuzz.dll.a +0 -0
  123. data/vendor/local/lib/libharfbuzz.la +7 -7
  124. data/vendor/local/lib/libicudt.dll.a +0 -0
  125. data/vendor/local/lib/libicuin.dll.a +0 -0
  126. data/vendor/local/lib/libicuio.dll.a +0 -0
  127. data/vendor/local/lib/libicule.dll.a +0 -0
  128. data/vendor/local/lib/libiculx.dll.a +0 -0
  129. data/vendor/local/lib/libicutest.dll.a +0 -0
  130. data/vendor/local/lib/libicutu.dll.a +0 -0
  131. data/vendor/local/lib/libicuuc.dll.a +0 -0
  132. data/vendor/local/lib/libpango-1.0.dll.a +0 -0
  133. data/vendor/local/lib/libpango-1.0.la +2 -2
  134. data/vendor/local/lib/libpangocairo-1.0.dll.a +0 -0
  135. data/vendor/local/lib/libpangocairo-1.0.la +1 -1
  136. data/vendor/local/lib/libpangoft2-1.0.dll.a +0 -0
  137. data/vendor/local/lib/libpangoft2-1.0.la +2 -2
  138. data/vendor/local/lib/libpangowin32-1.0.dll.a +0 -0
  139. data/vendor/local/lib/libpangowin32-1.0.la +2 -2
  140. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.dll +0 -0
  141. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.dll.a +0 -0
  142. data/vendor/local/lib/pango/1.8.0/modules/pango-arabic-lang.la +2 -2
  143. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.dll +0 -0
  144. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.dll.a +0 -0
  145. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-fc.la +2 -2
  146. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.dll +0 -0
  147. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.dll.a +0 -0
  148. data/vendor/local/lib/pango/1.8.0/modules/pango-basic-win32.la +2 -2
  149. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.dll +0 -0
  150. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.dll.a +0 -0
  151. data/vendor/local/lib/pango/1.8.0/modules/pango-indic-lang.la +2 -2
  152. data/vendor/local/lib/pkgconfig/harfbuzz-icu.pc +1 -1
  153. data/vendor/local/lib/pkgconfig/harfbuzz.pc +3 -1
  154. data/vendor/local/lib/pkgconfig/icu-i18n.pc +5 -5
  155. data/vendor/local/lib/pkgconfig/icu-io.pc +5 -5
  156. data/vendor/local/lib/pkgconfig/icu-le.pc +5 -5
  157. data/vendor/local/lib/pkgconfig/icu-lx.pc +5 -5
  158. data/vendor/local/lib/pkgconfig/icu-uc.pc +5 -5
  159. data/vendor/local/share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html +35 -0
  160. data/vendor/local/share/gtk-doc/html/harfbuzz/annotation-glossary.html +30 -35
  161. data/vendor/local/share/gtk-doc/html/harfbuzz/api-index-full.html +158 -27
  162. data/vendor/local/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html +87 -0
  163. data/vendor/local/share/gtk-doc/html/harfbuzz/{ch01.html → ch06.html} +12 -13
  164. data/vendor/local/share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html +31 -0
  165. data/vendor/local/share/gtk-doc/html/harfbuzz/deprecated-api-index.html +7 -8
  166. data/vendor/local/share/gtk-doc/html/harfbuzz/fonts-and-faces.html +40 -0
  167. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-Shaping.html +352 -0
  168. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html +88 -47
  169. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html +128 -204
  170. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html +290 -304
  171. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html +14 -23
  172. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html +14 -17
  173. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html +40 -51
  174. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html +126 -190
  175. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html +19 -24
  176. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html +14 -29
  177. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html +438 -11
  178. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html +14 -25
  179. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html +14 -29
  180. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html +19 -160
  181. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-tag.html +21 -36
  182. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot.html +14 -11
  183. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html +70 -81
  184. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html +33 -44
  185. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html +290 -323
  186. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html +14 -23
  187. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html +59 -27
  188. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb.html +16 -13
  189. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2 +415 -104
  190. data/vendor/local/share/gtk-doc/html/harfbuzz/hello-harfbuzz.html +181 -0
  191. data/vendor/local/share/gtk-doc/html/harfbuzz/index.html +43 -12
  192. data/vendor/local/share/gtk-doc/html/harfbuzz/object-tree.html +11 -13
  193. data/vendor/local/share/gtk-doc/html/harfbuzz/plans-and-caching.html +31 -0
  194. data/vendor/local/share/gtk-doc/html/harfbuzz/pt01.html +70 -0
  195. data/vendor/local/share/gtk-doc/html/harfbuzz/pt02.html +107 -0
  196. data/vendor/local/share/gtk-doc/html/harfbuzz/setting-buffer-properties.html +31 -0
  197. data/vendor/local/share/gtk-doc/html/harfbuzz/shaping-and-shape-plans.html +39 -0
  198. data/vendor/local/share/gtk-doc/html/harfbuzz/style.css +9 -6
  199. data/vendor/local/share/gtk-doc/html/harfbuzz/using-harfbuzzs-native-opentype-implementation.html +31 -0
  200. data/vendor/local/share/gtk-doc/html/harfbuzz/using-your-own-font-functions.html +31 -0
  201. data/vendor/local/share/gtk-doc/html/harfbuzz/what-about-the-other-scripts.html +31 -0
  202. data/vendor/local/share/gtk-doc/html/harfbuzz/what-is-harfbuzz.html +124 -0
  203. data/vendor/local/share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html +38 -0
  204. data/vendor/local/share/icu/{54.1 → 55.1}/config/mh-mingw64 +0 -0
  205. data/vendor/local/share/icu/{54.1 → 55.1}/install-sh +0 -0
  206. data/vendor/local/share/icu/{54.1 → 55.1}/license.html +3 -4
  207. data/vendor/local/share/icu/{54.1 → 55.1}/mkinstalldirs +0 -0
  208. data/vendor/local/share/man/man1/derb.1 +2 -2
  209. data/vendor/local/share/man/man1/genbrk.1 +2 -2
  210. data/vendor/local/share/man/man1/gencfu.1 +1 -1
  211. data/vendor/local/share/man/man1/gencnval.1 +3 -3
  212. data/vendor/local/share/man/man1/gendict.1 +2 -2
  213. data/vendor/local/share/man/man1/genrb.1 +3 -3
  214. data/vendor/local/share/man/man1/icu-config.1 +2 -2
  215. data/vendor/local/share/man/man1/makeconv.1 +3 -3
  216. data/vendor/local/share/man/man1/pkgdata.1 +2 -2
  217. data/vendor/local/share/man/man1/uconv.1 +2 -2
  218. data/vendor/local/share/man/man8/genccode.8 +2 -2
  219. data/vendor/local/share/man/man8/gencmn.8 +3 -3
  220. data/vendor/local/share/man/man8/gensprep.8 +3 -3
  221. data/vendor/local/share/man/man8/icupkg.8 +1 -1
  222. metadata +38 -22
  223. data/vendor/local/include/unicode/scientificformathelper.h +0 -139
  224. data/vendor/local/lib/icuin54.dll +0 -0
  225. data/vendor/local/lib/icuio54.dll +0 -0
  226. data/vendor/local/lib/icule54.dll +0 -0
  227. data/vendor/local/lib/iculx54.dll +0 -0
  228. data/vendor/local/lib/icutest54.dll +0 -0
  229. data/vendor/local/lib/icutu54.dll +0 -0
  230. data/vendor/local/lib/icuuc54.dll +0 -0
  231. data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html +0 -286
  232. data/vendor/local/share/gtk-doc/html/harfbuzz/index.sgml +0 -496
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b8477a5af45b5a29aeea54109d1af91328348c89
4
- data.tar.gz: 529d4bb8370a99eb2302099eb20ee2954a5f4fcb
3
+ metadata.gz: 5c752af543f1467e8f00f064fe35f860461391b2
4
+ data.tar.gz: bdd89abe8bbe560697b0f47aa1387246c0f87d6a
5
5
  SHA512:
6
- metadata.gz: 60e7a39a238c64378411b5dd9b538cba5c634baf4288d6ea02df3396c37a38a9355d4340fb44242899590f3755104b41bf2532e7b7d8b0d896866a3375760d74
7
- data.tar.gz: f6ee754b18fb97c2abe4a411b8c946c69c6e41afa91bcf23de57cbdc43860ee57ad4f93754e4a07f1b66b812ccffccd9e8e7ed47cdb892f68aaa1479550dc0c9
6
+ metadata.gz: 8653641d20f3db485217524621c33f7c5794f429e5d5925db6f63a95461b9faa73e9d3188a3716487f27368d1f9eea1c2586efaf9a3d89aa7c4645c71d3ebac6
7
+ data.tar.gz: cd8ea4a2901f941286095fe514de2f25c51e0aa6714b1769616a4f2be6c9fe986b0b56b4770fd66d711ac494e25f22487c19a57df04b4de2edc1f3b2778e4d3b
data/Rakefile CHANGED
@@ -1,4 +1,20 @@
1
1
  # -*- ruby -*-
2
+ #
3
+ # Copyright (C) 2011-2015 Ruby-GNOME2 Project Team
4
+ #
5
+ # This library is free software; you can redistribute it and/or
6
+ # modify it under the terms of the GNU Lesser General Public
7
+ # License as published by the Free Software Foundation; either
8
+ # version 2.1 of the License, or (at your option) any later version.
9
+ #
10
+ # This library is distributed in the hope that it will be useful,
11
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
12
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13
+ # Lesser General Public License for more details.
14
+ #
15
+ # You should have received a copy of the GNU Lesser General Public
16
+ # License along with this library; if not, write to the Free Software
17
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2
18
 
3
19
  $LOAD_PATH.unshift("./../glib2/lib")
4
20
  require "gnome2/rake/package-task"
@@ -13,10 +29,10 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
13
29
  package.external_packages = [
14
30
  {
15
31
  :name => "icu",
16
- :download_base_url => "http://download.icu-project.org/files/icu4c/54.1",
32
+ :download_base_url => "http://download.icu-project.org/files/icu4c/55.1",
17
33
  :label => "gobject-introspection",
18
34
  :base_name => "icu",
19
- :archive_base_name => "icu4c-54_1-src.tgz",
35
+ :archive_base_name => "icu4c-55_1-src.tgz",
20
36
  :compression_method => "gz",
21
37
  :base_dir_in_package => "source",
22
38
  :windows => {
@@ -34,7 +50,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
34
50
  :name => "harfbuzz",
35
51
  :download_base_url => "http://www.freedesktop.org/software/harfbuzz/release",
36
52
  :label => "HarfBuzz",
37
- :version => "0.9.35",
53
+ :version => "1.0.3",
38
54
  :compression_method => "bz2",
39
55
  :windows => {
40
56
  :configure_args => [
@@ -2,7 +2,6 @@ install-so: install-headers
2
2
  install-headers:
3
3
  $(INSTALL_DATA) $(srcdir)/rbpango.h $(RUBYARCHDIR)
4
4
  $(INSTALL_DATA) $(srcdir)/rbpangoconversions.h $(RUBYARCHDIR)
5
- $(INSTALL_DATA) rbpangoversion.h $(RUBYARCHDIR)
6
5
 
7
6
  install: install-pc
8
7
  install-pc:
@@ -75,8 +75,6 @@ have_func("pango_attr_iterator_get_attrs", pango_header)
75
75
  have_func("pango_itemize_with_base_dir", pango_header)
76
76
  have_func("pango_font_family_is_monospace", pango_header)
77
77
 
78
- make_version_header("PANGO", "pango", ".")
79
-
80
78
  create_pkg_config_file("Ruby/Pango", package_id)
81
79
  $defs << " -DRUBY_PANGO_COMPILATION"
82
80
  create_makefile(module_name)
@@ -1,6 +1,6 @@
1
1
  /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
2
2
  /*
3
- * Copyright (C) 2011 Ruby-GNOME2 Project Team
3
+ * Copyright (C) 2011-2015 Ruby-GNOME2 Project Team
4
4
  * Copyright (C) 2002-2005 Masao Mutoh
5
5
  *
6
6
  * This library is free software; you can redistribute it and/or
@@ -31,6 +31,40 @@ extern void Init_pango(void);
31
31
  * Rendering
32
32
  */
33
33
 
34
+ static VALUE
35
+ rg_s_version(G_GNUC_UNUSED VALUE self)
36
+ {
37
+ return INT2NUM(pango_version());
38
+ }
39
+
40
+ static VALUE
41
+ rg_s_version_string(G_GNUC_UNUSED VALUE self)
42
+ {
43
+ return CSTR2RVAL(pango_version_string());
44
+ }
45
+
46
+ static VALUE
47
+ rg_s_check_version(G_GNUC_UNUSED VALUE self,
48
+ VALUE major, VALUE minor, VALUE micro)
49
+ {
50
+ const gchar *error_message;
51
+ error_message = pango_version_check(NUM2INT(major),
52
+ NUM2INT(minor),
53
+ NUM2INT(micro));
54
+ return CSTR2RVAL(error_message);
55
+ }
56
+
57
+ static VALUE
58
+ rg_s_check_version_p(G_GNUC_UNUSED VALUE self,
59
+ VALUE major, VALUE minor, VALUE micro)
60
+ {
61
+ const gchar *error_message;
62
+ error_message = pango_version_check(NUM2INT(major),
63
+ NUM2INT(minor),
64
+ NUM2INT(micro));
65
+ return CBOOL2RVAL(!error_message);
66
+ }
67
+
34
68
  struct rpango_reorder_items_args {
35
69
  PangoItem *item;
36
70
  VALUE ary;
@@ -261,12 +295,16 @@ Init_pango(void)
261
295
  {
262
296
  RG_TARGET_NAMESPACE = rb_define_module("Pango");
263
297
 
264
- rb_define_const(RG_TARGET_NAMESPACE, "BUILD_VERSION",
265
- rb_ary_new3(3,
266
- INT2FIX(PANGO_MAJOR_VERSION),
267
- INT2FIX(PANGO_MINOR_VERSION),
268
- INT2FIX(PANGO_MICRO_VERSION)));
298
+ rb_define_const(RG_TARGET_NAMESPACE, "BUILD_VERSION",
299
+ rb_ary_new3(3,
300
+ INT2FIX(PANGO_VERSION_MAJOR),
301
+ INT2FIX(PANGO_VERSION_MINOR),
302
+ INT2FIX(PANGO_VERSION_MICRO)));
269
303
 
304
+ RG_DEF_SMETHOD(version, 0);
305
+ RG_DEF_SMETHOD(version_string, 0);
306
+ RG_DEF_SMETHOD(check_version, 3);
307
+ RG_DEF_SMETHOD_P(check_version, 3);
270
308
  RG_DEF_SMETHOD(reorder_items, 1);
271
309
  RG_DEF_SMETHOD(unichar_direction, 1);
272
310
  RG_DEF_SMETHOD(find_base_dir, 1);
@@ -29,7 +29,6 @@
29
29
  #endif
30
30
 
31
31
  #include "rbgobject.h"
32
- #include "rbpangoversion.h"
33
32
  #include "rbpangoconversions.h"
34
33
  #include <pango/pangocairo.h>
35
34
 
@@ -282,7 +282,7 @@ attr_AttrAbsoluteSize_initialize(VALUE self, VALUE size)
282
282
  return Qnil;
283
283
  }
284
284
 
285
- #if PANGO_CHECK_VERSION(1,16,0)
285
+ #if PANGO_VERSION_CHECK(1,16,0)
286
286
  static VALUE
287
287
  attr_AttrGravity_initialize(VALUE self, VALUE gravity)
288
288
  {
@@ -438,7 +438,7 @@ Init_pango_attribute(VALUE mPango)
438
438
  MAKE_ATTR(PANGO_ATTR_STRETCH, AttrStretch, pattrint, 1);
439
439
  MAKE_ATTR(PANGO_ATTR_SIZE, AttrSize, pattrint, 1);
440
440
  MAKE_ATTR(PANGO_ATTR_ABSOLUTE_SIZE, AttrAbsoluteSize, pattrint, 1);
441
- #if PANGO_CHECK_VERSION(1,16,0)
441
+ #if PANGO_VERSION_CHECK(1,16,0)
442
442
  MAKE_ATTR(PANGO_ATTR_GRAVITY, AttrGravity, pattrint, 1);
443
443
  MAKE_ATTR(PANGO_ATTR_GRAVITY_HINT, AttrGravityHint, pattrint, 1);
444
444
  #endif
@@ -34,7 +34,7 @@ rg_s_create(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
34
34
  if (NIL_P(rb_font_type)) {
35
35
  font_map = pango_cairo_font_map_new();
36
36
  } else {
37
- #if PANGO_CHECK_VERSION(1, 18, 0)
37
+ #if PANGO_VERSION_CHECK(1, 18, 0)
38
38
  cairo_font_type_t font_type = CAIRO_FONT_TYPE_USER;
39
39
  if (rbgutil_key_equal(rb_font_type, "ft") ||
40
40
  rbgutil_key_equal(rb_font_type, "freetype")) {
@@ -66,7 +66,7 @@ rg_s_default(G_GNUC_UNUSED VALUE klass)
66
66
  return GOBJ2RVAL(pango_cairo_font_map_get_default());
67
67
  }
68
68
 
69
- #if PANGO_CHECK_VERSION(1, 22, 0)
69
+ #if PANGO_VERSION_CHECK(1, 22, 0)
70
70
  static VALUE
71
71
  rg_s_set_default(VALUE klass, VALUE font_map)
72
72
  {
@@ -93,7 +93,7 @@ rg_create_context(VALUE self)
93
93
  {
94
94
  PangoContext *pango_context;
95
95
 
96
- #if PANGO_CHECK_VERSION(1, 22, 0)
96
+ #if PANGO_VERSION_CHECK(1, 22, 0)
97
97
  pango_context = pango_font_map_create_context(PANGO_FONT_MAP(_SELF(self)));
98
98
  #else
99
99
  pango_context = pango_cairo_font_map_create_context(_SELF(self));
@@ -112,7 +112,7 @@ Init_pango_cairo(VALUE mPango)
112
112
 
113
113
  RG_DEF_SMETHOD(create, -1);
114
114
  RG_DEF_SMETHOD(default, 0);
115
- #if PANGO_CHECK_VERSION(1, 22, 0)
115
+ #if PANGO_VERSION_CHECK(1, 22, 0)
116
116
  RG_DEF_SMETHOD(set_default, 1);
117
117
  #endif
118
118
 
@@ -129,7 +129,7 @@ rg_set_base_dir(VALUE self, VALUE direction)
129
129
  return self;
130
130
  }
131
131
 
132
- #if PANGO_CHECK_VERSION(1,16,0)
132
+ #if PANGO_VERSION_CHECK(1,16,0)
133
133
  static VALUE
134
134
  rg_base_gravity(VALUE self)
135
135
  {
@@ -280,7 +280,7 @@ Init_pango_context(VALUE mPango)
280
280
  RG_DEF_METHOD(set_language, 1);
281
281
  RG_DEF_METHOD(base_dir, 0);
282
282
  RG_DEF_METHOD(set_base_dir, 1);
283
- #if PANGO_CHECK_VERSION(1,16,0)
283
+ #if PANGO_VERSION_CHECK(1,16,0)
284
284
  RG_DEF_METHOD(base_gravity, 0);
285
285
  RG_DEF_METHOD(set_base_gravity, 1);
286
286
  RG_DEF_METHOD(gravity_hint, 0);
@@ -163,7 +163,7 @@ rg_size_is_absolute_p(VALUE self)
163
163
  return CBOOL2RVAL(pango_font_description_get_size_is_absolute(_SELF(self)));
164
164
  }
165
165
 
166
- #if PANGO_CHECK_VERSION(1,16,0)
166
+ #if PANGO_VERSION_CHECK(1,16,0)
167
167
  static VALUE
168
168
  rg_gravity(VALUE self)
169
169
  {
@@ -248,7 +248,7 @@ Init_pango_font_description(VALUE mPango)
248
248
  RG_DEF_METHOD(size, 0);
249
249
  RG_DEF_METHOD(set_absolute_size, 1);
250
250
  RG_DEF_METHOD_P(size_is_absolute, 0);
251
- #if PANGO_CHECK_VERSION(1,16,0)
251
+ #if PANGO_VERSION_CHECK(1,16,0)
252
252
  RG_DEF_METHOD(set_gravity, 1);
253
253
  RG_DEF_METHOD(gravity, 0);
254
254
  #endif
@@ -20,7 +20,7 @@
20
20
 
21
21
  #include "rbpangoprivate.h"
22
22
 
23
- #if PANGO_CHECK_VERSION(1,16,0)
23
+ #if PANGO_VERSION_CHECK(1,16,0)
24
24
 
25
25
  #define RG_TARGET_NAMESPACE mGravity
26
26
 
@@ -40,7 +40,7 @@ rg_s_vertical_p(G_GNUC_UNUSED VALUE self, VALUE gravity)
40
40
  void
41
41
  Init_pango_gravity(VALUE mPango)
42
42
  {
43
- #if PANGO_CHECK_VERSION(1,16,0)
43
+ #if PANGO_VERSION_CHECK(1,16,0)
44
44
  VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mPango, "Gravity");
45
45
 
46
46
  RG_DEF_SMETHOD(to_rotation, 1);
@@ -69,6 +69,12 @@ rg_includes_script(VALUE self, VALUE script)
69
69
  RVAL2PANGOSCRIPT(script)));
70
70
  }
71
71
 
72
+ static VALUE
73
+ rg_sample_string(VALUE self)
74
+ {
75
+ return CSTR2RVAL(pango_language_get_sample_string(_SELF(self)));
76
+ }
77
+
72
78
  void
73
79
  Init_pango_language(VALUE mPango)
74
80
  {
@@ -83,4 +89,6 @@ Init_pango_language(VALUE mPango)
83
89
  RG_DEF_ALIAS("to_s", "to_str");
84
90
 
85
91
  RG_DEF_METHOD(includes_script, 1);
92
+
93
+ RG_DEF_METHOD(sample_string, 0);
86
94
  }
@@ -154,7 +154,7 @@ rg_width(VALUE self)
154
154
  return INT2NUM(pango_layout_get_width(_SELF(self)));
155
155
  }
156
156
 
157
- #if PANGO_CHECK_VERSION(1, 20, 0)
157
+ #if PANGO_VERSION_CHECK(1, 20, 0)
158
158
  static VALUE
159
159
  rg_set_height(VALUE self, VALUE width)
160
160
  {
@@ -195,7 +195,7 @@ rg_ellipsize(VALUE self)
195
195
  return PANGOELLIPSIZEMODE2RVAL(pango_layout_get_ellipsize(_SELF(self)));
196
196
  }
197
197
 
198
- #if PANGO_CHECK_VERSION(1, 16, 0)
198
+ #if PANGO_VERSION_CHECK(1, 16, 0)
199
199
  static VALUE
200
200
  rg_ellipsized_p(VALUE self)
201
201
  {
@@ -498,6 +498,14 @@ rg_iter(VALUE self)
498
498
  return PANGOLAYOUTITER2RVAL(pango_layout_get_iter(_SELF(self)));
499
499
  }
500
500
 
501
+ #if PANGO_VERSION_CHECK(1, 22, 0)
502
+ static VALUE
503
+ rg_baseline(VALUE self)
504
+ {
505
+ return INT2NUM(pango_layout_get_baseline(_SELF(self)));
506
+ }
507
+ #endif
508
+
501
509
  void
502
510
  Init_pango_layout(VALUE mPango)
503
511
  {
@@ -517,7 +525,7 @@ Init_pango_layout(VALUE mPango)
517
525
  RG_DEF_METHOD(font_description, 0);
518
526
  RG_DEF_METHOD(set_width, 1);
519
527
  RG_DEF_METHOD(width, 0);
520
- #if PANGO_CHECK_VERSION(1, 20, 0)
528
+ #if PANGO_VERSION_CHECK(1, 20, 0)
521
529
  RG_DEF_METHOD(set_height, 1);
522
530
  RG_DEF_METHOD(height, 0);
523
531
  #endif
@@ -525,7 +533,7 @@ Init_pango_layout(VALUE mPango)
525
533
  RG_DEF_METHOD(wrap, 0);
526
534
  RG_DEF_METHOD(set_ellipsize, 1);
527
535
  RG_DEF_METHOD(ellipsize, 0);
528
- #if PANGO_CHECK_VERSION(1, 16, 0)
536
+ #if PANGO_VERSION_CHECK(1, 16, 0)
529
537
  RG_DEF_METHOD_P(ellipsized, 0);
530
538
  #endif
531
539
  RG_DEF_METHOD(set_indent, 1);
@@ -557,6 +565,9 @@ Init_pango_layout(VALUE mPango)
557
565
  RG_DEF_METHOD(get_line, 1);
558
566
  RG_DEF_METHOD(lines, 0);
559
567
  RG_DEF_METHOD(iter, 0);
568
+ #if PANGO_VERSION_CHECK(1, 22, 0)
569
+ RG_DEF_METHOD(baseline, 0);
570
+ #endif
560
571
 
561
572
  /* PangoWrapMode */
562
573
  G_DEF_CLASS(PANGO_TYPE_WRAP_MODE, "WrapMode", RG_TARGET_NAMESPACE);
@@ -82,7 +82,7 @@ rg_rotate_bang(VALUE self, VALUE degrees)
82
82
  return self;
83
83
  }
84
84
 
85
- #if PANGO_CHECK_VERSION(1,16,0)
85
+ #if PANGO_VERSION_CHECK(1,16,0)
86
86
  static VALUE
87
87
  rg_gravity(VALUE self)
88
88
  {
@@ -129,7 +129,7 @@ Init_pango_matrix(VALUE mPango)
129
129
  RG_DEF_METHOD_BANG(rotate, 1);
130
130
  RG_DEF_METHOD_BANG(concat, 1);
131
131
  RG_DEF_METHOD(font_scale_factor, 0);
132
- #if PANGO_CHECK_VERSION(1,16,0)
132
+ #if PANGO_VERSION_CHECK(1,16,0)
133
133
  RG_DEF_METHOD(gravity, 0);
134
134
  #endif
135
135
  RG_DEF_METHOD(to_a, 0);
@@ -37,7 +37,7 @@ rg_sample_language(VALUE self)
37
37
  return PANGOLANGUAGE2RVAL(lang);
38
38
  }
39
39
 
40
- #if PANGO_CHECK_VERSION(1,16,0)
40
+ #if PANGO_VERSION_CHECK(1,16,0)
41
41
  static VALUE
42
42
  rg_get_gravity(int argc, VALUE *argv, VALUE self)
43
43
  {
@@ -52,7 +52,7 @@ rg_get_gravity(int argc, VALUE *argv, VALUE self)
52
52
  RVAL2PANGOGRAVITY(gravity),
53
53
  RVAL2PANGOGRAVITYHINT(gravity_hint));
54
54
  } else {
55
- # if PANGO_CHECK_VERSION(1,26,0)
55
+ # if PANGO_VERSION_CHECK(1,26,0)
56
56
  g = pango_gravity_get_for_script_and_width(_SELF(self),
57
57
  RVAL2CBOOL(wide),
58
58
  RVAL2PANGOGRAVITY(gravity),
@@ -78,7 +78,7 @@ Init_pango_script(VALUE mPango)
78
78
 
79
79
  RG_DEF_SMETHOD(for_unichar, 1);
80
80
  RG_DEF_METHOD(sample_language, 0);
81
- #if PANGO_CHECK_VERSION(1,16,0)
81
+ #if PANGO_VERSION_CHECK(1,16,0)
82
82
  RG_DEF_METHOD(get_gravity, -1);
83
83
  #endif
84
84
  }
Binary file
Binary file
Binary file
@@ -4,4 +4,9 @@ class TestLanguage < Test::Unit::TestCase
4
4
  def test_default
5
5
  assert_match(/\A[a-z]{2}-[a-z]{2}\z/, Pango::Language.default.to_s)
6
6
  end
7
+
8
+ def test_sample_string
9
+ assert_equal("The quick brown fox jumps over the lazy dog.",
10
+ Pango::Language.new("en").sample_string)
11
+ end
7
12
  end
@@ -2,7 +2,8 @@ class TestLayout < Test::Unit::TestCase
2
2
  include PangoTestUtils
3
3
 
4
4
  def setup
5
- @context = Pango::Context.new
5
+ @font_map = Pango::CairoFontMap.default
6
+ @context = @font_map.create_context
6
7
  @layout = Pango::Layout.new(@context)
7
8
  end
8
9
 
@@ -31,4 +32,9 @@ class TestLayout < Test::Unit::TestCase
31
32
  def test_ellipsized?
32
33
  assert_false(@layout.ellipsized?)
33
34
  end
35
+
36
+ def test_baseline
37
+ only_pango_version(1, 22, 0)
38
+ assert_kind_of(Integer, @layout.baseline)
39
+ end
34
40
  end
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file