text2svg 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 669e306f0e466d680462a3fe6277e7fee87394fd
-  data.tar.gz: 17c4b5490802f0a842cb37584cf8c3bb35e8be20
+  metadata.gz: 9bda63aa25ac6727ef210af1f40414c3b7d120b7
+  data.tar.gz: 19469eeca0f2b0308345d6f60b7b94fdd77b9d64
 SHA512:
-  metadata.gz: 53ddc5d148dab731052f69a1ea2ccd45f5e097e7b345f9f6c7e0f1ac760787d833dd54e4edf7d03cd00b583a99a0f50fee16425685dd5842ac1b2080d5083cc2
-  data.tar.gz: 6d5778f049cb11601586bf8f67d8e88d8a3716ab11d0306309be302fcab21bc0d789c8ed61f0cea5e07de80bd8ab8410a18b397cbebe3279e5376f2cad14df08
+  metadata.gz: 06a6b8ad39765e73045d46fccc6880b337b7f61d0416a7d257a87d50181add2a2529b3567f6539aec822c5b82200ee73497bc8af8a103485d8350e5594bc65e3
+  data.tar.gz: b93fdce03dfee133362ce6e0fdeda849f7f631f4a01d340a807f1ea1592e348608e96cf6d335ed044fa08bb93a4a8c6e058bd59fa26d4b5ed88247fa78453532

data/README.md

@@ -10,6 +10,19 @@ $ text2svg "Hello, World\!" --font="/Library/Fonts/Times New Roman.ttf" > test.s
 
 ![img](https://raw.githubusercontent.com/ksss/text2svg/master/data/sample.jpg)
 
+## Option
+
+```shell
+$ text2svg --help
+Usage: text2svg [options]
+    -f, --font FONT                  font file path (require)
+        --text-align ALIGN           text align left,right or center (default left)
+        --encoding ENCODING          input text encoding (default utf-8)
+        --bold                       embolden outline (default false)
+        --italic                     oblique outline (default false)
+        --option STRING              decorate options (default nil)(e.g. fill="red" stroke-width="100")
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/exe/text2svg

@@ -1,6 +1,5 @@
 #! /usr/bin/env ruby
 
-require 'optparse'
 require 'text2svg/cli'
 
 Text2svg::CLI.start

data/lib/text2svg.rb

@@ -1,3 +1,4 @@
-require 'text2svg/typography'
+require 'text2svg/option'
 require 'text2svg/outline2d'
+require 'text2svg/typography'
 require 'text2svg/version'

data/lib/text2svg/cli.rb

@@ -1,19 +1,17 @@
+require 'optparse'
 require 'text2svg/typography'
+require 'text2svg/option'
 
 module Text2svg
   module CLI
     def start
       o = Option.new(
-        nil,
-        :left,
-        :black,
-        :none,
-        1,
-        Encoding::UTF_8,
-        :none,
-        1,
-        false,
-        false,
+        nil,             # font
+        :left,           # text_align
+        Encoding::UTF_8, # encoding
+        false,           # bold
+        false,           # italic
+        nil,             # attribute
       )
       OptionParser.new.tap { |opt|
         opt.on('-f', '--font FONT', 'font file path (require)') do |arg|
@@ -22,24 +20,18 @@ module Text2svg
         opt.on('--text-align ALIGN', 'text align left,right or center (default left)', %i(left right center)) do |arg|
           o.text_align = arg
         end
-        opt.on('--fill FILL', 'text fill color (default black)') do |arg|
-          o.fill = arg
-        end
         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|
+        opt.on('--bold', 'embolden outline (default false)') do |arg|
           o.bold = arg
         end
-        opt.on('--italic', "oblique outline (default false)") do |arg|
+        opt.on('--italic', 'oblique outline (default false)') do |arg|
           o.italic = arg
         end
+        opt.on('--attribute STRING', 'decorate options (default nil)(e.g. fill="red" stroke-width="100")') do |arg|
+          o.attribute = arg
+        end
       }.parse!(ARGV)
       unless o.font
         raise ArgumentError, 'require `--font` cli option. see --help'

data/lib/text2svg/cli_test.rb

@@ -52,14 +52,6 @@ module Text2svgCLITest
     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

@@ -2,14 +2,10 @@ module Text2svg
   class Option < Struct.new(
     :font,
     :text_align,
-    :fill,
-    :stroke,
-    :stroke_width,
     :encoding,
-    :stroke,
-    :stroke_width,
     :bold,
     :italic,
+    :attribute,
   )
 
     class << self

data/lib/text2svg/typography.rb

@@ -15,20 +15,25 @@ module Text2svg
         if Hash === option
           option = Option.from_hash(option)
         end
+        option.encoding ||= Encoding::UTF_8
         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 << content.data
         svg << "</svg>\n"
-        Content.new(svg, content.width, content.height)
+        Content.new(svg, content.width, content.height, content.notdef_indexes)
       end
 
       def path(text, option)
         if Hash === option
           option = Option.from_hash(option)
         end
+        return Content.new("", 0, 0) if text.empty?
+
+        option.encoding ||= Encoding::UTF_8
         text.force_encoding(option.encoding).encode!(Encoding::UTF_8)
 
+        notdef_indexes = []
         FreeType::API::Font.open(File.expand_path(option.font)) do |f|
           f.set_char_size(0, 0, 3000, 3000)
 
@@ -38,7 +43,7 @@ module Text2svg
 
           before_char = nil
           space_width = f.glyph(' '.freeze).char_width
-          text.each_char do |char|
+          text.each_char.with_index do |char, index|
             if NEW_LINE.match char
               line = []
               lines << line
@@ -46,24 +51,22 @@ module Text2svg
               next
             end
 
-            # glyph登録されていない文字
             glyph_id = f.char_index(char)
             glyph = if glyph_id == 0
+              notdef_indexes << index
               f.notdef
             else
               f.glyph(char)
             end
 
-            # glyphが登録されているが字形が登録されていない文字
             if glyph.outline.tags.length == 0
+              notdef_indexes << index
               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
               [space_width * 2r, false]
             elsif WHITESPACE.match char
@@ -92,6 +95,7 @@ module Text2svg
           y = 0r
           output = ''
           line_height = f.line_height
+          output << %(<g #{option.attribute}>\n)
           lines.zip(width_by_line).each do |(line, line_width)|
             x = 0r
             y += line_height
@@ -114,7 +118,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="#{option.stroke}" stroke-width="#{option.stroke_width}" fill="#{option.fill}" d="#{cs.d}"/>\n)
+                output << %(    <path d="#{cs.d}"/>\n)
               end
               x += cs.width
               x += inter_char_space if cs != line.last
@@ -123,8 +127,11 @@ module Text2svg
             end
             output << "</g>\n".freeze
           end
+          output << "</g>\n".freeze
 
-          Content.new(output, max_width.to_i, (y + line_height / 4).to_i)
+          option_width = 0
+          option_width += space_width / 1.5 if option.italic
+          Content.new(output, (max_width + option_width).to_i, (y + line_height / 4).to_i, notdef_indexes)
         end
       end
     end
@@ -136,7 +143,7 @@ module Text2svg
     end
   end
 
-  Content = Struct.new(:data, :width, :height) do
+  Content = Struct.new(:data, :width, :height, :notdef_indexes) do
     def to_s
       data
     end

data/lib/text2svg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2svg
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: freetype
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build svg path data from font file