#--
-# $Id: part.rb 29 2005-04-16 15:59:07Z tilman $
+# $Id: part.rb 49 2005-06-09 17:21:05Z tilman $
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
end
def to=(part)
- @to_id = [].fill(part.nil? ? -1 : part.id, 0..1)
+ self.set_to(part)
+ end
+
+ def set_to(part_x, part_y = part_x)
+ @to_id = [part_x.nil? ? -1 : part_x.id,
+ part_y.nil? ? -1 : part_y.id]
end
end
class Tweens < Array
def <<(im)
- image = EDJE.image_dir.find { |e| e.filename == im }
+ im2 = find_image(im.to_str.strip)
+ raise(RedactError, "cannot find image - #{im}") if im2.nil?
+
+ image = EDJE.image_dir.find { |e| e.filename == im2 }
if image.nil?
- image = ImageDirectoryEntry.new(im)
+ image = ImageDirectoryEntry.new(im, im2)
EDJE.image_dir << image
end
super(Tween.new(image))
end
+
+ private
+ def find_image(file)
+ [".", OPTIONS.image_dir].each do |d|
+ f2 = File.join(d, file)
+ return Pathname.new(f2).cleanpath.to_s if File.file?(f2)
+ end
+
+ nil
+ end
+
end
class ImageDescription < Description
end
def image=(im)
- return if !@image.nil? && im == @image.filename
+ im2 = find_image(im.to_str.strip)
+ raise(RedactError, "cannot find image - #{im}") if im2.nil?
- @image = EDJE.image_dir.find { |e| e.filename == im }
+ return if !@image.nil? && im2 == @image.filename
+
+ @image = EDJE.image_dir.find { |e| e.filename == im2 }
if @image.nil?
- @image = ImageDirectoryEntry.new(im)
+ @image = ImageDirectoryEntry.new(im, im2)
EDJE.image_dir << @image
end
"fill.rel_y" => [1.0, :double],
"fill.abs_y" => [0]})
end
+
+ private
+ def find_image(file)
+ [".", OPTIONS.image_dir].each do |d|
+ f2 = File.join(d, file)
+ return Pathname.new(f2).cleanpath.to_s if File.file?(f2)
+ end
+
+ nil
+ end
end
class TextDescription < Description
f = f.to_str.strip
md = f.match(/.*\.ttf$/)
unless md.nil?
- found = EDJE.font_dir.find { |font| font.filename == f }
+ f2 = find_font(f)
+ raise(RedactError, "cannot find font - #{f}") if f2.nil?
+
+ found = EDJE.font_dir.find { |font| font.filename == f2 }
if found.nil?
- EDJE.font_dir << FontDirectoryEntry.new(f)
+ EDJE.font_dir << FontDirectoryEntry.new(f, f2)
+ @font = EDJE.font_dir.last.alias
+ else
+ @font = found.alias
end
+ else
+ @font = f
end
-
- @font = f
end
def outline_color=(c)
"text.id_source" => [@text_id_source],
"text.id_text_source" => [@text_id_text_source]})
end
+
+ private
+ def find_font(file)
+ [".", OPTIONS.font_dir].each do |d|
+ f2 = File.join(d, file)
+ return Pathname.new(f2).cleanpath.to_s if File.file?(f2)
+ end
+
+ nil
+ end
end
end