Removed RCS-style IDs.

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

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 4e1696cf24e7ea638a78fe005d49a49cf019269a..f1a93faa0cd3b8667c11a48c549cda9062296cec 100644 (file)
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,6 +1,4 @@
 #--
-# $Id: redact.rb 31 2005-04-23 22:54:01Z tilman $
-#
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -57,7 +55,7 @@ class String
 end
 
 module Redact
-       VERSION = "0.1.0"
+       VERSION = "0.1.5"
 
        class RedactError < StandardError; end
 
@@ -142,10 +140,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 +154,7 @@ module Redact
                end
 
                def to_eet_properties
-                       {"entry" => [@filename]}
+                       {"entry" => [@alias]}
                end
        end
 
@@ -178,7 +178,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
@@ -202,7 +203,7 @@ module Redact
                end
 
                def to_eet_properties
-                       {"entry" => [@filename],
+                       {"entry" => [@alias],
                         "source_type" => [@source_type],
                         "source_param" => [@source_param],
                         "id" => [@id]}
@@ -256,7 +257,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