blacksmith 0.3.0 → 0.3.1

data/examples/forgefile/Forgefile

@@ -1,4 +1,4 @@
 family 'Blacksmith'
 source '../glyphs'
 
-glyph 'star', code: 0x0061
+glyph 'star.svg', code: 0x0061

data/examples/programmatic_font_creation/programmatic_font_creation.rb

@@ -6,6 +6,6 @@ Blacksmith.forge do
   family "Blacksmith"
   source File.expand_path('../../glyphs', __FILE__)
   
-  glyph 'star', code: 0x0061
+  glyph 'star.svg', code: 0x0061
   
 end

data/lib/blacksmith/font_builder.rb

@@ -10,13 +10,11 @@ class Blacksmith::FontBuilder
   def initialize(filename = nil, &block)
     raise "Expects filename or block" unless filename || block
     raise "Expects either a block or a filename - not both" if filename and block
-    raise "File not found: #{filename}" unless filename && File.exist?(filename)
+    raise "File not found: #{filename}" if filename && !File.exist?(filename)
     
     @_instructions = block || File.read(filename)
-    
     @_attributes = {}
     @_glyphs = {}
-    @_source = '.'
   end
   
   def execute
@@ -29,10 +27,10 @@ class Blacksmith::FontBuilder
     
     font = Blacksmith::Font.new(@_attributes)
     
-    @_glyphs.each do |name, attrs|
-      attrs[:scale]   ||= font.scale
-      attrs[:offset]  ||= font.offset
-      attrs[:outline] ||= File.join(font.source, "#{name}.svg")
+    @_glyphs.each do |filename, attrs|
+      attrs[:scale]  ||= font.scale
+      attrs[:offset] ||= font.offset
+      attrs[:source] ||= File.join(font.source, filename)
       
       font << Blacksmith::Glyph.new(attrs)
     end
@@ -40,8 +38,8 @@ class Blacksmith::FontBuilder
     font
   end
 
-  def glyph(name, attrs)
-    @_glyphs[name] = attrs
+  def glyph(filename, attrs)
+    @_glyphs[filename] = attrs
   end
   
   def method_missing(name, *args)

data/lib/blacksmith/glyph.rb

@@ -1,12 +1,15 @@
 class Blacksmith::Glyph
   include SmartProperties
+
+  property :name, :converts => :to_s
   
-  property :outline, :required => true,
-                     :converts => :to_s,
-                     :accepts => lambda { |filename| File.exist?(filename) }
-  
-  property :code, :required => true
-  
+  property :code, :required => true,
+                  :converts => :to_i
+
+  property :source, :required => true,
+                    :converts => :to_s,
+                    :accepts => lambda { |filename| File.exist?(filename) }
+
   property :left_side_bearing, :required => true,
                                :converts => :to_i,
                                :default => 15
@@ -20,12 +23,9 @@ class Blacksmith::Glyph
   
   property :offset, :converts => :to_f,
                     :accepts => lambda { |offset| offset <= 1.0 and offset >= -1.0 }
-  
-  def file_name
-    File.basename(outline)
-  end
 
   def name
-    File.basename(outline, '.svg')
+    super || File.basename(source, File.extname(source))
   end
+  
 end

data/lib/blacksmith/version.rb

@@ -1,3 +1,3 @@
 class Blacksmith
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/support/fontforge_build_instructions.py.erb

@@ -44,7 +44,7 @@ font.weight     = "<%= weight %>"
 <% for glyph in glyphs do %>
 # <%= glyph.name %>
 c = font.createChar(<%= glyph.code %>)
-c.importOutlines("<%= glyph.outline %>")
+c.importOutlines("<%= glyph.source %>")
 c.left_side_bearing = <%= glyph.left_side_bearing %>
 c.right_side_bearing = <%= glyph.right_side_bearing %>
 c.simplify()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacksmith
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: