X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fredact.rb;h=379bb026c2464988fd5460bf4409daec0ec70de1;hb=66f2eadb07d3fdba45f556db4480883d70f86e2a;hp=7b9a802461c644048235570b3a8482df409f505d;hpb=bf303d7901b8d8105571f66c1fa4fb7f0907bed4;p=redact.git

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 7b9a802..379bb02 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 73 2005-09-21 16:20:52Z 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.5"
 
 	class RedactError < StandardError; end
 
@@ -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]}
@@ -258,7 +259,8 @@ module Redact
 		end
 
 		def script=(v)
-			@script = v.to_str.dup
+			v = v.to_str
+			@script = (File.exist?(v) ? File.read(v) : v).dup
 		end
 
 		def part(name, type = :invalid) # :yields: part