From 5fd2488078da036c8920953d9d1f6ddead3c93c1 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu, 9 Jun 2005 17:21:05 +0000
Subject: [PATCH] Fixed font/image handling.

It now works properly no matter whether fontdir/imagedir is used or not.
---
 ChangeLog            |  6 +++++-
 lib/redact/part.rb   |  8 ++++----
 lib/redact/redact.rb | 15 ++++++++-------
 lib/redact/source.rb |  4 ++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fa2188a..a5654df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 --
-$Id: ChangeLog 48 2005-06-08 21:38:34Z tilman $
+$Id: ChangeLog 49 2005-06-09 17:21:05Z tilman $
 ++
 
+2005-06-09 Tilman Sauerbeck (tilman at code-monkey de)
+        * lib/redact/{source,redact,part}.rb: Fixed font/image handling so
+          that it now works properly if fontdir/imagedir is used or not
+
 2005-06-08 Tilman Sauerbeck (tilman at code-monkey de)
         * Rakefile: Code cleanup
         * lib/redact/app.rb: Moved Redact::App's @options to
diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index 90a2977..c9dc87f 100644
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 48 2005-06-08 21:38:34Z tilman $
+# $Id: part.rb 49 2005-06-09 17:21:05Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -405,7 +405,7 @@ module Redact
 
 			image = EDJE.image_dir.find { |e| e.filename == im2 }
 			if image.nil?
-				image = ImageDirectoryEntry.new(im2)
+				image = ImageDirectoryEntry.new(im, im2)
 				EDJE.image_dir << image
 			end
 
@@ -450,7 +450,7 @@ module Redact
 
 			@image = EDJE.image_dir.find { |e| e.filename == im2 }
 			if @image.nil?
-				@image = ImageDirectoryEntry.new(im2)
+				@image = ImageDirectoryEntry.new(im, im2)
 				EDJE.image_dir << @image
 			end
 
@@ -557,7 +557,7 @@ module Redact
 
 				found = EDJE.font_dir.find { |font| font.filename == f2 }
 				if found.nil?
-					EDJE.font_dir << FontDirectoryEntry.new(f2)
+					EDJE.font_dir << FontDirectoryEntry.new(f, f2)
 					@font = EDJE.font_dir.last.alias
 				else
 					@font = found.alias
diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 7b9a802..411b6eb 100644
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 48 2005-06-08 21:38:34Z tilman $
+# $Id: redact.rb 49 2005-06-09 17:21:05Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -142,12 +142,12 @@ module Redact
 	end
 
 	class FontDirectoryEntry # :nodoc:
-		attr_reader :filename, :alias
+		attr_reader :save_as, :filename, :alias
 
-		def initialize(filename)
+		def initialize(fn_alias, filename)
+			@save_as = fn_alias.to_str.dup.freeze
 			@filename = filename.to_str.dup.freeze
-			@alias = "Edje." + File.basename(@filename).
-			         sub(/.[^.]+$/, "").freeze
+			@alias = "Edje." + fn_alias.sub(/.[^.]+$/, "").freeze
 		end
 
 		protected
@@ -180,7 +180,8 @@ module Redact
 	class ImageDirectoryEntry # :nodoc:
 		attr_reader :filename, :image, :id
 
-		def initialize(filename)
+		def initialize(im_alias, filename)
+			@alias = im_alias.to_str.dup.freeze
 			@filename = filename.to_str.dup.freeze
 			@image = Imlib2::Image.load(@filename)
 			@id = -1
@@ -204,7 +205,7 @@ module Redact
 		end
 
 		def to_eet_properties
-			{"entry" => [@filename],
+			{"entry" => [@alias],
 			 "source_type" => [@source_type],
 			 "source_param" => [@source_param],
 			 "id" => [@id]}
diff --git a/lib/redact/source.rb b/lib/redact/source.rb
index 9a6d363..129e32e 100644
--- a/lib/redact/source.rb
+++ b/lib/redact/source.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: source.rb 48 2005-06-08 21:38:34Z tilman $
+# $Id: source.rb 49 2005-06-09 17:21:05Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -61,7 +61,7 @@ module Redact
 		end
 
 		def to_eet_properties
-			{"file" => [@font.filename],
+			{"file" => [@font.save_as],
 			 "name" => [@font.alias]}
 		end
 	end
-- 
2.30.2