cairo 1.7.0 → 1.8.0

data/src/tml/make/libpng_1.2.32-1_win32.sh

@@ -0,0 +1,63 @@
+# This is a shell script that calls functions and scripts from
+# tml@iki.fi's personal work environment. It is not expected to be
+# usable unmodified by others, and is included only for reference.
+
+MOD=libpng
+VER=1.2.32
+REV=1
+ARCH=win32
+
+THIS=${MOD}_${VER}-${REV}_${ARCH}
+
+RUNZIP=${THIS}.zip
+DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip
+
+HEX=`echo $THIS | md5sum | cut -d' ' -f1`
+TARGET=c:/devel/target/$HEX
+
+ZLIB=`latest --arch=${ARCH} zlib`
+
+usedev
+usemsvs6
+
+(
+
+set -x
+
+# Avoid the silly "relink" stuff in libtool
+sed -e 's/need_relink=yes/need_relink=no # no way --tml/' <ltmain.sh >ltmain.temp && mv ltmain.temp ltmain.sh
+
+patch -p0 <<'EOF' &&
+--- Makefile.in
++++ Makefile.in
+@@ -1285,7 +1285,7 @@
+ # do evil things to libpng to cause libpng12 to be used
+ install-exec-hook:
+ 	cd $(DESTDIR)$(bindir); rm -f libpng-config
+-	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
++	-cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
+ 	@set -x;\
+ 	cd $(DESTDIR)$(libdir);\
+ 	for ext in a la so sl dylib; do\
+EOF
+
+CC='gcc -mtune=pentium3 -mthreads -mms-bitfields' CPPFLAGS="-I /devel/dist/${ARCH}/${ZLIB}/include" LDFLAGS="-L/devel/dist/${ARCH}/${ZLIB}/lib -Wl,--enable-auto-image-base" CFLAGS=-O2 ./configure --disable-static --without-libpng-compat --without-binconfigs --prefix=$TARGET &&
+make install &&
+
+rm -f /tmp/$RUNZIP /tmp/$DEVZIP &&
+
+(cd /devel/target/$HEX &&
+zip /tmp/$RUNZIP bin/libpng12-0.dll &&
+zip -r -D /tmp/$DEVZIP include  &&
+zip /tmp/$DEVZIP lib/libpng12.dll.a &&
+pexports bin/libpng12-0.dll >lib/libpng.def &&
+lib -machine:X86 -def:lib/libpng.def -name:libpng12-0.dll -out:lib/libpng.lib &&
+zip /tmp/$DEVZIP lib/libpng.def lib/libpng.lib &&
+zip /tmp/$DEVZIP lib/pkgconfig/libpng*.pc &&
+zip -r -D /tmp/$DEVZIP share/man
+)
+
+) 2>&1 | tee /devel/src/tml/make/$THIS.log &&
+
+(cd /devel && zip /tmp/$DEVZIP src/tml/make/$THIS.{sh,log}) &&
+manifestify /tmp/$RUNZIP /tmp/$DEVZIP

data/test/test_constants.rb

@@ -1,19 +1,16 @@
 require 'cairo'
 
 class ConstantsTest < Test::Unit::TestCase
-  def test_lcd_filter
-    constant_name = "LCDFilter"
-    unless Cairo.satisfied_version?(1, 7, 2)
+  def test_text_cluster_flags
+    constant_name = "TextClusterFlag"
+    unless Cairo.satisfied_version?(1, 7, 6)
       assert_false(Cairo.const_defined?(constant_name))
       return
     end
 
     assert_true(Cairo.const_defined?(constant_name))
-    assert_equal((0..4).to_a,
-                 [Cairo::LCDFilter::DEFAULT,
-                  Cairo::LCDFilter::NONE,
-                  Cairo::LCDFilter::INTRA_PIXEL,
-                  Cairo::LCDFilter::FIR3,
-                  Cairo::LCDFilter::FIR5])
+    assert_equal((0..1).to_a,
+                 [0,
+                  Cairo::TextClusterFlag::BACKWARD])
   end
 end

data/test/test_context.rb

@@ -49,18 +49,6 @@ class ContextTest < Test::Unit::TestCase
     assert_equal("sans", context.font_face.family)
   end
 
-  def test_have_show_text_glyphs?
-    only_cairo_version(1, 7, 2)
-
-    pdf_surface = Cairo::PDFSurface.new(@output, 10, 10)
-    context = Cairo::Context.new(pdf_surface)
-    assert_true(context.have_show_text_glyphs?)
-
-    image_surface = Cairo::ImageSurface.new(10, 10)
-    context = Cairo::Context.new(image_surface)
-    assert_false(context.have_show_text_glyphs?)
-  end
-
   def test_text_to_glyphs
     only_cairo_version(1, 7, 2)
 

data/test/test_font_face.rb

@@ -54,7 +54,7 @@ class FontFaceTest < Test::Unit::TestCase
                                         Cairo::Matrix.identity,
                                         Cairo::Matrix.identity,
                                         Cairo::FontOptions.new)
-    assert_equal([[], [], false],
+    assert_equal([[], [], 0],
                  scaled_font.text_to_glyphs(0, 0, "text"))
   end
 
@@ -77,7 +77,7 @@ class FontFaceTest < Test::Unit::TestCase
     face.on_text_to_glyphs do |*args|
       text_to_glyphs_args << args
       scaled_font, utf8, data = args
-      data.backward = true
+      data.cluster_flags = :backward
     end
 
     unicode_to_glyph_args = []
@@ -102,7 +102,7 @@ class FontFaceTest < Test::Unit::TestCase
                    [Cairo::ScaledFont, ?e],
                    [Cairo::ScaledFont, ?x],
                    [Cairo::ScaledFont, ?t]],
-                  [[], [], true]],
+                  [[], [], Cairo::TextClusterFlag::BACKWARD]],
                  [classify_cairo_object(init_args),
                   classify_cairo_object(render_glyph_args),
                   classify_cairo_object(text_to_glyphs_args),
@@ -133,7 +133,7 @@ class FontFaceTest < Test::Unit::TestCase
       def text_to_glyphs(*args)
         @text_to_glyphs_args << args
         scaled_font, utf8, data = args
-        data.backward = true
+        data.cluster_flags = :backward
       end
 
       def unicode_to_glyph(*args)
@@ -164,7 +164,7 @@ class FontFaceTest < Test::Unit::TestCase
                    [Cairo::ScaledFont, ?e],
                    [Cairo::ScaledFont, ?x],
                    [Cairo::ScaledFont, ?t]],
-                  [[], [], true]],
+                  [[], [], Cairo::TextClusterFlag::BACKWARD]],
                  [classify_cairo_object(face.init_args),
                   classify_cairo_object(face.render_glyph_args),
                   classify_cairo_object(face.text_to_glyphs_args),
@@ -191,7 +191,7 @@ class FontFaceTest < Test::Unit::TestCase
     face.on_text_to_glyphs do |*args|
       text_to_glyphs_args << args
       scaled_font, utf8, data = args
-      data.backward = true
+      data.cluster_flags = :backward
     end
 
     unicode_to_glyph_args = []
@@ -220,7 +220,7 @@ class FontFaceTest < Test::Unit::TestCase
                   [],
                   [],
                   [],
-                  [[], [], true]],
+                  [[], [], Cairo::TextClusterFlag::BACKWARD]],
                  [classify_cairo_object(init_args),
                   classify_cairo_object(render_glyph_args),
                   classify_cairo_object(text_to_glyphs_args),

data/test/test_font_options.rb

@@ -7,26 +7,7 @@ class FontOptionsTest < Test::Unit::TestCase
     @options = Cairo::FontOptions.new
   end
 
-  def test_lcd_filter
-    only_cairo_version(1, 7, 2)
-
-    assert_equal(Cairo::LCDFilter::DEFAULT, @options.lcd_filter)
-    @options.lcd_filter = :fir3
-    assert_equal(Cairo::LCDFilter::FIR3, @options.lcd_filter)
-
-    assert_invalid_lcd_filter(Cairo::LCDFilter::DEFAULT - 1)
-    assert_invalid_lcd_filter(Cairo::LCDFilter::FIR5 + 1)
-  end
-
-  def assert_invalid_lcd_filter(value)
-    options = Cairo::FontOptions.new
-    exception = assert_raise(ArgumentError) do
-      options.lcd_filter = value
-    end
-    min = Cairo::LCDFilter::DEFAULT
-    max = Cairo::LCDFilter::FIR5
-    assert_equal("invalid lcd_filter: #{value} " +
-                 "(expect #{min} <= lcd_filter <= #{max})",
-                 exception.message)
+  def test_something
+    # WRITE ME!
   end
 end

data/test/test_scaled_font.rb

@@ -17,7 +17,7 @@ class ScaledFontTest < Test::Unit::TestCase
   end
 
   def test_text_to_glyphs
-    only_cairo_version(1, 7, 2)
+    only_cairo_version(1, 7, 6)
 
     surface = Cairo::PDFSurface.new(StringIO.new, 10, 10)
     context = Cairo::Context.new(surface)
@@ -27,8 +27,8 @@ class ScaledFontTest < Test::Unit::TestCase
                                         Cairo::FontOptions.new)
     expected_glyphs = []
     expected_clusters = []
-    expected_backward = false
-    assert_equal([expected_glyphs, expected_clusters, expected_backward],
+    expected_cluster_flags = 0
+    assert_equal([expected_glyphs, expected_clusters, expected_cluster_flags],
                  scaled_font.text_to_glyphs(0, 0, "text"))
   end
 end

data/test/test_text_to_glyphs_data.rb

@@ -4,44 +4,48 @@ class TextToGlyphsDataTest < Test::Unit::TestCase
   include CairoTestUtils
 
   def test_new
-    only_cairo_version(1, 7, 2)
+    only_cairo_version(1, 7, 6)
 
     data = Cairo::UserFontFace::TextToGlyphsData.new(false, false, false)
     assert_equal([false, false, false],
-                 [data.need_glyphs?, data.need_clusters?, data.need_backward?])
+                 [data.need_glyphs?, data.need_clusters?,
+                  data.need_cluster_flags?])
 
     data = Cairo::UserFontFace::TextToGlyphsData.new(true, false, false)
     assert_equal([true, false, false],
-                 [data.need_glyphs?, data.need_clusters?, data.need_backward?])
+                 [data.need_glyphs?, data.need_clusters?,
+                  data.need_cluster_flags?])
 
     data = Cairo::UserFontFace::TextToGlyphsData.new(false, true, false)
     assert_equal([false, true, false],
-                 [data.need_glyphs?, data.need_clusters?, data.need_backward?])
+                 [data.need_glyphs?, data.need_clusters?,
+                  data.need_cluster_flags?])
 
     data = Cairo::UserFontFace::TextToGlyphsData.new(false, false, true)
     assert_equal([false, false, true],
-                 [data.need_glyphs?, data.need_clusters?, data.need_backward?])
+                 [data.need_glyphs?, data.need_clusters?,
+                  data.need_cluster_flags?])
   end
 
   def test_accessor
-    only_cairo_version(1, 7, 2)
+    only_cairo_version(1, 7, 6)
 
     data = Cairo::UserFontFace::TextToGlyphsData.new(true, true, true)
-    assert_equal([nil, nil, false],
-                 [data.glyphs, data.clusters, data.backward?])
+    assert_equal([nil, nil, 0],
+                 [data.glyphs, data.clusters, data.cluster_flags])
 
     glyph = Cairo::Glyph.new(0, 5, 10)
     data.glyphs = [glyph]
-    assert_equal([[glyph], nil, false],
-                 [data.glyphs, data.clusters, data.backward?])
+    assert_equal([[glyph], nil, 0],
+                 [data.glyphs, data.clusters, data.cluster_flags])
 
     cluster = Cairo::TextCluster.new(0, 1)
     data.clusters = [cluster]
-    assert_equal([[glyph], [cluster], false],
-                 [data.glyphs, data.clusters, data.backward?])
+    assert_equal([[glyph], [cluster], 0],
+                 [data.glyphs, data.clusters, data.cluster_flags])
 
-    data.backward = true
-    assert_equal([[glyph], [cluster], true],
-                 [data.glyphs, data.clusters, data.backward?])
+    data.cluster_flags = :backward
+    assert_equal([[glyph], [cluster], Cairo::TextClusterFlag::BACKWARD],
+                 [data.glyphs, data.clusters, data.cluster_flags])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cairo
 version: !ruby/object:Gem::Version 
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Evan Marin
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-17 00:00:00 +09:00
+date: 2008-09-26 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -83,7 +83,6 @@ files:
 - doc/en/cairo-invalid-string-error.html
 - doc/en/cairo-invalid-visual-error.html
 - doc/en/cairo-invalid-weight.html
-- doc/en/cairo-lcd-filter.html
 - doc/en/cairo-line-cap.html
 - doc/en/cairo-line-join.html
 - doc/en/cairo-linear-pattern.html
@@ -125,6 +124,7 @@ files:
 - doc/en/cairo-svg-surface.html
 - doc/en/cairo-svg-version.html
 - doc/en/cairo-temp-file-error.html
+- doc/en/cairo-text-cluster-flag.html
 - doc/en/cairo-text-cluster.html
 - doc/en/cairo-text-extents.html
 - doc/en/cairo-toy-font-face.html
@@ -187,7 +187,6 @@ files:
 - doc/ja/cairo-invalid-string-error.html
 - doc/ja/cairo-invalid-visual-error.html
 - doc/ja/cairo-invalid-weight.html
-- doc/ja/cairo-lcd-filter.html
 - doc/ja/cairo-line-cap.html
 - doc/ja/cairo-line-join.html
 - doc/ja/cairo-linear-pattern.html
@@ -229,6 +228,7 @@ files:
 - doc/ja/cairo-svg-surface.html
 - doc/ja/cairo-svg-version.html
 - doc/ja/cairo-temp-file-error.html
+- doc/ja/cairo-text-cluster-flag.html
 - doc/ja/cairo-text-cluster.html
 - doc/ja/cairo-text-extents.html
 - doc/ja/cairo-toy-font-face.html
@@ -287,6 +287,8 @@ files:
 - src/rb_cairo_surface.c
 - src/rb_cairo_text_cluster.c
 - src/rb_cairo_text_extents.c
+- src/tml/make/libpng_1.2.32-1_win32.log
+- src/tml/make/libpng_1.2.32-1_win32.sh
 - test-unit/Rakefile
 - test-unit/bin/testrb
 - test-unit/lib/test/unit.rb
@@ -355,6 +357,8 @@ files:
 - test-unit/test/util/test_observable.rb
 - test-unit/test/util/test_procwrapper.rb
 - test/cairo-test-utils.rb
+- test/example_d.exe
+- test/minigzip_d.exe
 - test/run-test.rb
 - test/test_constants.rb
 - test/test_context.rb
@@ -369,6 +373,8 @@ files:
 - test/test_text_cluster.rb
 - test/test_text_extents.rb
 - test/test_text_to_glyphs_data.rb
+- test/testzlib_d.exe
+- test/untgz_d.exe
 has_rdoc: false
 homepage: http://cairographics.org/rcairo
 post_install_message: 
@@ -393,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cairo
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby bindings for cairo

data/doc/en/cairo-lcd-filter.html

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html 
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-<title>module Cairo::LCDFilter</title>
-<link href="../doc.css" type="text/css" rel="stylesheet" />
-</head>
-<div class="footer">
-  <ul>
-    <li><a href="./">Index</a></li>
-  </ul>
-
-</div>
-</body>
-
-<h1><a name="label-0" id="label-0">module Cairo::LCDFilter</a></h1><!-- RDLabel: "module Cairo::LCDFilter" -->
-<h2><a name="label-1" id="label-1">Constants</a></h2><!-- RDLabel: "Constants" -->
-<dl>
-<dt><a name="label-2" id="label-2"><code>DEFAULT</code></a></dt><!-- RDLabel: "DEFAULT" -->
-<dt><a name="label-3" id="label-3"><code>FIR3</code></a></dt><!-- RDLabel: "FIR3" -->
-<dt><a name="label-4" id="label-4"><code>FIR5</code></a></dt><!-- RDLabel: "FIR5" -->
-<dt><a name="label-5" id="label-5"><code>INTRA_PIXEL</code></a></dt><!-- RDLabel: "INTRA_PIXEL" -->
-<dt><a name="label-6" id="label-6"><code>NONE</code></a></dt><!-- RDLabel: "NONE" -->
-</dl>
-<h2><a name="label-7" id="label-7">See Also</a></h2><!-- RDLabel: "See Also" -->
-<h2><a name="label-8" id="label-8">ChangeLog</a></h2><!-- RDLabel: "ChangeLog" -->
-
-<div class="footer">
-  <ul>
-    <li><a href="./">Index</a></li>
-  </ul>
-
-</div>
-</body>
-
-</html>

data/doc/ja/cairo-lcd-filter.html

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html 
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-<title>Cairo::LCDFilterモジュール</title>
-<link href="../doc.css" type="text/css" rel="stylesheet" />
-</head>
-<div class="footer">
-  <ul>
-    <li><a href="./">索引</a></li>
-  </ul>
-
-</div>
-</body>
-
-<h1><a name="label-0" id="label-0">Cairo::LCDFilterモジュール</a></h1><!-- RDLabel: "Cairo::LCDFilterモジュール" -->
-<p><em>Since 1.7</em>: <a href="cairo-lcd-filter.html">Cairo::LCDFilter</a>に定義されている定数は、
-<a href="cairo-antialias.html#label-5">Cairo::Antialias::SUBPIXEL</a>アンチエイリアスモードでLCD（液晶ディ
-スプレイ）に最適化されたビットマップを生成する時に適用するロー
-パスフィルタ（low-pass filter）を指定します。</p>
-<h2><a name="label-1" id="label-1">定数</a></h2><!-- RDLabel: "定数" -->
-<dl>
-<dt><a name="label-2" id="label-2"><code>DEFAULT</code></a></dt><!-- RDLabel: "DEFAULT" -->
-<dd>
-フォントバックエンドと対象装置のデフォルトLCDフィルタを
-使います。</dd>
-<dt><a name="label-3" id="label-3"><code>FIR3</code></a></dt><!-- RDLabel: "FIR3" -->
-<dd>
-周辺3x3ピクセル（あってる？FIXME: with a 3x3 kernel）で
-有限インパルス応答フィルタ（FIRフィルタ）を使います。</dd>
-<dt><a name="label-4" id="label-4"><code>FIR5</code></a></dt><!-- RDLabel: "FIR5" -->
-<dd>
-周辺5x5ピクセル（あってる？FIXME: with a 5x5 kernel）で
-有限インパルス応答フィルタ（FIRフィルタ）を使います。</dd>
-<dt><a name="label-5" id="label-5"><code>INTRA_PIXEL</code></a></dt><!-- RDLabel: "INTRA_PIXEL" -->
-<dd>
-ピクセル内フィルタ（あってる？FIXME: intra-pixel filter）
-を使います。</dd>
-<dt><a name="label-6" id="label-6"><code>NONE</code></a></dt><!-- RDLabel: "NONE" -->
-<dd>
-LCDフィルタを実行しません。</dd>
-</dl>
-<h2><a name="label-7" id="label-7">参考</a></h2><!-- RDLabel: "参考" -->
-<ul>
-<li><a href="cairo-antialias.html#label-5">Cairo::Antialias::SUBPIXEL</a></li>
-</ul>
-<h2><a name="label-8" id="label-8">変更履歴</a></h2><!-- RDLabel: "変更履歴" -->
-<ul>
-<li>2008-08-17: kou: スタート。</li>
-</ul>
-
-<div class="footer">
-  <ul>
-    <li><a href="./">索引</a></li>
-  </ul>
-
-</div>
-</body>
-
-</html>