X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fredact.rb;h=d0da5d7859b655ad2d47d78eb78e28827a4b5fc4;hb=db4c1244950c92cdc640621cbd97d9b5a947cf27;hp=7417c92467e21f01a934369056c97716e7b4d10d;hpb=e6589624744430b826a27a71e3d4894516969fb3;p=redact.git

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 7417c92..d0da5d7 100644
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 28 2005-04-14 19:53:45Z tilman $
+# $Id: redact.rb 44 2005-06-08 17:35:49Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -57,7 +57,7 @@ class String
 end
 
 module Redact
-	VERSION = "0.1.0"
+	VERSION = "0.1.1"
 
 	class RedactError < StandardError; end
 
@@ -145,7 +145,7 @@ module Redact
 		attr_reader :filename
 
 		def initialize(filename)
-			@filename = filename.to_str.dup.freeze
+			@filename = find_font(filename.to_str).freeze
 		end
 
 		protected
@@ -156,6 +156,16 @@ module Redact
 		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:
@@ -179,7 +189,7 @@ module Redact
 		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
@@ -207,6 +217,16 @@ module Redact
 			 "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:
@@ -273,7 +293,7 @@ module Redact
 					ImagePart
 				else
 					raise(ArgumentError,
-					      "invalid program type - #{type.to_s}")
+					      "invalid part type - #{type.to_s}")
 				end
 
 				p = klass.new(self, @parts.size, name)