text2svg 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9369612ae9c5bdb3a13197045796bfbbb1d9b1
-  data.tar.gz: 774fff023b854634b8321a0f3584f7db1d09f841
+  metadata.gz: 11492d4c01bc7b5f3666b2dc0b4bd4e5169c802b
+  data.tar.gz: 71f7d560f7de8a0780db471d7785da77d03448fb
 SHA512:
-  metadata.gz: 7035f7c09512a93ef2672916a73c769c3a54884027425e8146f491264d19b59946056e878752b01a0b4b2e0e578db2f4939f9e1fa6a7a1463d79da929e685994
-  data.tar.gz: 81f15f3f29af0fe100dfe2958ff4c5f412807215b123d0b3700b61240300c5139d8329816cbcc22d739a9a3b9d93d226f532c09261c57f0fc7ea4ab39a0cf7a3
+  metadata.gz: b8bd0e32fe33cb34c98e07140cf124afbcd8acb9bce119d55a3c75593298daea83a7314e3cd8981ebaa1435558f9ae8a82f7470c6d7147021c9b964f7de2d761
+  data.tar.gz: 46de4a1e9ab9d27dc20b3e0561a07f9eb50793377b916af7b0fe80750af6f6331495ddd032f0a57196f852cf4e132459f74bd1fed5dc702408a22c38fbd27d45

data/README.md

@@ -20,7 +20,7 @@ Usage: text2svg [options]
         --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")
+        --attribute STRING           decorate options (default nil)(e.g. fill="red" stroke-width="100")
 ```
 
 ## Ruby API

data/lib/text2svg.rb

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

data/lib/text2svg/typography.rb

@@ -1,5 +1,4 @@
 require 'freetype'
-require 'text2svg/outline2d'
 require 'text2svg/option'
 
 module Text2svg
@@ -39,7 +38,7 @@ module Text2svg
 
         notdef_indexes = []
         unless option.font
-          raise OptionError, 'should be set `font\' option'
+          raise OptionError, 'should set `font\' option'
         end
         FreeType::API::Font.open(File.expand_path(option.font)) do |f|
           f.set_char_size(0, 0, 3000, 3000)
@@ -47,14 +46,13 @@ module Text2svg
           lines = []
           line = []
           lines << line
+          first_hori_bearing_x = []
 
-          before_char = nil
           space_width = f.glyph(' '.freeze).char_width
           text.each_char.with_index do |char, index|
             if NEW_LINE.match char
               line = []
               lines << line
-              before_char = nil
               next
             end
 
@@ -66,7 +64,7 @@ module Text2svg
               f.glyph(char)
             end
 
-            if glyph.outline.tags.length == 0
+            if glyph.outline.tags.empty?
               notdef_indexes << index
               glyph = f.notdef
             end
@@ -74,25 +72,33 @@ module Text2svg
             glyph.bold if option.bold
             glyph.italic if option.italic
 
-            width, is_draw = if IDEOGRAPHIC_SPACE.match char
-              [space_width * 2r, false]
+            hori_advance, width, is_draw = if IDEOGRAPHIC_SPACE.match char
+              [space_width * 2r, space_width * 2r, false]
             elsif WHITESPACE.match char
-              [space_width, false]
+              [space_width, space_width, false]
             else
-              [glyph.char_width, true]
+              if line.empty?
+                first_hori_bearing_x << glyph.metrics[:horiBearingX]
+              end
+              [glyph.metrics[:horiAdvance], glyph.metrics[:width], true]
             end
-            before_char = char
-            line << CharSet.new(char, width, is_draw, Outline2d.new(glyph.outline).to_d)
+            line << CharSet.new(char, hori_advance, width, is_draw, glyph.outline.svg_path_data)
           end
 
           inter_char_space = space_width / INTER_CHAR_SPACE_DIV
-          width_by_line = lines.map do |line|
+
+          width_by_line = lines.zip(first_hori_bearing_x).map do |(line, hori_bearing_x)|
             before_char = nil
-            if 0 < line.length
+            if line.empty?.!
               line.map { |cs|
+                cs.width = if cs == line.last
+                  [cs.width, cs.hori_advance].max
+                else
+                  cs.hori_advance
+                end
                 w = cs.width + f.kerning_unfitted(before_char, cs.char).x
                 w.tap { before_char = cs.char }
-              }.inject(:+) + (line.length - 1) * inter_char_space
+              }.inject(:+) + (line.length - 1) * inter_char_space - [0, hori_bearing_x].min
             else
               0
             end
@@ -102,8 +108,10 @@ 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)|
+
+          output << %(<g #{option.attribute}>\n) if option.attribute
+
+          lines.zip(width_by_line, first_hori_bearing_x).each do |(line, line_width, hori_bearing_x)|
             x = 0r
             y += line_height
             before_char = nil
@@ -119,12 +127,13 @@ module Text2svg
               warn 'text_align must be left,right or center'
             end
 
-            output << %!<g transform="translate(0,#{y.to_i})">\n!
+            output << %!<g transform="matrix(1,0,0,1,0,#{y.to_i})">\n!
 
+            x -= hori_bearing_x
             line.each do |cs|
               x += f.kerning_unfitted(before_char, cs.char).x.to_i
               if cs.draw?
-                output << %!  <path transform="translate(#{x.to_i},0)" d="#{cs.d}"/>\n!
+                output << %!  <path transform="matrix(1,0,0,1,#{x.to_i},0)" d="#{cs.outline2d.join(' '.freeze)}"/>\n!
               end
               x += cs.width
               x += inter_char_space if cs != line.last
@@ -132,7 +141,7 @@ module Text2svg
             end
             output << "</g>\n".freeze
           end
-          output << "</g>\n".freeze
+          output << "</g>\n".freeze if option.attribute
 
           option_width = 0
           option_width += space_width / 1.5 if option.italic
@@ -142,7 +151,7 @@ module Text2svg
     end
   end
 
-  CharSet = Struct.new(:char, :width, :is_draw, :d) do
+  CharSet = Struct.new(:char, :hori_advance, :width, :is_draw, :outline2d) do
     def draw?
       is_draw
     end

data/lib/text2svg/typography_test.rb

@@ -22,23 +22,26 @@ module Text2svgTypographyTest
       opt.text_align = text_align
       [Encoding::UTF_8, Encoding::ASCII_8BIT].each do |encoding|
         opt.encoding = encoding
-        [false, true].each do |bold|
-          opt.bold = bold
-          [false, true].each do |italic|
-            opt.italic = italic
-            begin
-              c = Text2svg::Typography.build("\u{0041}", opt)
-            rescue
-              t.log(opt)
-              raise
-            end
+        [nil, 'fill="red"'].each do |attribute|
+          opt.attribute = attribute
+          [false, true].each do |bold|
+            opt.bold = bold
+            [false, true].each do |italic|
+              opt.italic = italic
+              begin
+                c = Text2svg::Typography.build('A', opt)
+              rescue
+                t.log(opt)
+                raise
+              end
 
-            unless Text2svg::Content === c
-              t.error('return value was break')
-            end
+              unless Text2svg::Content === c
+                t.error('return value was break')
+              end
 
-            unless c.data.encoding == Encoding::UTF_8
-              t.error('encoding was changed')
+              unless c.data.encoding == Encoding::UTF_8
+                t.error('encoding was changed')
+              end
             end
           end
         end
@@ -52,4 +55,15 @@ module Text2svgTypographyTest
       t.error('return value was break')
     end
   end
+
+  def benchmark_build(b)
+    str = [*'!'..'z'].join
+    opt = Text2svg::Option.new('/Library/Fonts/Times New Roman.ttf')
+    b.reset_timer
+    i = 0
+    while i < b.n
+      Text2svg::Typography.build(str, opt)
+      i += 1
+    end
+  end
 end

data/lib/text2svg/version.rb

@@ -1,3 +1,3 @@
 module Text2svg
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 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', '>= 0.0.3'
+  spec.add_runtime_dependency 'freetype', '>= 0.0.6'
   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.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: freetype
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,6 @@ files:
 - lib/text2svg/cli.rb
 - lib/text2svg/cli_test.rb
 - lib/text2svg/option.rb
-- lib/text2svg/outline2d.rb
 - lib/text2svg/typography.rb
 - lib/text2svg/typography_test.rb
 - lib/text2svg/version.rb
@@ -113,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Build svg path data from font file

data/lib/text2svg/outline2d.rb

@@ -1,79 +0,0 @@
-require 'freetype'
-
-module Text2svg
-  class Outline2d
-    def initialize(outline)
-      @outline = outline
-    end
-
-    def to_d
-      end_ptd_of_counts = @outline.contours
-      contours = []
-      contour = []
-      @outline.points.each.with_index do |point, index|
-        contour << point
-        if index == end_ptd_of_counts.first
-          end_ptd_of_counts.shift
-          contours << contour
-          contour = []
-        end
-      end
-
-      path = []
-      contours.each do |contour|
-        first_pt = contour.first
-        last_pt = contour.last
-        curve_pt = nil
-        start = 0
-        if first_pt.on_curve?
-          curve_pt = nil
-          start = 1
-        else
-          if last_pt.on_curve?
-            first_pt = last_pt
-          else
-            first_pt = FreeType::API::Point.new(0, (first_pt.x + last_pt.x) / 2, (first_pt.y + last_pt.y) / 2)
-          end
-          curve_pt = first_pt
-        end
-        path << ['M', first_pt.x, -first_pt.y]
-
-        prev_pt = nil
-        (start...contour.length).each do |j|
-          pt = contour[j]
-          prev_pt = if j == 0
-            first_pt
-          else
-            contour[j - 1]
-          end
-
-          if prev_pt.on_curve? && pt.on_curve?
-            path << ['L', pt.x, -pt.y]
-          elsif prev_pt.on_curve? && !pt.on_curve?
-            curve_pt = pt
-          elsif !prev_pt.on_curve? && !pt.on_curve?
-            path << ['Q', prev_pt.x, -prev_pt.y, (prev_pt.x + pt.x) / 2, -((prev_pt.y + pt.y) / 2)]
-            curve_pt = pt
-          elsif !prev_pt.on_curve? && pt.on_curve?
-            path << ['Q', curve_pt.x, -curve_pt.y, pt.x, -pt.y]
-            curve_pt = nil
-          else
-            raise
-          end
-        end
-
-        next unless first_pt != last_pt
-        if curve_pt
-          path << ['Q', curve_pt.x, -curve_pt.y, first_pt.x, -first_pt.y]
-        else
-          path << ['L', first_pt.x, -first_pt.y]
-        end
-      end
-      path << ['z'] if 0 < path.length
-
-      path.map { |(command, *args)|
-        "#{command}#{args.join(' ')}"
-      }.join('')
-    end
-  end
-end