Fixed font/image handling.

[redact.git] / lib / redact / redact.rb

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 7b9a802461c644048235570b3a8482df409f505d..411b6eb6de867515cee31662b64ce8c379f461f1 100644 (file)
--- 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]}