Fixed font/image handling.

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

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 6b505f28cee7daf61c92aa53a9362b2a10bb38e4..411b6eb6de867515cee31662b64ce8c379f461f1 100644 (file)
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 45 2005-06-08 18:02:12Z tilman $
+# $Id: redact.rb 49 2005-06-09 17:21:05Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -142,10 +142,12 @@ module Redact
        end
 
        class FontDirectoryEntry # :nodoc:
-               attr_reader :filename
+               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." + fn_alias.sub(/.[^.]+$/, "").freeze
                end
 
                protected
@@ -154,7 +156,7 @@ module Redact
                end
 
                def to_eet_properties
-                       {"entry" => [@filename]}
+                       {"entry" => [@alias]}
                end
        end
 
@@ -178,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
@@ -202,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: