Fixed font/image handling.

It now works properly no matter whether fontdir/imagedir is used or not.

diff --git a/ChangeLog b/ChangeLog
index fa2188aa54713d63595183e8180d960d14fc191d..a5654df6ed10c3729abb92eeaa504933b0c91356 100644 (file)
--- 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 90a29776875acd36c849cc09752062ca47403475..c9dc87f16e81e3645ebfa2aea37073fe46538ab4 100644 (file)
--- 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 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]}

diff --git a/lib/redact/source.rb b/lib/redact/source.rb
index 9a6d36376cba023eb9065919adbe127cae80189d..129e32e4382a76d1afec3d3b8df30b3282be5cf0 100644 (file)
--- 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