text2svg 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94254b4b10b68d5e825b24f2a4144c69da09e2c5
-  data.tar.gz: 9861a858f2d279f0f1c10a66a74b2a0b33bb5843
+  metadata.gz: 669e306f0e466d680462a3fe6277e7fee87394fd
+  data.tar.gz: 17c4b5490802f0a842cb37584cf8c3bb35e8be20
 SHA512:
-  metadata.gz: b45729144575ef72fb38d6a1af983e0e2154f99ca0b98a46679946fe25ec936424d5c518165e2dc8ee16568bfc4d4e623eb486c83c4b2cfdeec122f534305c5b
-  data.tar.gz: adadaa9dd72fdd0dc23187ebd9a0086e68ab37ec19495a97988322d0c4752ca83e593202104789d35e8010c70868704f93a607125e05a86d0de13c2cec85c41b
+  metadata.gz: 53ddc5d148dab731052f69a1ea2ccd45f5e097e7b345f9f6c7e0f1ac760787d833dd54e4edf7d03cd00b583a99a0f50fee16425685dd5842ac1b2080d5083cc2
+  data.tar.gz: 6d5778f049cb11601586bf8f67d8e88d8a3716ab11d0306309be302fcab21bc0d789c8ed61f0cea5e07de80bd8ab8410a18b397cbebe3279e5376f2cad14df08

data/lib/text2svg/cli.rb

@@ -2,10 +2,19 @@ require 'text2svg/typography'
 
 module Text2svg
   module CLI
-    Option = Struct.new(:font, :text_align, :fill, :encoding)
-
     def start
-      o = CLI::Option.new(nil, :left, :black, Encoding::UTF_8)
+      o = Option.new(
+        nil,
+        :left,
+        :black,
+        :none,
+        1,
+        Encoding::UTF_8,
+        :none,
+        1,
+        false,
+        false,
+      )
       OptionParser.new.tap { |opt|
         opt.on('-f', '--font FONT', 'font file path (require)') do |arg|
           o.font = arg
@@ -19,19 +28,24 @@ module Text2svg
         opt.on('--encoding ENCODING', 'input text encoding (default utf-8)') do |arg|
           o.encoding = Encoding.find(arg)
         end
+        opt.on('--stroke COLOR', 'stroke color setting (default none)') do |arg|
+          o.stroke = arg
+        end
+        opt.on('--stroke-width NUM', 'stroke-width value (default 1)') do |arg|
+          o.stroke_width = arg
+        end
+        opt.on('--bold', "embolden outline (default false)") do |arg|
+          o.bold = arg
+        end
+        opt.on('--italic', "oblique outline (default false)") do |arg|
+          o.italic = arg
+        end
       }.parse!(ARGV)
       unless o.font
-        raise ArgumentError, "require `--font` cli option. see --help"
+        raise ArgumentError, 'require `--font` cli option. see --help'
       end
       text = ARGV[0] || $stdin.read
-      puts Text2svg::Typography.build(
-        text,
-        font: o.font,
-        text_align: o.text_align,
-        stroke: :none,
-        fill: o.fill,
-        encoding: o.encoding,
-      )
+      puts Text2svg::Typography.build(text, o).to_s
     end
     module_function :start
   end

data/lib/text2svg/cli_test.rb

@@ -1,49 +1,65 @@
 require 'text2svg/cli'
 
 module Text2svgCLITest
+  def check(t)
+    out = capture do
+      Text2svg::CLI.start
+    end
+    unless String === out
+      t.error 'return value was break'
+    end
+    unless 0 < out.length
+      t.error 'unsupported font?'
+    end
+    if out.strip[0, 4] != '<svg'
+      t.error 'output format was break'
+    end
+  end
+
   def test_start(t)
     %w(left right center).each do |text_align|
       ARGV[0] = "Hello,\nWorld!"
       ARGV[1] = '--font=/Library/Fonts/Times New Roman.ttf'
       ARGV[2] = "--text-align=#{text_align}"
-      out = capture do
-        Text2svg::CLI.start
-      end
-      unless String === out
-        t.error 'return value was break'
-      end
-      unless 0 < out.length
-        t.error 'unsupported font?'
-      end
-      if out.strip[0,4] != "<svg"
-        t.error 'output format was break'
-      end
+
+      check(t)
     end
   end
 
   def test_encoding(t)
     [
       ['utf-8', "\xEF\x82\x9B".force_encoding(Encoding::ASCII_8BIT)],
-      ['utf-32', "\x00\x00\xFE\xFF\x00\x00\xF0\x9B".force_encoding(Encoding::ASCII_8BIT)]
+      ['utf-32', "\x00\x00\xFE\xFF\x00\x00\xF0\x9B".force_encoding(Encoding::ASCII_8BIT)],
     ].each do |(encoding, text)|
       ARGV[0] = text
       ARGV[1] = '--font=~/Library/Fonts/fontawesome-webfont.ttf'
       ARGV[2] = "--encoding=#{encoding}"
-      out = capture do
-        Text2svg::CLI.start
-      end
-      unless String === out
-        t.error 'return value was break'
-      end
-      unless 0 < out.length
-        t.error 'unsupported font?'
-      end
-      if out.strip[0,4] != "<svg"
-        t.error 'output format was break'
-      end
+      check(t)
     end
   end
 
+  def test_bold(t)
+    ARGV[0] = 'Hello'
+    ARGV[1] = '--font=/Library/Fonts/Times New Roman.ttf'
+    ARGV[2] = '--bold'
+    check(t)
+  end
+
+  def test_italic(t)
+    ARGV[0] = 'Hello'
+    ARGV[1] = '--font=/Library/Fonts/Times New Roman.ttf'
+    ARGV[2] = '--italic'
+    check(t)
+  end
+
+  def test_stroke(t)
+    ARGV[0] = 'Hello'
+    ARGV[1] = '--font=/Library/Fonts/Times New Roman.ttf'
+    ARGV[2] = '--stroke=red'
+    ARGV[3] = '--stroke-width=100'
+    check(t)
+  end
+
   def capture
     out = StringIO.new
     orig = $stdout

data/lib/text2svg/option.rb

@@ -0,0 +1,25 @@
+module Text2svg
+  class Option < Struct.new(
+    :font,
+    :text_align,
+    :fill,
+    :stroke,
+    :stroke_width,
+    :encoding,
+    :stroke,
+    :stroke_width,
+    :bold,
+    :italic,
+  )
+
+    class << self
+      def from_hash(h)
+        o = new
+        h.to_h.each do |k, v|
+          o[k.to_sym] = v
+        end
+        o
+      end
+    end
+  end
+end

data/lib/text2svg/typography.rb

@@ -1,5 +1,6 @@
 require 'freetype'
 require 'text2svg/outline2d'
+require 'text2svg/option'
 
 module Text2svg
   class Typography
@@ -10,30 +11,25 @@ module Text2svg
     INTER_CHAR_SPACE_DIV = 50r
 
     class << self
-      def build(text, font:, stroke: :none, stroke_width: 1, fill: :black, text_align: :left, encoding: Encoding::UTF_8)
-        g, w, h = path(
-          text,
-          font: font,
-          stroke: stroke,
-          stroke_width: stroke_width,
-          fill: fill,
-          text_align: text_align,
-          encoding: encoding,
-        )
-        svg = %(<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 #{w} #{h}">\n)
+      def build(text, option)
+        if Hash === option
+          option = Option.from_hash(option)
+        end
+        content = path(text, option)
+        svg = %(<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 #{content.width} #{content.height}">\n)
         svg << "<title>#{text}</title>\n"
-        svg << g
+        svg << content.data
         svg << "</svg>\n"
-        svg
+        Content.new(svg, content.width, content.height)
       end
 
-      def path(text, font:, stroke: :none, stroke_width: 1, fill: :black, text_align: :left, encoding: Encoding::UTF_8)
-        stroke ||= :none
-        fill ||= :black
-        text_align ||= :left
-        text.force_encoding(encoding).encode!(Encoding::UTF_8)
+      def path(text, option)
+        if Hash === option
+          option = Option.from_hash(option)
+        end
+        text.force_encoding(option.encoding).encode!(Encoding::UTF_8)
 
-        FreeType::API::Font.open(File.expand_path(font)) do |f|
+        FreeType::API::Font.open(File.expand_path(option.font)) do |f|
           f.set_char_size(0, 0, 3000, 3000)
 
           lines = []
@@ -62,6 +58,10 @@ module Text2svg
             if glyph.outline.tags.length == 0
               glyph = f.notdef
             end
+
+            glyph.bold if option.bold
+            glyph.italic if option.italic
+
             kern = f.kerning_unfitted(before_char, char).x
 
             width, is_draw = if IDEOGRAPHIC_SPACE.match char
@@ -97,7 +97,7 @@ module Text2svg
             y += line_height
             before_char = nil
 
-            case text_align.to_sym
+            case option.text_align.to_sym
             when :center
               x += (max_width - line_width) / 2r
             when :right
@@ -114,7 +114,7 @@ module Text2svg
               x += f.kerning_unfitted(before_char, cs.char).x.to_i
               output << %!  <g transform="translate(#{x.to_i},0)">\n!
               if cs.draw?
-                output << %(    <path stroke="#{stroke}" stroke-width="#{stroke_width}" fill="#{fill}" d="#{cs.d}"/>\n)
+                output << %(    <path stroke="#{option.stroke}" stroke-width="#{option.stroke_width}" fill="#{option.fill}" d="#{cs.d}"/>\n)
               end
               x += cs.width
               x += inter_char_space if cs != line.last
@@ -124,7 +124,7 @@ module Text2svg
             output << "</g>\n".freeze
           end
 
-          [output, max_width.to_i, (y + line_height / 4).to_i]
+          Content.new(output, max_width.to_i, (y + line_height / 4).to_i)
         end
       end
     end
@@ -135,4 +135,10 @@ module Text2svg
       is_draw
     end
   end
+
+  Content = Struct.new(:data, :width, :height) do
+    def to_s
+      data
+    end
+  end
 end

data/lib/text2svg/version.rb

@@ -1,3 +1,3 @@
 module Text2svg
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/text2svg.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'freetype'
+  spec.add_runtime_dependency 'freetype', '>= 0.0.3'
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rgot'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2svg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: freetype
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ files:
 - lib/text2svg.rb
 - lib/text2svg/cli.rb
 - lib/text2svg/cli_test.rb
+- lib/text2svg/option.rb
 - lib/text2svg/outline2d.rb
 - lib/text2svg/typography.rb
 - lib/text2svg/version.rb