cairo 1.4.1 → 1.5.0

data/ChangeLog

@@ -1,3 +1,262 @@
+2007-05-27  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile: improved current release NEWS extraction.
+
+	* NEWS: updated.
+
+	* Rakefile: supported document update.
+
+	* src/depend (install-so): used install-so instead of install.
+
+	* src/rb_cairo_font_options.c (Cairo::FontOptions#merge): renamed
+	to merge! because the method is destructive.
+
+	* src/lib/cairo.rb (Cairo::FontOptions#merge): added
+	non-destructive version.
+
+2007-05-23  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/lib/cairo.rb (Cairo.normalize_const_name): treated "." as
+	ignore character.
+
+	* src/rb_cairo.c (Cairo::BINDINGS_VERSION): 1.6.0 -> 1.5.0.
+
+2007-05-22  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_pattern.c (cr_radial_pattern_get_radial_circles):
+	returned [[x0, y0, r0], [x1, y1, r1]] instead of [x0, y0, r0, x1,
+	y1, r1].
+
+	* src/rb_cairo_path.c: used super.
+
+	* src/rb_cairo_path.c (Cairo::PathMoveTo, Cairo::PathLineTo,
+	Cairo::PathCurveTo, Cairo::PathClosePath): defined each path data
+	type as class.
+
+2007-05-21  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_matrix.c (Cairo::Matrix#transform_distance): fixed
+	a typo.
+
+	* src/rb_cairo_matrix.c: added accessors.
+
+	* src/rb_cairo_surface.c: supported 64bit platform. Thanks to
+	Yoshinao Muramatsu!
+
+2007-05-20  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_surface.c (cr_win32_surface_initialize): fixed a
+	typo. Thanks to Yoshinao Muramatsu!
+
+	* src/rb_cairo_font_face.c, src/lib/cairo/constants.rb: followed
+	up the previous commit.
+
+	* src/cairo.def, src/rb_cairo_pattern.c, src/rb_cairo_surface.c,
+	src/rb_cairo_font_face.c: removed needless methods XXX#type.
+
+	* src/rb_cairo.h, src/rb_cairo_pattern.c, src/rb_cairo_surface.c:
+	always detected surface and pattern type dynamically.
+	* src/rb_cairo_context.c: followed the above changes.
+
+	* src/rb_cairo.h, src/rb_cairo_surface.c: improved win32 surface
+	support. Thanks to Yoshinao Muramatsu!
+
+	* src/rb_cairo.h, src/cairo.def, src/rb_cairo_constants.rb:
+	added a module for each enum type.
+	* src/lib/cairo/constants.rb: kept the backward compatibility.
+
+2007-05-19  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/lib/cairo/context/circle.rb (Cairo::Context::Circle#circle):
+	renamed parameter name to be more self-descriptive.
+
+	* src/rb_cairo.h, src/cairo.def, src/rb_cairo_surface.c:
+	supported win32 surface. Thanks to Yoshinao Muramatsu!!!
+
+	* README: added an entry for Yoshinao Muramatsu.
+
+2007-05-18  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_private.[ch] (rb_cairo__glyphs_to_array,
+	RB_CAIRO__GLYPHS_TO_ARRAY): fixed wrong memory allocation.
+	* src/rb_cairo_context.c, src/rb_cairo_scaled_font.c: used
+	RB_CAIRO__GLYPHS_TO_ARRAY instead of rb_cairo__glyphs_to_array().
+
+	* src/rb_cairo_context.c (cr_set_dash):
+	- made offset optional.
+	- accepted a number for dash_array.
+
+2007-05-15  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_context.c (cr_get_group_target): added NULL check.
+
+	* src/rb_cairo_context.c (cr_get_font_face): checked status of got
+	font face not context.
+
+	* src/rb_cairo_context.c (cr_set_font_face): accepted nil as font
+	face.
+
+	* src/rb_cairo_context.c (cr_copy_path, cr_copy_path_flat):
+	checked status of copied path not context.
+
+2007-05-10  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_surface.c (cr_surface_create_similar): retrieved
+	corresponding Ruby class by cairo_surface_get_type().
+
+2007-05-06  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_path.c, src/lib/cairo.rb, src/lib/cairo/path.rb:
+	added path related methods such as move_to, line_to and curve_to
+	to Cairo::Path.
+
+	* src/lib/cairo/context/path.rb
+	(Cairo::Context::Path#transform_path): multi-thread safe.
+
+2007-05-03  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_path.c
+	(Cairo::PathData#move_to?, Cairo::PathData#line_to?,
+	Cairo::PathData#curve_to?, Cairo::PathData#close_path?): added.
+
+	* src/rb_cairo_private.h
+	(CBOOL2RVAL, RVAL2CBOOL): added.
+	(rb_cairo__is_kind_of): added.
+	* src/*.c: used rb_cairo__is_kind_of() instead of
+	RTEST(rb_obj_is_kind_of(...)).
+
+	* src/rb_cairo_path.c
+	(Cairo::Path#size, Cairo::Path#length, Cairo::Path#empty?): added.
+	(Cairo::Path#[]): supported negative index.
+
+	* src/rb_cairo_path.c (Cairo::PathData#each): added.
+
+	* src/rb_cairo.h, src/rb_cairo_path.c: added Cairo::Point and
+	Cairo::PathData.
+
+	* src/lib/cairo/point.rb (Cairo::Point#distance): moved from
+	Cairo::Context::Path::Point.
+	* src/lib/cairo/context/path.rb (Cairo::Context::Path::Point):
+	removed.
+	* src/lib/cairo.rb, src/lib/cairo/context/path.rb: used Cairo::Point.
+
+2007-05-01  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_pattern.c
+	(cr_gradient_pattern_get_color_stop_color): cleanup.
+
+	* src/rb_cairo.[ch]: exported Cairo::Color and Cairo::Color::Base.
+	* src/lib/cairo.rb: require cairo/color before cairo.so to export
+	Cairo::Color to cairo.so.
+
+	* src/rb_cairo_pattern.c: implemented src/lib/cairo/pattern.rb
+	methods in C.
+	* src/lib/cairo/pattern.rb: removed.
+	* src/lib/cairo.rb: removed cairo/pattern.
+
+	* src/rb_cairo_private.[ch] (rb_cairo__const_get,
+	Init_cairo_private): added.
+	* src/rb_cairo.c: moved Init_* declarations to rb_cairo_private.h.
+	* src/rb_cairo_constants.c: supported abbrev notation for constant
+	name. We can write just like
+	  context.antialias = :none
+	instead of
+	  context.antialias = Cairo::ANTIALIAS_NONE
+
+	* src/lib/cairo.rb (Cairo.normalize_const_name): added.
+	* src/lib/cairo/color.rb: used Cairo.normalize_const_name.
+
+2007-04-30  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/lib/cairo/context.rb, src/lib/cairo/context/quad.rb: moved
+	quadratic Bézier curve support to ...
+	* src/rb_cairo_context.c: ... here.
+
+	* src/lib/cairo/context/path.rb
+	(Cairo::Context::Path#map_path_onto): fixed a boundary value bug.
+
+2007-04-19  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_context.c (Cairo::Context#stroke,
+	Cairo::Context#fill, Cairo::Context#clip): accept 'preserve' option
+	to change XXX and XXX_preserve.
+	* src/lib/cairo/context.rb (Cairo::Context#stroke_preserve,
+	Cairo::Context#fill_preserve, Cairo::Context#clip_preserve): moved
+	from src/rb_cairo_context.c.
+
+2007-04-18  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/lib/cairo/color.rb (Cairo::Color.parse):
+	- supported :hsv and :hsva.
+	- added robust parse mode.
+
+	* samples/blur.rb: used convenience interface of Cairo::ImageSurface.new.
+
+	* src/lib/cairo/color.rb: supported HSV.
+
+2007-04-16  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/lib/cairo/color.rb, src/lib/cairo/pattern.rb,
+	src/lib/cairo/context/color.rb, src/rb_cairo_pattern.c: improved
+	Cairo::Color interface.
+
+	* sample/: used Cairo::Color.
+
+	* src/lib/cairo/color.rb: added validation.
+
+	* misc/update-colors.rb: supported X11 color names.
+	* src/lib/cairo/colors.rb: updated.
+
+	* misc/update-colors.rb: added colors.rb generator that extracts
+	popular colors from Wikipedia:List_of_colors page.
+
+	* src/lib/cairo/colors.rb: added popular colors generated by
+	updated-colors.rb.
+
+	* src/lib/cairo/color.rb: added high-level color class including
+	CMYK support.
+
+	* src/rb_cairo_pattern.c, src/lib/cairo.rb,
+	src/lib/cairo/context.rb, src/lib/cairo/pattern.rb: supported
+	Cairo::Color.
+
+2007-04-15  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_context.c
+	(cr_push_group): added error handling.
+	(cr_pop_group_to_source): updated source class.
+
+	* src/lib/cairo/context.rb, src/lib/cairo/context/blur.rb: added
+	Cairo::Context#pseudo_blur.
+
+	* samples/blur.rb: added a sample script for Cairo::Context#pseudo_blur.
+
+	* src/rb_cairo_context.c
+	(cr_pop_group): returned pattern.
+	(cr_push_group): returned popped pattern if not pop_to_source.
+
+2007-04-13  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile: supported 'rake release'.
+
+	* extconf.rb, Rakefile: supported RubyGems.
+
+2007-04-08  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_surface.c (yield_and_finish):
+	- renamed from ensure_finish_proc().
+	- don't use ensure.
+
+	* src/rb_cairo_surface.c (ensure_finish_proc): supported
+	Cairo::Surface.new with block. If block is exited, a surface is
+	finished automatically.
+
+	* sample/*.rb: followed the above change.
+
+2007-03-10  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo.c (Cairo::BINDINGS_VERSION): 1.4.1 -> 1.6.0.
+
 2007-03-10  Kouhei Sutou  <kou@cozmixng.org>
 
 	* NEWS: added 1.4.1 entry.

data/NEWS

@@ -1,3 +1,35 @@
+Release 1.5.0 (2007-05-27) Kouhei Sutou <kou@cozmixng.org>)
+==========================================================
+
+Many API improvement.
+
+Features
+--------
+  * Support Cairo::Surface.new with block.
+  * Support RubyGems.
+  * Add experimental API Cairo::Context#pseudo_blur. (API
+    may be changed.)
+  * Fix strange Cairo::Context#push_group and
+    Cairo::Context#pop_group behaviour.
+  * Fix Cairo::Context::Path#map_path_onto.
+  * Add high-level color interface. (Cairo::Color)
+    * Improve color related API. For example:
+	From:
+	  context.set_source_rgb(1, 0, 0)
+	To:
+	  context.set_source_color(:red)
+
+    * Support RGB/CMYK/HSV conversion.
+    * Many default color definitions.
+  * Support path creation using Cairo::Path without
+    Cairo::Context.
+  * Improve constant value specify API. For example:
+      From:
+        Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32, 100, 100)
+      To:
+        Cairo::ImageSurface.new(:argb32, 100, 100)
+  * Support win32 surface. (Yoshinao Muramatsu)
+
 Release 1.4.1 (2007-03-10 Kouhei Sutou <kou@cozmixng.org>)
 ==========================================================
 

data/README

@@ -30,3 +30,8 @@ it could be improved, please feel free to send a message to the cairo
 mailinglist at cairo@cairographics.org , which is archived at
 
   http://cairographics.org/cgi-bin/mailman/listinfo/cairo
+
+Thanks
+------
+
+  * Yoshinao Muramatsu: win32 surface support patch.

data/Rakefile

@@ -12,8 +12,11 @@ truncate_base_dir = Proc.new do |x|
   x.gsub(/^#{Regexp.escape(base_dir + File::SEPARATOR)}/, '')
 end
 
-$LOAD_PATH.unshift(File.join(base_dir, 'src'))
-$LOAD_PATH.unshift(File.join('src', 'lib'))
+cairo_ext_dir = File.join(base_dir, 'src')
+cairo_lib_dir = File.join(cairo_ext_dir, 'lib')
+$LOAD_PATH.unshift(cairo_ext_dir)
+$LOAD_PATH.unshift(cairo_lib_dir)
+ENV["RUBYLIB"] = "#{cairo_lib_dir}:#{cairo_ext_dir}:#{ENV['RUBYLIB']}"
 require 'cairo'
 
 manifest = File.join(base_dir, "Manifest.txt")
@@ -42,7 +45,8 @@ at_exit do
 end
 
 ENV["VERSION"] ||= Cairo.bindings_version
-project = Hoe.new('cairo', ENV["VERSION"]) do |project|
+version = ENV["VERSION"]
+project = Hoe.new('cairo', version) do |project|
   project.rubyforge_name = 'cairo'
   authors = File.join(base_dir, "AUTHORS")
   project.author = File.readlines(authors).collect do |line|
@@ -62,9 +66,10 @@ project = Hoe.new('cairo', ENV["VERSION"]) do |project|
     :has_rdoc => false,
   }
   news = File.join(base_dir, "NEWS")
-  project.changes = project.paragraphs_of(news, 0..1).join("\n\n")
+  project.changes = File.read(news).gsub(/\n+^Release(?m:.*)/, '')
   project.description = "Ruby bindings for cairo"
   project.need_tar = false
+  project.remote_rdoc_dir = "doc"
 end
 
 project.spec.dependencies.delete_if {|dependency| dependency.name == "hoe"}
@@ -101,3 +106,82 @@ task :uninstall do
     rm_f project.bin_files.collect {|f| f.sub(/^bin#{File::SEPARATOR}/, '')}
   end
 end
+
+
+# for releasing
+task :dist do
+  sh "./dist.sh", version
+end
+
+# for documentation
+langs = [
+  ["en", "English"],
+  ["ja", "日本語"],
+]
+
+rcairo_doc_dir = File.expand_path(File.join(base_dir, "..", "rcairo-doc"))
+rcairo_doc_css = File.join(rcairo_doc_dir, "doc.css")
+rcairo_doc_title_image = File.join(rcairo_doc_dir, "rcairo-title.png")
+doc_dir = "doc"
+doc_index = File.join(doc_dir, "index.html")
+doc_css = File.join(doc_dir, "doc.css")
+doc_title_image = File.join(doc_dir, "rcairo-title.png")
+task(doc_index).instance_variable_get("@actions").clear
+
+file doc_index => doc_dir do
+  mkdir_p doc_dir
+end
+
+file doc_title_image => rcairo_doc_title_image do
+  cp rcairo_doc_title_image, doc_title_image
+end
+
+file doc_css => [rcairo_doc_css, doc_title_image] do
+  cp rcairo_doc_css, doc_css
+end
+
+file doc_index => doc_css do
+  File.open(doc_index, "w") do |index|
+    index << <<-EOH
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>rcairo reference manual</title>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  </head>
+
+  <body>
+    <h1>rcairo reference manual</h1>
+
+    <ul>
+EOH
+
+    langs.each do |lang, native_lang|
+      index << <<-EOH
+      <li><a href="#{lang}/">#{native_lang}</a></li>
+EOH
+    end
+
+    index << <<-EOH
+    </ui>
+
+    <p><a href="../">Up</a></p>
+  </body>
+</html>
+EOH
+  end
+end
+
+langs.each do |lang,|
+  lang_doc_index = File.join(doc_dir, lang, "index.html")
+  task doc_index => lang_doc_index
+  file lang_doc_index do
+    lang_doc_dir = File.join(doc_dir, lang)
+    lang_rcairo_doc_dir = File.join(rcairo_doc_dir, lang)
+    mkdir_p lang_doc_dir
+    cp Dir[File.join(lang_rcairo_doc_dir, "*.rd")], lang_doc_dir
+    ruby File.join(rcairo_doc_dir, "update-html.rb"), lang_doc_dir
+    ruby File.join(rcairo_doc_dir, "update-html.rb"), lang_doc_dir
+    rm Dir[File.join(lang_doc_dir, "*.{rd,rdc,rbl}")]
+  end
+end

data/misc/update-colors.rb

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+
+begin
+  require 'scrapi'
+rescue LoadError
+  require 'rubygems'
+  require 'scrapi'
+end
+
+def collect_popular_colors(src=nil)
+  src ||= URI("http://en.wikipedia.org/wiki/List_of_colors")
+
+  row = Scraper.define do
+    process "th > a:first-child", :name => :text
+    process "td:nth-child(3)", :hex_triplet => :text
+    process "td:nth-child(4)", :red => :text
+    process "td:nth-child(5)", :green => :text
+    process "td:nth-child(6)", :blue => :text
+    result :name, :hex_triplet, :red, :green, :blue
+  end
+
+  scraper = Scraper.define do
+    process "table > tr", "rows[]" => row
+    result :rows
+  end
+
+  scraper.scrape(src)
+end
+
+def collect_x11_colors(src=nil)
+  src ||= URI("http://en.wikipedia.org/wiki/X11_color_names")
+
+  row = Scraper.define do
+    process "th", :name => :text
+    process "td:nth-child(2)", :hex_triplet => "@bgcolor"
+    process "td:nth-child(6)", :red => :text
+    process "td:nth-child(7)", :green => :text
+    process "td:nth-child(8)", :blue => :text
+    result :name, :hex_triplet, :red, :green, :blue
+  end
+
+  scraper = Scraper.define do
+    process "table > tr", "rows[]" => row
+    result :rows
+  end
+
+  x11_colors = scraper.scrape(src)
+  x11_colors.collect do |color|
+    if color.name
+      color.name = color.name.gsub(/([a-z]|[A-Z]+)([A-Z])/, "\\1 \\2")
+    end
+    color
+  end
+end
+
+def constanize_color_name(name)
+  names = name.gsub(/é/, "e").upcase.split(/(?:\s*\(|\)\s*)/)
+  names = names.collect {|name| name.gsub(/[ \-]/, "_")}
+  if names[1] and ["WEB", "COLOR_WHEEL", "X11"].include?(names[1])
+    real_names = [names.join("_")]
+    if names == ["ORANGE", "COLOR_WHEEL"]
+      real_names << names.first
+    end
+    names = real_names
+  end
+  names
+end
+
+colors = collect_popular_colors
+x11_colors = collect_x11_colors
+
+top_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+colors_rb = File.join(top_dir, "src", "lib", "cairo", "colors.rb")
+File.open(colors_rb, "w") do |rb|
+  rb.puts <<-HEADER
+require 'cairo/color'
+
+module Cairo
+  module Color
+HEADER
+
+  [
+   [colors, nil],
+   [x11_colors, "X11"]
+  ].each do |colors, mod|
+    indent = "  " * 2
+    if mod
+      rb.puts("#{indent}module #{mod}")
+      indent << "  "
+    end
+    colors.each do |color|
+      if color.name and color.hex_triplet and
+          color.red and color.green and color.blue
+        begin
+          names = constanize_color_name(color.name)
+
+          hexes = color.hex_triplet.scan(/[\da-f]{2,2}/i)
+          red_hex, green_hex, blue_hex = hexes.collect {|hex| hex.hex}
+
+          red = Integer(color.red)
+          green = Integer(color.green)
+          blue = Integer(color.blue)
+
+          if [red_hex, green_hex, blue_hex] != [red, green, blue]
+            warning_message = "Hex triplet(#{color.hex_triplet}) of "
+            warning_message << "#{color.name} is difference from RGB"
+            warning_message << "(#{red}, #{green}, #{blue}). "
+            if ["Alice Blue", "Old Rose"].include?(color.name)
+              warning_message << "Use hex triplet value."
+              red, green, blue = red_hex, green_hex, blue_hex
+            else
+              warning_message << "Use RGB value."
+            end
+            puts warning_message
+          end
+
+          r, g, b = [red, green, blue].collect {|v| v / 255.0}
+
+          rb.puts("#{indent}# #{color.name}: #{color.hex_triplet}")
+          name, *alias_names = names
+          rb.puts("#{indent}#{name} = RGB.new(#{r}, #{g}, #{b})")
+          alias_names.each do |alias_name|
+              rb.puts("#{indent}#{alias_name} = #{name}")
+            end
+        rescue ArgumentError
+          next
+        end
+      end
+    end
+
+    if mod
+      indent = indent[0..-3]
+      rb.puts("#{indent}end")
+      rb.puts("#{indent}include #{mod}")
+      rb.puts
+    end
+  end
+
+  rb.puts <<-FOOTER
+  end
+end
+FOOTER
+end