projects
/
redact.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split a font's filename and its alias.
[redact.git]
/
lib
/
redact
/
redact.rb
diff --git
a/lib/redact/redact.rb
b/lib/redact/redact.rb
index 6b505f28cee7daf61c92aa53a9362b2a10bb38e4..7b9a802461c644048235570b3a8482df409f505d 100644
(file)
--- a/
lib/redact/redact.rb
+++ b/
lib/redact/redact.rb
@@
-1,5
+1,5
@@
#--
#--
-# $Id: redact.rb 4
5 2005-06-08 18:02:12
Z tilman $
+# $Id: redact.rb 4
8 2005-06-08 21:38:34
Z tilman $
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
@@
-142,10
+142,12
@@
module Redact
end
class FontDirectoryEntry # :nodoc:
end
class FontDirectoryEntry # :nodoc:
- attr_reader :filename
+ attr_reader :filename
, :alias
def initialize(filename)
@filename = filename.to_str.dup.freeze
def initialize(filename)
@filename = filename.to_str.dup.freeze
+ @alias = "Edje." + File.basename(@filename).
+ sub(/.[^.]+$/, "").freeze
end
protected
end
protected
@@
-154,7
+156,7
@@
module Redact
end
def to_eet_properties
end
def to_eet_properties
- {"entry" => [@
filename
]}
+ {"entry" => [@
alias
]}
end
end
end
end
@@
-179,7
+181,7
@@
module Redact
attr_reader :filename, :image, :id
def initialize(filename)
attr_reader :filename, :image, :id
def initialize(filename)
- @filename = fi
nd_image(filename.to_str)
.freeze
+ @filename = fi
lename.to_str.dup
.freeze
@image = Imlib2::Image.load(@filename)
@id = -1
@source_type = 1 # COMP
@image = Imlib2::Image.load(@filename)
@id = -1
@source_type = 1 # COMP
@@
-207,16
+209,6
@@
module Redact
"source_param" => [@source_param],
"id" => [@id]}
end
"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:
end
class CollectionDirectory < Array # :nodoc: