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

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index d0da5d7..61c442f 100644
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 44 2005-06-08 17:35:49Z tilman $
+# $Id: redact.rb 59 2005-06-14 15:38:53Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -57,7 +57,7 @@ class String
 end
 
 module Redact
-	VERSION = "0.1.1"
+	VERSION = "0.1.3"
 
 	class RedactError < StandardError; end
 
@@ -142,10 +142,12 @@ module Redact
 	end
 
 	class FontDirectoryEntry # :nodoc:
-		attr_reader :filename
+		attr_reader :save_as, :filename, :alias
 
-		def initialize(filename)
-			@filename = find_font(filename.to_str).freeze
+		def initialize(fn_alias, filename)
+			@save_as = fn_alias.to_str.dup.freeze
+			@filename = filename.to_str.dup.freeze
+			@alias = "Edje." + fn_alias.sub(/.[^.]+$/, "").freeze
 		end
 
 		protected
@@ -154,17 +156,7 @@ module Redact
 		end
 
 		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
+			{"entry" => [@alias]}
 		end
 	end
 
@@ -188,8 +180,9 @@ module Redact
 	class ImageDirectoryEntry # :nodoc:
 		attr_reader :filename, :image, :id
 
-		def initialize(filename)
-			@filename = find_image(filename.to_str).freeze
+		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
 			@source_type = 1 # COMP
@@ -212,21 +205,11 @@ module Redact
 		end
 
 		def to_eet_properties
-			{"entry" => [@filename],
+			{"entry" => [@alias],
 			 "source_type" => [@source_type],
 			 "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: