cairo 1.7.0-x86-mswin32 → 1.8.0-x86-mswin32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of cairo might be problematic. Click here for more details.
- data/ChangeLog +32 -0
- data/NEWS +9 -1
- data/README +1 -0
- data/Rakefile +2 -2
- data/cairo/DLL_FAQ.txt +397 -0
- data/cairo/README.txt +53 -0
- data/cairo/USAGE.txt +94 -0
- data/cairo/bin/libcairo-2.dll +0 -0
- data/cairo/bin/libpng12-0.dll +0 -0
- data/cairo/bin/zlib1.dll +0 -0
- data/cairo/include/cairo/cairo-deprecated.h +0 -4
- data/cairo/include/cairo/cairo-features.h +7 -22
- data/cairo/include/cairo/cairo-pdf.h +1 -1
- data/cairo/include/cairo/cairo-ps.h +1 -1
- data/cairo/include/cairo/cairo-svg.h +1 -1
- data/cairo/include/cairo/cairo-version.h +8 -0
- data/cairo/include/cairo/cairo-win32.h +9 -1
- data/cairo/include/cairo/cairo.h +420 -32
- data/cairo/include/libpng12/png.h +3592 -0
- data/cairo/include/libpng12/pngconf.h +1481 -0
- data/cairo/include/png.h +36 -13
- data/cairo/include/pngconf.h +3 -3
- data/cairo/include/zconf.h +332 -0
- data/cairo/include/zlib.h +1357 -0
- data/cairo/lib/cairo.def +22 -0
- data/cairo/lib/cairo.lib +0 -0
- data/cairo/lib/libcairo.dll.a +0 -0
- data/cairo/lib/libpng.def +1 -0
- data/cairo/lib/libpng.lib +0 -0
- data/cairo/lib/libpng12.dll.a +0 -0
- data/cairo/lib/pkgconfig/cairo-pdf.pc +5 -5
- data/cairo/lib/pkgconfig/cairo-png.pc +5 -5
- data/cairo/lib/pkgconfig/cairo-ps.pc +5 -5
- data/cairo/lib/pkgconfig/cairo-svg.pc +4 -4
- data/cairo/lib/pkgconfig/cairo-win32-font.pc +4 -4
- data/cairo/lib/pkgconfig/cairo-win32.pc +4 -4
- data/cairo/lib/pkgconfig/cairo.pc +4 -4
- data/cairo/lib/pkgconfig/libpng.pc +3 -2
- data/cairo/lib/pkgconfig/libpng12.pc +3 -2
- data/cairo/lib/zdll.exp +0 -0
- data/cairo/lib/zdll.lib +0 -0
- data/cairo/lib/zlib.def +60 -0
- data/cairo/manifest/cairo-dev_1.8.0-1_win32.mft +76 -0
- data/cairo/manifest/cairo_1.8.0-1_win32.mft +5 -0
- data/cairo/manifest/{libpng-dev-1.2.29.mft → libpng-dev_1.2.32-1_win32.mft} +5 -2
- data/cairo/manifest/libpng_1.2.32-1_win32.mft +2 -0
- data/cairo/share/doc/{cairo-1.6.4-2 → cairo_1.8.0-1_win32}/COPYING +0 -0
- data/cairo/share/doc/{cairo-1.6.4-2 → cairo_1.8.0-1_win32}/COPYING-LGPL-2.1 +0 -0
- data/cairo/share/doc/{cairo-1.6.4-2 → cairo_1.8.0-1_win32}/COPYING-MPL-1.1 +0 -0
- data/cairo/share/gtk-doc/html/cairo/bindings-errors.html +15 -11
- data/cairo/share/gtk-doc/html/cairo/bindings-fonts.html +15 -11
- data/cairo/share/gtk-doc/html/cairo/bindings-memory.html +20 -16
- data/cairo/share/gtk-doc/html/cairo/bindings-overloading.html +16 -12
- data/cairo/share/gtk-doc/html/cairo/bindings-path.html +17 -13
- data/cairo/share/gtk-doc/html/cairo/bindings-patterns.html +25 -21
- data/cairo/share/gtk-doc/html/cairo/bindings-return-values.html +17 -13
- data/cairo/share/gtk-doc/html/cairo/bindings-streams.html +14 -10
- data/cairo/share/gtk-doc/html/cairo/bindings-surfaces.html +19 -15
- data/cairo/share/gtk-doc/html/cairo/cairo-context.html +2721 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-drawing.html +57 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-error-status.html +361 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-font-face.html +418 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-font-options.html +695 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-fonts.html +63 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-ft-font.html +318 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-image-surface.html +486 -0
- data/cairo/share/gtk-doc/html/cairo/{cairo-cairo-matrix-t.html → cairo-matrix.html} +137 -156
- data/cairo/share/gtk-doc/html/cairo/{cairo-Paths.html → cairo-paths.html} +275 -306
- data/cairo/share/gtk-doc/html/cairo/cairo-pattern.html +1524 -0
- data/cairo/share/gtk-doc/html/cairo/{cairo-PDF-Surfaces.html → cairo-pdf-surface.html} +60 -70
- data/cairo/share/gtk-doc/html/cairo/cairo-png-functions.html +332 -0
- data/cairo/share/gtk-doc/html/cairo/{cairo-PostScript-Surfaces.html → cairo-ps-surface.html} +131 -150
- data/cairo/share/gtk-doc/html/cairo/cairo-quartz-font.html +153 -0
- data/cairo/share/gtk-doc/html/cairo/{cairo-Quartz-Surfaces.html → cairo-quartz-surface.html} +53 -62
- data/cairo/share/gtk-doc/html/cairo/cairo-scaled-font.html +1051 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-support.html +54 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-surface.html +1064 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-surfaces.html +69 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-svg-surface.html +324 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-text.html +1264 -0
- data/cairo/share/gtk-doc/html/cairo/{cairo-Transformations.html → cairo-transformations.html} +98 -115
- data/cairo/share/gtk-doc/html/cairo/cairo-types.html +134 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-user-font.html +769 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-version-info.html +355 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-win32-font.html +366 -0
- data/cairo/share/gtk-doc/html/cairo/cairo-win32-surface.html +321 -0
- data/cairo/share/gtk-doc/html/cairo/{cairo-XLib-Surfaces.html → cairo-xlib-surface.html} +104 -121
- data/cairo/share/gtk-doc/html/cairo/cairo.devhelp +390 -405
- data/cairo/share/gtk-doc/html/cairo/cairo.devhelp2 +390 -405
- data/cairo/share/gtk-doc/html/cairo/index-1.2.html +63 -59
- data/cairo/share/gtk-doc/html/cairo/index-1.4.html +45 -41
- data/cairo/share/gtk-doc/html/cairo/index-1.6.html +29 -23
- data/cairo/share/gtk-doc/html/cairo/index-1.8.html +107 -0
- data/cairo/share/gtk-doc/html/cairo/index-all.html +759 -0
- data/cairo/share/gtk-doc/html/cairo/index.html +51 -41
- data/cairo/share/gtk-doc/html/cairo/index.sgml +478 -466
- data/cairo/share/gtk-doc/html/cairo/language-bindings.html +22 -18
- data/cairo/share/gtk-doc/html/cairo/style.css +14 -2
- data/cairo/share/man/man3/libpng.3 +443 -17
- data/cairo/share/man/man3/libpngpf.3 +618 -102
- data/cairo/share/man/man5/png.5 +1 -1
- data/cairo/src/tml/make/cairo_1.8.0-1_win32.log +1021 -0
- data/cairo/src/tml/make/cairo_1.8.0-1_win32.sh +68 -0
- data/cairo/src/tml/make/libpng_1.2.32-1_win32.log +269 -0
- data/cairo/src/tml/make/libpng_1.2.32-1_win32.sh +63 -0
- data/cairo/test/example_d.exe +0 -0
- data/cairo/test/minigzip_d.exe +0 -0
- data/cairo/test/testzlib_d.exe +0 -0
- data/cairo/test/untgz_d.exe +0 -0
- data/doc/en/cairo-context.html +81 -91
- data/doc/en/cairo-font-options.html +11 -26
- data/doc/en/cairo-text-cluster-flag.html +35 -0
- data/doc/en/cairo-user-font-face-text-to-glyphs-data.html +3 -3
- data/doc/en/cairo.html +38 -42
- data/doc/en/index.html +129 -142
- data/doc/ja/cairo-font-options.html +3 -25
- data/doc/ja/cairo-text-cluster-flag.html +46 -0
- data/doc/ja/cairo-user-font-face-text-to-glyphs-data.html +16 -15
- data/doc/ja/cairo.html +3 -7
- data/doc/ja/index.html +9 -17
- data/src/cairo.def +1 -1
- data/src/cairo.so +0 -0
- data/src/lib/cairo/constants.rb +3 -1
- data/src/libruby-cairo.a +0 -0
- data/src/rb_cairo.c +2 -2
- data/src/rb_cairo.h +5 -5
- data/src/rb_cairo_constants.c +12 -19
- data/src/rb_cairo_context.c +25 -21
- data/src/rb_cairo_font_face.c +44 -29
- data/src/rb_cairo_font_options.c +1 -23
- data/src/rb_cairo_scaled_font.c +5 -5
- data/test/test_constants.rb +6 -9
- data/test/test_context.rb +0 -12
- data/test/test_font_face.rb +7 -7
- data/test/test_font_options.rb +2 -21
- data/test/test_scaled_font.rb +3 -3
- data/test/test_text_to_glyphs_data.rb +19 -15
- metadata +68 -45
- data/cairo/make/cairo-1.6.4-2.sh +0 -55
- data/cairo/make/libpng-1.2.29.sh +0 -35
- data/cairo/manifest/cairo-1.6.4-2.mft +0 -6
- data/cairo/manifest/cairo-dev-1.6.4-2.mft +0 -72
- data/cairo/manifest/libpng-1.2.29.mft +0 -2
- data/cairo/share/gtk-doc/html/cairo/Drawing.html +0 -53
- data/cairo/share/gtk-doc/html/cairo/Fonts.html +0 -56
- data/cairo/share/gtk-doc/html/cairo/Support.html +0 -50
- data/cairo/share/gtk-doc/html/cairo/Surfaces.html +0 -65
- data/cairo/share/gtk-doc/html/cairo/cairo-Error-Handling.html +0 -328
- data/cairo/share/gtk-doc/html/cairo/cairo-Font-Options.html +0 -720
- data/cairo/share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html +0 -297
- data/cairo/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html +0 -484
- data/cairo/share/gtk-doc/html/cairo/cairo-PNG-Support.html +0 -345
- data/cairo/share/gtk-doc/html/cairo/cairo-Patterns.html +0 -1560
- data/cairo/share/gtk-doc/html/cairo/cairo-Quartz-Fonts.html +0 -161
- data/cairo/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html +0 -337
- data/cairo/share/gtk-doc/html/cairo/cairo-Scaled-Fonts.html +0 -823
- data/cairo/share/gtk-doc/html/cairo/cairo-Text.html +0 -836
- data/cairo/share/gtk-doc/html/cairo/cairo-Types.html +0 -143
- data/cairo/share/gtk-doc/html/cairo/cairo-Version-Information.html +0 -325
- data/cairo/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html +0 -381
- data/cairo/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html +0 -331
- data/cairo/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html +0 -427
- data/cairo/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html +0 -995
- data/cairo/share/gtk-doc/html/cairo/cairo-cairo-t.html +0 -2795
- data/cairo/share/gtk-doc/html/cairo/ix01.html +0 -693
- data/doc/en/cairo-lcd-filter.html +0 -39
- data/doc/ja/cairo-lcd-filter.html +0 -63
|
@@ -165,37 +165,15 @@
|
|
|
165
165
|
ちろん、<a href="cairo-subpixel-order.html">Cairo::SubpixelOrder</a>に定義されている定数を指定
|
|
166
166
|
することもできます。</li>
|
|
167
167
|
</ul></dd>
|
|
168
|
-
<dt><a name="label-23" id="label-23"><code>lcd_filter</code></a></dt><!-- RDLabel: "lcd_filter" -->
|
|
169
|
-
<dd>
|
|
170
|
-
<em>Since 1.7</em>: 使用するLCDフィルタを返します。詳しくは
|
|
171
|
-
<a href="cairo-lcd-filter.html">Cairo::LCDFilter</a>を見てください。
|
|
172
|
-
<ul>
|
|
173
|
-
<li>戻り値: <a href="cairo-lcd-filter.html">Cairo::LCDFilter</a>に定義されている定数のどれか</li>
|
|
174
|
-
</ul></dd>
|
|
175
|
-
<dt><a name="label-24" id="label-24"><code>lcd_filter=(<var>lcd_filter</var>)</code></a></dt><!-- RDLabel: "lcd_filter=" -->
|
|
176
|
-
<dt><a name="label-25" id="label-25"><code>set_lcd_filter(<var>lcd_filter</var>)</code></a></dt><!-- RDLabel: "set_lcd_filter" -->
|
|
177
|
-
<dd>
|
|
178
|
-
<em>Since 1.7</em>: 使用するLCDフィルタを指定します。LCDフィ
|
|
179
|
-
ルタは<a href="cairo-antialias.html#label-5">Cairo::Antialias::SUBPIXEL</a>アンチエイリアスモード
|
|
180
|
-
で描画する時にどのようにピクセルをフィルタするかを指定
|
|
181
|
-
します。詳しくは<a href="cairo-lcd-filter.html">Cairo::LCDFilter</a>を見てください。
|
|
182
|
-
<ul>
|
|
183
|
-
<li>lcd_filter: :defaultや:noneなど<a href="cairo-lcd-filter.html">Cairo::LCDFilter</a>に定義
|
|
184
|
-
されている定数名と同じもの。大文字小文字は関
|
|
185
|
-
係ありません。また、シンボルではなくて文字列で
|
|
186
|
-
"default"のように指定することもできます。もちろん、
|
|
187
|
-
<a href="cairo-lcd-filter.html">Cairo::LCDFilter</a>に定義されている定数を指定するこ
|
|
188
|
-
ともできます。</li>
|
|
189
|
-
</ul></dd>
|
|
190
168
|
</dl>
|
|
191
|
-
<h2><a name="label-
|
|
169
|
+
<h2><a name="label-23" id="label-23">参考</a></h2><!-- RDLabel: "参考" -->
|
|
192
170
|
<ul>
|
|
193
171
|
<li><a href="index.html#label-0">索引</a></li>
|
|
194
172
|
<li><a href="cairo-antialias.html">Cairo::Antialias</a></li>
|
|
195
|
-
<li><a href="cairo-lcd-filter.html">Cairo::LCDFilter</a></li>
|
|
196
173
|
</ul>
|
|
197
|
-
<h2><a name="label-
|
|
174
|
+
<h2><a name="label-24" id="label-24">変更履歴</a></h2><!-- RDLabel: "変更履歴" -->
|
|
198
175
|
<ul>
|
|
176
|
+
<li>2008-08-16: kou: 1.8.0対応。LCDFilter削除。</li>
|
|
199
177
|
<li>2008-08-16: kou: 1.7.4対応。</li>
|
|
200
178
|
<li>2007-05-24: kou: スタート。</li>
|
|
201
179
|
</ul>
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8" ?>
|
|
2
|
+
<!DOCTYPE html
|
|
3
|
+
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
|
4
|
+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
5
|
+
<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
|
|
6
|
+
<head>
|
|
7
|
+
<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
|
|
8
|
+
<title>Cairo::TextClusterFlagモジュール</title>
|
|
9
|
+
<link href="../doc.css" type="text/css" rel="stylesheet" />
|
|
10
|
+
</head>
|
|
11
|
+
<div class="footer">
|
|
12
|
+
<ul>
|
|
13
|
+
<li><a href="./">索引</a></li>
|
|
14
|
+
</ul>
|
|
15
|
+
|
|
16
|
+
</div>
|
|
17
|
+
</body>
|
|
18
|
+
|
|
19
|
+
<h1><a name="label-0" id="label-0">Cairo::TextClusterFlagモジュール</a></h1><!-- RDLabel: "Cairo::TextClusterFlagモジュール" -->
|
|
20
|
+
<p><em>Since 1.8</em>: テキストクラスタ対応のプロパティを指定しま
|
|
21
|
+
す。</p>
|
|
22
|
+
<h2><a name="label-1" id="label-1">定数</a></h2><!-- RDLabel: "定数" -->
|
|
23
|
+
<dl>
|
|
24
|
+
<dt><a name="label-2" id="label-2"><code>BACKWARD</code></a></dt><!-- RDLabel: "BACKWARD" -->
|
|
25
|
+
<dd>
|
|
26
|
+
クラスタ配列内のクラスタを後ろから順にグリフ配列内のグ
|
|
27
|
+
リフに対応させます。</dd>
|
|
28
|
+
</dl>
|
|
29
|
+
<h2><a name="label-3" id="label-3">参考</a></h2><!-- RDLabel: "参考" -->
|
|
30
|
+
<ul>
|
|
31
|
+
<li><a href="cairo-user-font-face-text-to-glyphs-data.html">Cairo::UserFontFace::TextToGlyphsData</a></li>
|
|
32
|
+
</ul>
|
|
33
|
+
<h2><a name="label-4" id="label-4">変更履歴</a></h2><!-- RDLabel: "変更履歴" -->
|
|
34
|
+
<ul>
|
|
35
|
+
<li>2008-09-26: kou: スタート。</li>
|
|
36
|
+
</ul>
|
|
37
|
+
|
|
38
|
+
<div class="footer">
|
|
39
|
+
<ul>
|
|
40
|
+
<li><a href="./">索引</a></li>
|
|
41
|
+
</ul>
|
|
42
|
+
|
|
43
|
+
</div>
|
|
44
|
+
</body>
|
|
45
|
+
|
|
46
|
+
</html>
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
バックに渡されるデータです。
|
|
22
22
|
<a href="cairo-user-font-face-text-to-glyphs-data.html#label-12">Cairo::UserFontFace::TextToGlyphsData#glyphs=</a>,
|
|
23
23
|
<a href="cairo-user-font-face-text-to-glyphs-data.html#label-9">Cairo::UserFontFace::TextToGlyphsData#clusters=</a>,
|
|
24
|
-
<a href="cairo-user-font-face-text-to-glyphs-data.html
|
|
24
|
+
<a href="cairo-user-font-face-text-to-glyphs-data.html">Cairo::UserFontFace::TextToGlyphsData#backward=</a>
|
|
25
25
|
で値を設定してください。</p>
|
|
26
26
|
<p>glyphsを設定する必要があるかどうかは
|
|
27
27
|
<a href="cairo-user-font-face-text-to-glyphs-data.html#label-13">Cairo::UserFontFace::TextToGlyphsData#need_glyphs?</a>でわかりま
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
<a href="cairo-user-font-face-text-to-glyphs-data.html#label-10">Cairo::UserFontFace::TextToGlyphsData#need_clusters?</a>でわかりま
|
|
31
31
|
す。</p>
|
|
32
32
|
<p>backwardを設定する必要があるかどうかは
|
|
33
|
-
<a href="cairo-user-font-face-text-to-glyphs-data.html
|
|
33
|
+
<a href="cairo-user-font-face-text-to-glyphs-data.html">Cairo::UserFontFace::TextToGlyphsData#need_backward?</a>でわかりま
|
|
34
34
|
す。</p>
|
|
35
35
|
<h2><a name="label-1" id="label-1">オブジェクト階層</a></h2><!-- RDLabel: "オブジェクト階層" -->
|
|
36
36
|
<ul>
|
|
@@ -60,27 +60,26 @@
|
|
|
60
60
|
</dl>
|
|
61
61
|
<h2><a name="label-4" id="label-4">インタンスメソッド</a></h2><!-- RDLabel: "インタンスメソッド" -->
|
|
62
62
|
<dl>
|
|
63
|
-
<dt><a name="label-5" id="label-5"><code>
|
|
63
|
+
<dt><a name="label-5" id="label-5"><code>cluster_flags</code></a></dt><!-- RDLabel: "cluster_flags" -->
|
|
64
64
|
<dd>
|
|
65
|
-
<em>Since 1.
|
|
65
|
+
<em>Since 1.8</em>
|
|
66
66
|
<ul>
|
|
67
|
-
<li>戻り値:
|
|
68
|
-
|
|
67
|
+
<li>戻り値: クラスタ対応情報のプロパティ。
|
|
68
|
+
（<a href="cairo-text-cluster-flag.html">Cairo::TextClusterFlag</a>）</li>
|
|
69
69
|
</ul></dd>
|
|
70
|
-
<dt><a name="label-6" id="label-6"><code>
|
|
70
|
+
<dt><a name="label-6" id="label-6"><code>cluster_flags=(<var>flags</var>)</code></a></dt><!-- RDLabel: "cluster_flags=" -->
|
|
71
71
|
<dd>
|
|
72
|
-
<em>Since 1.
|
|
72
|
+
<em>Since 1.8</em>
|
|
73
73
|
<ul>
|
|
74
|
-
<li>
|
|
75
|
-
|
|
74
|
+
<li>flags: クラスタ対応情報のプロパティ
|
|
75
|
+
（<a href="cairo-text-cluster-flag.html">Cairo::TextClusterFlag</a>）</li>
|
|
76
76
|
</ul></dd>
|
|
77
|
-
<dt><a name="label-7" id="label-7"><code>
|
|
77
|
+
<dt><a name="label-7" id="label-7"><code>need_cluster_flags?</code></a></dt><!-- RDLabel: "need_cluster_flags?" -->
|
|
78
78
|
<dd>
|
|
79
|
-
<em>Since 1.
|
|
79
|
+
<em>Since 1.8</em>
|
|
80
80
|
<ul>
|
|
81
|
-
<li>戻り値:
|
|
82
|
-
|
|
83
|
-
<code>false</code>。</li>
|
|
81
|
+
<li>戻り値: クラスタ対応情報のプロパティを計算する必要が
|
|
82
|
+
あるなら<code>true</code>、そうでない場合は<code>false</code>。</li>
|
|
84
83
|
</ul></dd>
|
|
85
84
|
<dt><a name="label-8" id="label-8"><code>clusters</code></a></dt><!-- RDLabel: "clusters" -->
|
|
86
85
|
<dd>
|
|
@@ -138,9 +137,11 @@
|
|
|
138
137
|
<li><a href="cairo-user-font-face.html#label-7">Cairo::UserFontFace#on_text_to_glyphs</a></li>
|
|
139
138
|
<li><a href="cairo-glyph.html">Cairo::Glyph</a></li>
|
|
140
139
|
<li><a href="cairo-text-cluster.html">Cairo::TextCluster</a></li>
|
|
140
|
+
<li><a href="cairo-text-cluster-flag.html">Cairo::TextClusterFlag</a></li>
|
|
141
141
|
</ul>
|
|
142
142
|
<h2><a name="label-15" id="label-15">変更履歴</a></h2><!-- RDLabel: "変更履歴" -->
|
|
143
143
|
<ul>
|
|
144
|
+
<li>2008-09-26: kou: 1.8.0対応。backward -> cluster_flags</li>
|
|
144
145
|
<li>2008-08-17: kou: スタート。</li>
|
|
145
146
|
</ul>
|
|
146
147
|
|
data/doc/ja/cairo.html
CHANGED
|
@@ -154,17 +154,13 @@ rcairoをビルドするのに使用したcairoのバージョンを示す
|
|
|
154
154
|
<dd>
|
|
155
155
|
現在rcairoと一緒に使用しているcairoのバージョンを示す
|
|
156
156
|
<code>[major, minor, micro]</code>という配列です。</dd>
|
|
157
|
-
<dt><a name="label-80" id="label-80"><code>
|
|
158
|
-
<dt><a name="label-81" id="label-81"><code>LCD_FILTER_FIR3</code></a></dt><!-- RDLabel: "LCD_FILTER_FIR3" -->
|
|
159
|
-
<dt><a name="label-82" id="label-82"><code>LCD_FILTER_FIR5</code></a></dt><!-- RDLabel: "LCD_FILTER_FIR5" -->
|
|
160
|
-
<dt><a name="label-83" id="label-83"><code>LCD_FILTER_INTRA_PIXEL</code></a></dt><!-- RDLabel: "LCD_FILTER_INTRA_PIXEL" -->
|
|
161
|
-
<dt><a name="label-84" id="label-84"><code>LCD_FILTER_NONE</code></a></dt><!-- RDLabel: "LCD_FILTER_NONE" -->
|
|
157
|
+
<dt><a name="label-80" id="label-80"><code>TEXT_CLUSTER_FLAG_BACKWARD</code></a></dt><!-- RDLabel: "TEXT_CLUSTER_FLAG_BACKWARD" -->
|
|
162
158
|
</dl>
|
|
163
|
-
<h2><a name="label-
|
|
159
|
+
<h2><a name="label-81" id="label-81">参考</a></h2><!-- RDLabel: "参考" -->
|
|
164
160
|
<ul>
|
|
165
161
|
<li><a href="index.html#label-0">索引</a></li>
|
|
166
162
|
</ul>
|
|
167
|
-
<h2><a name="label-
|
|
163
|
+
<h2><a name="label-82" id="label-82">変更履歴</a></h2><!-- RDLabel: "変更履歴" -->
|
|
168
164
|
<ul>
|
|
169
165
|
<li>2008-08-17: kou: rcairo 1.7対応。</li>
|
|
170
166
|
<li>2007-05-22: kou: スタート。</li>
|
data/doc/ja/index.html
CHANGED
|
@@ -57,11 +57,6 @@
|
|
|
57
57
|
<li><a href="cairo.html#label-42">Cairo::HINT_STYLE_MEDIUM</a></li>
|
|
58
58
|
<li><a href="cairo.html#label-43">Cairo::HINT_STYLE_NONE</a></li>
|
|
59
59
|
<li><a href="cairo.html#label-44">Cairo::HINT_STYLE_SLIGHT</a></li>
|
|
60
|
-
<li><a href="cairo.html#label-80">Cairo::LCD_FILTER_DEFAULT</a></li>
|
|
61
|
-
<li><a href="cairo.html#label-81">Cairo::LCD_FILTER_FIR3</a></li>
|
|
62
|
-
<li><a href="cairo.html#label-82">Cairo::LCD_FILTER_FIR5</a></li>
|
|
63
|
-
<li><a href="cairo.html#label-83">Cairo::LCD_FILTER_INTRA_PIXEL</a></li>
|
|
64
|
-
<li><a href="cairo.html#label-84">Cairo::LCD_FILTER_NONE</a></li>
|
|
65
60
|
<li><a href="cairo.html#label-45">Cairo::LINE_CAP_BUTT</a></li>
|
|
66
61
|
<li><a href="cairo.html#label-46">Cairo::LINE_CAP_ROUND</a></li>
|
|
67
62
|
<li><a href="cairo.html#label-47">Cairo::LINE_CAP_SQUARE</a></li>
|
|
@@ -96,6 +91,7 @@
|
|
|
96
91
|
<li><a href="cairo.html#label-76">Cairo::SUBPIXEL_ORDER_VRGB</a></li>
|
|
97
92
|
<li><a href="cairo.html#label-77">Cairo::SVG_VERSION_1_1</a></li>
|
|
98
93
|
<li><a href="cairo.html#label-78">Cairo::SVG_VERSION_1_2</a></li>
|
|
94
|
+
<li><a href="cairo.html#label-80">Cairo::TEXT_CLUSTER_FLAG_BACKWARD</a></li>
|
|
99
95
|
<li><a href="cairo.html#label-79">Cairo::VERSION</a></li>
|
|
100
96
|
<li><a href="cairo.html#label-2">Cairo.bindings_version</a></li>
|
|
101
97
|
<li><a href="cairo.html#label-4">Cairo.exit_application</a></li>
|
|
@@ -690,14 +686,14 @@
|
|
|
690
686
|
<li><a href="cairo-font-options.html#label-12">Cairo::FontOptions#hint_metrics=</a></li>
|
|
691
687
|
<li><a href="cairo-font-options.html#label-14">Cairo::FontOptions#hint_style</a></li>
|
|
692
688
|
<li><a href="cairo-font-options.html#label-15">Cairo::FontOptions#hint_style=</a></li>
|
|
693
|
-
<li><a href="cairo-font-options.html
|
|
694
|
-
<li><a href="cairo-font-options.html
|
|
689
|
+
<li><a href="cairo-font-options.html">Cairo::FontOptions#lcd_filter</a></li>
|
|
690
|
+
<li><a href="cairo-font-options.html">Cairo::FontOptions#lcd_filter=</a></li>
|
|
695
691
|
<li><a href="cairo-font-options.html#label-17">Cairo::FontOptions#merge</a></li>
|
|
696
692
|
<li><a href="cairo-font-options.html#label-18">Cairo::FontOptions#merge!</a></li>
|
|
697
693
|
<li><a href="cairo-font-options.html#label-7">Cairo::FontOptions#set_antialias</a></li>
|
|
698
694
|
<li><a href="cairo-font-options.html#label-13">Cairo::FontOptions#set_hint_metrics</a></li>
|
|
699
695
|
<li><a href="cairo-font-options.html#label-16">Cairo::FontOptions#set_hint_style</a></li>
|
|
700
|
-
<li><a href="cairo-font-options.html
|
|
696
|
+
<li><a href="cairo-font-options.html">Cairo::FontOptions#set_lcd_filter</a></li>
|
|
701
697
|
<li><a href="cairo-font-options.html#label-22">Cairo::FontOptions#set_subpixel_order</a></li>
|
|
702
698
|
<li><a href="cairo-font-options.html#label-20">Cairo::FontOptions#subpixel_order</a></li>
|
|
703
699
|
<li><a href="cairo-font-options.html#label-21">Cairo::FontOptions#subpixel_order=</a></li>
|
|
@@ -769,12 +765,6 @@
|
|
|
769
765
|
<li><a href="cairo-invalid-string-error.html">Cairo::InvalidStringError</a></li>
|
|
770
766
|
<li><a href="cairo-invalid-visual-error.html">Cairo::InvalidVisualError</a></li>
|
|
771
767
|
<li><a href="cairo-invalid-weight.html">Cairo::InvalidWeight</a></li>
|
|
772
|
-
<li><a href="cairo-lcd-filter.html">Cairo::LCDFilter</a></li>
|
|
773
|
-
<li><a href="cairo-lcd-filter.html#label-2">Cairo::LCDFilter::DEFAULT</a></li>
|
|
774
|
-
<li><a href="cairo-lcd-filter.html#label-3">Cairo::LCDFilter::FIR3</a></li>
|
|
775
|
-
<li><a href="cairo-lcd-filter.html#label-4">Cairo::LCDFilter::FIR5</a></li>
|
|
776
|
-
<li><a href="cairo-lcd-filter.html#label-5">Cairo::LCDFilter::INTRA_PIXEL</a></li>
|
|
777
|
-
<li><a href="cairo-lcd-filter.html#label-6">Cairo::LCDFilter::NONE</a></li>
|
|
778
768
|
<li><a href="cairo-line-cap.html">Cairo::LineCap</a></li>
|
|
779
769
|
<li><a href="cairo-line-cap.html#label-2">Cairo::LineCap::BUTT</a></li>
|
|
780
770
|
<li><a href="cairo-line-cap.html#label-3">Cairo::LineCap::ROUND</a></li>
|
|
@@ -1101,6 +1091,8 @@
|
|
|
1101
1091
|
<li><a href="cairo-text-cluster.html#label-7">Cairo::TextCluster#set_num_bytes</a></li>
|
|
1102
1092
|
<li><a href="cairo-text-cluster.html#label-10">Cairo::TextCluster#set_num_glyphs</a></li>
|
|
1103
1093
|
<li><a href="cairo-text-cluster.html#label-11">Cairo::TextCluster#to_s</a></li>
|
|
1094
|
+
<li><a href="cairo-text-cluster-flag.html">Cairo::TextClusterFlag</a></li>
|
|
1095
|
+
<li><a href="cairo-text-cluster-flag.html#label-2">Cairo::TextClusterFlag::BACKWARD</a></li>
|
|
1104
1096
|
<li><a href="cairo-text-extents.html">Cairo::TextExtents</a></li>
|
|
1105
1097
|
<li><a href="cairo-text-extents.html#label-3">Cairo::TextExtents.new</a></li>
|
|
1106
1098
|
<li><a href="cairo-text-extents.html#label-5">Cairo::TextExtents#height</a></li>
|
|
@@ -1136,13 +1128,13 @@
|
|
|
1136
1128
|
<li><a href="cairo-user-font-face.html#label-8">Cairo::UserFontFace#on_unicode_to_glyph</a></li>
|
|
1137
1129
|
<li><a href="cairo-user-font-face-text-to-glyphs-data.html">Cairo::UserFontFace::TextToGlyphsData</a></li>
|
|
1138
1130
|
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-3">Cairo::UserFontFace::TextToGlyphsData.new</a></li>
|
|
1139
|
-
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-
|
|
1140
|
-
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-
|
|
1131
|
+
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-5">Cairo::UserFontFace::TextToGlyphsData#cluster_flags</a></li>
|
|
1132
|
+
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-6">Cairo::UserFontFace::TextToGlyphsData#cluster_flags=</a></li>
|
|
1141
1133
|
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-8">Cairo::UserFontFace::TextToGlyphsData#clusters</a></li>
|
|
1142
1134
|
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-9">Cairo::UserFontFace::TextToGlyphsData#clusters=</a></li>
|
|
1143
1135
|
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-11">Cairo::UserFontFace::TextToGlyphsData#glyphs</a></li>
|
|
1144
1136
|
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-12">Cairo::UserFontFace::TextToGlyphsData#glyphs=</a></li>
|
|
1145
|
-
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-7">Cairo::UserFontFace::TextToGlyphsData#
|
|
1137
|
+
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-7">Cairo::UserFontFace::TextToGlyphsData#need_cluster_flags?</a></li>
|
|
1146
1138
|
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-10">Cairo::UserFontFace::TextToGlyphsData#need_clusters?</a></li>
|
|
1147
1139
|
<li><a href="cairo-user-font-face-text-to-glyphs-data.html#label-13">Cairo::UserFontFace::TextToGlyphsData#need_glyphs?</a></li>
|
|
1148
1140
|
<li><a href="cairo-user-font-immutable.html">Cairo::UserFontImmutable</a></li>
|
data/src/cairo.def
CHANGED
data/src/cairo.so
CHANGED
|
Binary file
|
data/src/lib/cairo/constants.rb
CHANGED
|
@@ -18,5 +18,7 @@ module Cairo
|
|
|
18
18
|
define_constants.call(PathDataType, nil, Path)
|
|
19
19
|
define_constants.call(SVGVersion, nil, SVGSurface)
|
|
20
20
|
define_constants.call(SVGVersion, "SVG")
|
|
21
|
-
|
|
21
|
+
if const_defined?(:TextClusterFlag)
|
|
22
|
+
define_constants.call(TextClusterFlag, "TEXT_CLUSTER_FLAG")
|
|
23
|
+
end
|
|
22
24
|
end
|
data/src/libruby-cairo.a
CHANGED
|
Binary file
|
data/src/rb_cairo.c
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Ruby Cairo Binding
|
|
4
4
|
*
|
|
5
5
|
* $Author: kou $
|
|
6
|
-
* $Date: 2008-
|
|
6
|
+
* $Date: 2008-09-26 13:58:33 $
|
|
7
7
|
*
|
|
8
8
|
* Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
|
|
9
9
|
* Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
|
|
@@ -76,7 +76,7 @@ Init_cairo ()
|
|
|
76
76
|
|
|
77
77
|
rb_define_const (rb_mCairo, "BINDINGS_VERSION",
|
|
78
78
|
rb_ary_new3 (4,
|
|
79
|
-
INT2FIX (1), INT2FIX (
|
|
79
|
+
INT2FIX (1), INT2FIX (8), INT2FIX (0), Qnil));
|
|
80
80
|
|
|
81
81
|
rb_define_module_function (rb_mCairo, "satisfied_version?",
|
|
82
82
|
rb_cairo_satisfied_version, -1);
|
data/src/rb_cairo.h
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Ruby Cairo Binding
|
|
4
4
|
*
|
|
5
5
|
* $Author: kou $
|
|
6
|
-
* $Date: 2008-
|
|
6
|
+
* $Date: 2008-09-19 12:56:27 $
|
|
7
7
|
*
|
|
8
8
|
* Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
|
|
9
9
|
* Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
|
|
@@ -233,8 +233,8 @@ VALUE rb_cairo_surface_to_ruby_object_with_destroy
|
|
|
233
233
|
#define RVAL2CRPSLEVEL(obj) (rb_cairo_ps_level_from_ruby_object(obj))
|
|
234
234
|
# endif
|
|
235
235
|
#endif
|
|
236
|
-
#if CAIRO_CHECK_VERSION(1, 7,
|
|
237
|
-
#define
|
|
236
|
+
#if CAIRO_CHECK_VERSION(1, 7, 6)
|
|
237
|
+
#define RVAL2CRTEXTCLUSTERFLAGS(obj) (rb_cairo_text_cluster_flags_from_ruby_object(obj))
|
|
238
238
|
#endif
|
|
239
239
|
|
|
240
240
|
cairo_operator_t rb_cairo_operator_from_ruby_object (VALUE obj);
|
|
@@ -260,8 +260,8 @@ cairo_svg_version_t rb_cairo_svg_version_from_ruby_object (VALUE obj);
|
|
|
260
260
|
cairo_ps_level_t rb_cairo_ps_level_from_ruby_object (VALUE obj);
|
|
261
261
|
# endif
|
|
262
262
|
#endif
|
|
263
|
-
#if CAIRO_CHECK_VERSION(1, 7,
|
|
264
|
-
|
|
263
|
+
#if CAIRO_CHECK_VERSION(1, 7, 6)
|
|
264
|
+
cairo_text_cluster_flags_t rb_cairo_text_cluster_flags_from_ruby_object (VALUE obj);
|
|
265
265
|
#endif
|
|
266
266
|
|
|
267
267
|
void rb_cairo_check_status (cairo_status_t status);
|
data/src/rb_cairo_constants.c
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Ruby Cairo Binding
|
|
4
4
|
*
|
|
5
5
|
* $Author: kou $
|
|
6
|
-
* $Date: 2008-
|
|
6
|
+
* $Date: 2008-09-19 12:56:27 $
|
|
7
7
|
*
|
|
8
8
|
* Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
|
|
9
9
|
* Copyright 2004-2005 MenTaLguY <mental@rydia.com>
|
|
@@ -33,7 +33,7 @@ VALUE rb_mCairo_Extend;
|
|
|
33
33
|
VALUE rb_mCairo_Filter;
|
|
34
34
|
VALUE rb_mCairo_SVGVersion = Qnil;
|
|
35
35
|
VALUE rb_mCairo_PSLevel = Qnil;
|
|
36
|
-
VALUE
|
|
36
|
+
VALUE rb_mCairo_TextClusterFlag = Qnil;
|
|
37
37
|
|
|
38
38
|
#define CAIRO_OPERATOR_MIN CAIRO_OPERATOR_CLEAR
|
|
39
39
|
#define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_SATURATE
|
|
@@ -86,8 +86,8 @@ VALUE rb_mCairo_LCDFilter = Qnil;
|
|
|
86
86
|
#define CAIRO_PS_LEVEL_MIN CAIRO_PS_LEVEL_2
|
|
87
87
|
#define CAIRO_PS_LEVEL_MAX CAIRO_PS_LEVEL_3
|
|
88
88
|
|
|
89
|
-
#define
|
|
90
|
-
#define
|
|
89
|
+
#define CAIRO_TEXT_CLUSTER_FLAG_MIN 0
|
|
90
|
+
#define CAIRO_TEXT_CLUSTER_FLAG_MAX CAIRO_TEXT_CLUSTER_FLAG_BACKWARD
|
|
91
91
|
|
|
92
92
|
#define DEFINE_RVAL2ENUM(name, const_name) \
|
|
93
93
|
cairo_ ## name ## _t \
|
|
@@ -139,8 +139,8 @@ DEFINE_RVAL2ENUM(ps_level, PS_LEVEL)
|
|
|
139
139
|
# endif
|
|
140
140
|
#endif
|
|
141
141
|
|
|
142
|
-
#if CAIRO_CHECK_VERSION(1, 7,
|
|
143
|
-
DEFINE_RVAL2ENUM(
|
|
142
|
+
#if CAIRO_CHECK_VERSION(1, 7, 6)
|
|
143
|
+
DEFINE_RVAL2ENUM(text_cluster_flags, TEXT_CLUSTER_FLAG)
|
|
144
144
|
#endif
|
|
145
145
|
|
|
146
146
|
#if defined(RB_CAIRO_PLATFORM_WIN32) && !defined(PS_LEVEL_ENUM_DEFINED)
|
|
@@ -468,18 +468,11 @@ Init_cairo_constants (void)
|
|
|
468
468
|
# endif
|
|
469
469
|
#endif
|
|
470
470
|
|
|
471
|
-
#if CAIRO_CHECK_VERSION(1, 7,
|
|
472
|
-
/*
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
INT2FIX (CAIRO_LCD_FILTER_NONE));
|
|
478
|
-
rb_define_const (rb_mCairo_LCDFilter, "INTRA_PIXEL",
|
|
479
|
-
INT2FIX (CAIRO_LCD_FILTER_INTRA_PIXEL));
|
|
480
|
-
rb_define_const (rb_mCairo_LCDFilter, "FIR3",
|
|
481
|
-
INT2FIX (CAIRO_LCD_FILTER_FIR3));
|
|
482
|
-
rb_define_const (rb_mCairo_LCDFilter, "FIR5",
|
|
483
|
-
INT2FIX (CAIRO_LCD_FILTER_FIR5));
|
|
471
|
+
#if CAIRO_CHECK_VERSION(1, 7, 6)
|
|
472
|
+
/* cairo_text_cluster_flags_t */
|
|
473
|
+
rb_mCairo_TextClusterFlag =
|
|
474
|
+
rb_define_module_under (rb_mCairo, "TextClusterFlag");
|
|
475
|
+
rb_define_const (rb_mCairo_TextClusterFlag, "BACKWARD",
|
|
476
|
+
INT2FIX (CAIRO_TEXT_CLUSTER_FLAG_BACKWARD));
|
|
484
477
|
#endif
|
|
485
478
|
}
|
data/src/rb_cairo_context.c
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Ruby Cairo Binding
|
|
4
4
|
*
|
|
5
5
|
* $Author: kou $
|
|
6
|
-
* $Date: 2008-
|
|
6
|
+
* $Date: 2008-09-26 13:52:08 $
|
|
7
7
|
*
|
|
8
8
|
* Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
|
|
9
9
|
* Copyright 2004-2005 MenTaLguY <mental@rydia.com>
|
|
@@ -110,13 +110,26 @@ cr_allocate (VALUE klass)
|
|
|
110
110
|
return Data_Wrap_Struct (klass, NULL, cr_context_free, NULL);
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
+
static void
|
|
114
|
+
cr_set_user_data (cairo_t *cr, const cairo_user_data_key_t *key,
|
|
115
|
+
void *user_data, cairo_destroy_func_t destroy)
|
|
116
|
+
{
|
|
117
|
+
#if CAIRO_CHECK_VERSION(1, 4, 0)
|
|
118
|
+
cairo_set_user_data (cr, key, user_data, destroy);
|
|
119
|
+
#else
|
|
120
|
+
cairo_surface_t *surface;
|
|
121
|
+
surface = cairo_get_target (cr);
|
|
122
|
+
cairo_surface_set_user_data (surface, key, user_data, destroy);
|
|
123
|
+
#endif
|
|
124
|
+
}
|
|
125
|
+
|
|
113
126
|
static VALUE
|
|
114
127
|
cr_destroy (VALUE self)
|
|
115
128
|
{
|
|
116
129
|
cairo_t *cr;
|
|
117
130
|
|
|
118
131
|
cr = _SELF;
|
|
119
|
-
|
|
132
|
+
cr_set_user_data (cr, &cr_object_holder_key, NULL, NULL);
|
|
120
133
|
cairo_destroy (cr);
|
|
121
134
|
|
|
122
135
|
DATA_PTR (self) = NULL;
|
|
@@ -140,9 +153,10 @@ cr_initialize (VALUE self, VALUE target)
|
|
|
140
153
|
cr = cairo_create (RVAL2CRSURFACE (target));
|
|
141
154
|
cr_check_status (cr);
|
|
142
155
|
rb_ivar_set (self, cr_id_surface, target);
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
156
|
+
cr_set_user_data (cr,
|
|
157
|
+
&cr_object_holder_key,
|
|
158
|
+
cr_object_holder_new(self),
|
|
159
|
+
cr_object_holder_free);
|
|
146
160
|
DATA_PTR (self) = cr;
|
|
147
161
|
if (rb_block_given_p ())
|
|
148
162
|
result = rb_ensure (rb_yield, self, cr_destroy_with_destroy_check, self);
|
|
@@ -1191,16 +1205,10 @@ cr_show_glyphs (VALUE self, VALUE rb_glyphs)
|
|
|
1191
1205
|
return self;
|
|
1192
1206
|
}
|
|
1193
1207
|
|
|
1194
|
-
#if CAIRO_CHECK_VERSION(1,
|
|
1195
|
-
static VALUE
|
|
1196
|
-
cr_has_show_text_glyphs (VALUE self)
|
|
1197
|
-
{
|
|
1198
|
-
return CBOOL2RVAL (cairo_has_show_text_glyphs (_SELF));
|
|
1199
|
-
}
|
|
1200
|
-
|
|
1208
|
+
#if CAIRO_CHECK_VERSION(1, 8, 0)
|
|
1201
1209
|
static VALUE
|
|
1202
1210
|
cr_show_text_glyphs (VALUE self, VALUE rb_utf8, VALUE rb_glyphs,
|
|
1203
|
-
VALUE rb_clusters, VALUE
|
|
1211
|
+
VALUE rb_clusters, VALUE rb_cluster_flags)
|
|
1204
1212
|
{
|
|
1205
1213
|
cairo_t *cr;
|
|
1206
1214
|
const char *utf8;
|
|
@@ -1209,7 +1217,7 @@ cr_show_text_glyphs (VALUE self, VALUE rb_utf8, VALUE rb_glyphs,
|
|
|
1209
1217
|
int num_glyphs = 0;
|
|
1210
1218
|
cairo_text_cluster_t *clusters = NULL;
|
|
1211
1219
|
int num_clusters = 0;
|
|
1212
|
-
|
|
1220
|
+
cairo_text_cluster_flags_t cluster_flags;
|
|
1213
1221
|
|
|
1214
1222
|
cr = _SELF;
|
|
1215
1223
|
utf8 = RSTRING_PTR (rb_utf8);
|
|
@@ -1217,11 +1225,11 @@ cr_show_text_glyphs (VALUE self, VALUE rb_utf8, VALUE rb_glyphs,
|
|
|
1217
1225
|
rb_cairo__glyphs_from_ruby_object (rb_glyphs, &glyphs, &num_glyphs);
|
|
1218
1226
|
rb_cairo__text_clusters_from_ruby_object (rb_clusters,
|
|
1219
1227
|
&clusters, &num_clusters);
|
|
1220
|
-
|
|
1228
|
+
cluster_flags = RVAL2CRTEXTCLUSTERFLAGS (rb_cluster_flags);
|
|
1221
1229
|
cairo_show_text_glyphs (cr, utf8, utf8_len,
|
|
1222
1230
|
glyphs, num_glyphs,
|
|
1223
1231
|
clusters, num_clusters,
|
|
1224
|
-
|
|
1232
|
+
cluster_flags);
|
|
1225
1233
|
if (glyphs)
|
|
1226
1234
|
cairo_glyph_free (glyphs);
|
|
1227
1235
|
if (clusters)
|
|
@@ -1640,11 +1648,7 @@ Init_cairo_context (void)
|
|
|
1640
1648
|
#endif
|
|
1641
1649
|
rb_define_method (rb_cCairo_Context, "show_text", cr_show_text, 1);
|
|
1642
1650
|
rb_define_method (rb_cCairo_Context, "show_glyphs", cr_show_glyphs, 1);
|
|
1643
|
-
#if CAIRO_CHECK_VERSION(1,
|
|
1644
|
-
rb_define_method (rb_cCairo_Context, "have_show_text_glyphs?",
|
|
1645
|
-
cr_has_show_text_glyphs, 0);
|
|
1646
|
-
rb_define_alias (rb_cCairo_Context,
|
|
1647
|
-
"has_show_text_glyphs?", "have_show_text_glyphs?");
|
|
1651
|
+
#if CAIRO_CHECK_VERSION(1, 8, 0)
|
|
1648
1652
|
rb_define_method (rb_cCairo_Context, "show_text_glyphs",
|
|
1649
1653
|
cr_show_text_glyphs, 4);
|
|
1650
1654
|
#endif
|