From db4c1244950c92cdc640621cbd97d9b5a947cf27 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed, 8 Jun 2005 17:35:49 +0000
Subject: [PATCH] Added support for the --image_dir and --font_dir command line
 switches.

---
 ChangeLog            |  4 +++-
 TODO                 |  3 +--
 lib/redact/redact.rb | 26 +++++++++++++++++++++++---
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d29ca01..02d29b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,13 @@
 --
-$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
diff --git a/TODO b/TODO
index 16eac2f..68d8560 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 --
-$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
diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 70f6770..d0da5d7 100644
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $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)
 #
@@ -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:
-- 
2.30.2