X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fredact.rb;h=411b6eb6de867515cee31662b64ce8c379f461f1;hb=5fd2488078da036c8920953d9d1f6ddead3c93c1;hp=260f34208c31afa73de7d7a2613406ac43c1b91b;hpb=b8a58959d74214164dfe0477fe36ff839728557a;p=redact.git

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 260f342..411b6eb 100644
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 25 2005-04-14 19:42:06Z tilman $
+# $Id: redact.rb 49 2005-06-09 17:21:05Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -57,7 +57,7 @@ class String
 end
 
 module Redact
-	VERSION = "0.1.0"
+	VERSION = "0.1.1"
 
 	class RedactError < StandardError; end
 
@@ -90,6 +90,7 @@ module Redact
 			block_given? ? (yield c) : c
 		end
 
+		protected
 		def to_eet_name
 			"Edje_File"
 		end
@@ -123,12 +124,14 @@ module Redact
 			@value = value.to_str.dup.freeze
 		end
 
+		protected
 		def to_eet_name
 			"Edje_Data"
 		end
 	end
 
 	class FontDirectory < Array # :nodoc:
+		protected
 		def to_eet_name
 			"Edje_Font_Directory"
 		end
@@ -139,18 +142,21 @@ 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
 		def to_eet_name
 			"Edje_Font_Directory_Entry"
 		end
 
 		def to_eet_properties
-			{"entry" => [@filename]}
+			{"entry" => [@alias]}
 		end
 	end
 
@@ -161,6 +167,7 @@ module Redact
 			entry.id = size - 1
 		end
 
+		protected
 		def to_eet_name
 			"Edje_Image_Directory"
 		end
@@ -173,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
@@ -191,12 +199,13 @@ module Redact
 			end
 		end
 
+		protected
 		def to_eet_name
 			"Edje_Image_Directory_Entry"
 		end
 
 		def to_eet_properties
-			{"entry" => [@filename],
+			{"entry" => [@alias],
 			 "source_type" => [@source_type],
 			 "source_param" => [@source_param],
 			 "id" => [@id]}
@@ -204,6 +213,7 @@ module Redact
 	end
 
 	class CollectionDirectory < Array # :nodoc:
+		protected
 		def to_eet_name
 			"Edje_Part_Collection_Directory"
 		end
@@ -219,6 +229,7 @@ module Redact
 			@id = col.id
 		end
 
+		protected
 		def to_eet_name
 			"Edje_Part_Collection_Directory_Entry"
 		end
@@ -265,7 +276,7 @@ module Redact
 					ImagePart
 				else
 					raise(ArgumentError,
-					      "invalid program type - #{type.to_s}")
+					      "invalid part type - #{type.to_s}")
 				end
 
 				p = klass.new(self, @parts.size, name)
@@ -326,6 +337,7 @@ module Redact
 			end
 		end
 
+		protected
 		def to_eet_name
 			"Edje_Part_Collection"
 		end