--
-$Id: ChangeLog 43 2005-06-08 17:31:47Z tilman $
+$Id: ChangeLog 44 2005-06-08 17:35:49Z tilman $
++
2005-06-08 Tilman Sauerbeck (tilman at code-monkey de)
* Rakefile: Code cleanup
* lib/redact/app.rb: Moved Redact::App's @options to
Redact::OPTIONS
+ * lib/redact/redact.rb, TODO: Added support for the --image_dir
+ and --font_dir command line switches
2005-05-29 Tilman Sauerbeck (tilman at code-monkey de)
* Rakefile: Use FileUtils.mkdir_p to create the destination
--
-$Id: TODO 1 2005-03-26 01:32:38Z tilman $
+$Id: TODO 44 2005-06-08 17:35:49Z tilman $
++
* Add support for the various 'fill' properties in ImageDescription
-* Respect --image_dir and --font_dir command line switches
#--
-# $Id: redact.rb 35 2005-04-25 17:14:49Z tilman $
+# $Id: redact.rb 44 2005-06-08 17:35:49Z tilman $
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
attr_reader :filename
def initialize(filename)
- @filename = filename.to_str.dup.freeze
+ @filename = find_font(filename.to_str).freeze
end
protected
def to_eet_properties
{"entry" => [@filename]}
end
+
+ private
+ def find_font(file)
+ [".", OPTIONS.font_dir].each do |d|
+ f2 = File.join(d, file)
+ return f2 if File.file?(f2)
+ end
+
+ nil
+ end
end
class ImageDirectory < Array # :nodoc:
attr_reader :filename, :image, :id
def initialize(filename)
- @filename = filename.to_str.dup.freeze
+ @filename = find_image(filename.to_str).freeze
@image = Imlib2::Image.load(@filename)
@id = -1
@source_type = 1 # COMP
"source_param" => [@source_param],
"id" => [@id]}
end
+
+ private
+ def find_image(file)
+ [".", OPTIONS.image_dir].each do |d|
+ f2 = File.join(d, file)
+ return f2 if File.file?(f2)
+ end
+
+ nil
+ end
end
class CollectionDirectory < Array # :nodoc: