text2svg 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357a62eff27092a7b4e254787d0a864a35806029
-  data.tar.gz: f8550343fa880b9dcc680947d3098c6f71ee264c
+  metadata.gz: 5dc265c2022da3597a26d0b43dd53540ff28000d
+  data.tar.gz: 666f2d5988a3cb2be258b695edb1ee2ed7152dfd
 SHA512:
-  metadata.gz: 3db21fadbd92f6b74eecbff8a628dac2fc26041633867648e54736d5fdef7970d06a797407c9031ae3aa750048f3471e2e9034e94341d2d2c7bf3b1d2683e161
-  data.tar.gz: 87db9c21fddd3c7298eb4701f45339e30791a2883dca29d104a67df1e2848a7ee8eb7f960476885cc5ef2d14509e54cfc89c8d7649a1b9d7736c7a8b41c001fb
+  metadata.gz: a2ebd92f86fb3b0b69d2abe5c529a5b66e08581790533ab75d72270bc2bdd3b0a17fcfb567ac5b99cc71f886bb828e014a75c25fcf45bdaf656d4f8db83079fd
+  data.tar.gz: 39329909625340a14ca97d2f0d9df5775dd21dfec2380f5510dbe617b33e4b6d655fc5da49c138ca1e2ff3ef38cbfc9f156ae5a69774a8e1b233c64f7f30fbc5

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+before_install:
+  - sudo apt-get install -qq libfreetype6-dev
+rvm:
+  - 2.1.7 # ffi is not support to 2.1.8
+  - 2.2.4
+  - 2.3.0
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+notifications:
+  email: false
+before_install: gem install bundler -v 1.11.2

data/README.md

@@ -1,5 +1,7 @@
 # Text2svg
 
+[![Build Status](https://travis-ci.org/ksss/text2svg.svg?branch=master)](https://travis-ci.org/ksss/text2svg)
+
 Build svg path data from font file
 
 Using by freetype API

data/lib/text2svg/cli_test.rb

@@ -19,7 +19,7 @@ module Text2svgCLITest
   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[1] = '--font=data/sporq.ttf'
       ARGV[2] = "--text-align=#{text_align}"
 
       check(t)
@@ -32,7 +32,7 @@ module Text2svgCLITest
       ['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[1] = '--font=data/sporq.ttf'
       ARGV[2] = "--encoding=#{encoding}"
       check(t)
     end
@@ -40,14 +40,14 @@ module Text2svgCLITest
 
   def test_bold(t)
     ARGV[0] = 'Hello'
-    ARGV[1] = '--font=/Library/Fonts/Times New Roman.ttf'
+    ARGV[1] = '--font=data/sporq.ttf'
     ARGV[2] = '--bold'
     check(t)
   end
 
   def test_italic(t)
     ARGV[0] = 'Hello'
-    ARGV[1] = '--font=/Library/Fonts/Times New Roman.ttf'
+    ARGV[1] = '--font=data/sporq.ttf'
     ARGV[2] = '--italic'
     check(t)
   end

data/lib/text2svg/typography.rb

@@ -47,13 +47,14 @@ module Text2svg
           lines = []
           line = []
           lines << line
-          first_hori_bearing_x = [0]
+          min_hori_bearing_x_by_line = [0]
 
           space_width = f.glyph(' '.freeze).char_width
           text.each_char.with_index do |char, index|
             if NEW_LINE.match char
+              min_hori_bearing_x_by_line[-1] = min_hori_bearing_x(line)
+              min_hori_bearing_x_by_line << 0
               line = []
-              first_hori_bearing_x << 0
               lines << line
               next
             end
@@ -74,33 +75,42 @@ module Text2svg
             glyph.bold if option.bold
             glyph.italic if option.italic
 
-            hori_advance, width, is_draw = if IDEOGRAPHIC_SPACE.match char
-              [space_width * 2r, space_width * 2r, false]
+            metrics = FreeType::C::FT_Glyph_Metrics.new
+            is_draw = if IDEOGRAPHIC_SPACE.match char
+              FreeType::C::FT_Glyph_Metrics.members.each do |m|
+                metrics[m] = space_width * 2r
+              end
+              false
             elsif WHITESPACE.match char
-              [space_width, space_width, false]
+              FreeType::C::FT_Glyph_Metrics.members.each do |m|
+                metrics[m] = space_width
+              end
+              false
             else
-              if line.empty?
-                first_hori_bearing_x[-1] = glyph.metrics[:horiBearingX]
+              FreeType::C::FT_Glyph_Metrics.members.each do |m|
+                metrics[m] = glyph.metrics[m]
               end
-              [glyph.metrics[:horiAdvance], glyph.metrics[:width], true]
+              true
             end
-            line << CharSet.new(char, hori_advance, width, is_draw, glyph.outline.svg_path_data)
+            line << CharSet.new(char, metrics, is_draw, glyph.outline.svg_path_data)
           end
 
+          min_hori_bearing_x_by_line[-1] = min_hori_bearing_x(line)
           inter_char_space = space_width / INTER_CHAR_SPACE_DIV
+          min_hori_bearing_x_all = min_hori_bearing_x_by_line.min
 
-          width_by_line = lines.zip(first_hori_bearing_x).map do |(line, hori_bearing_x)|
+          width_by_line = lines.map do |line|
             before_char = nil
             if line.empty?.!
               line.map { |cs|
-                cs.width = if cs.equal?(line.last)
-                  [cs.width, cs.hori_advance].max
+                width = if cs.equal?(line.last)
+                  cs.metrics[:width] + cs.metrics[:horiBearingX]
                 else
-                  cs.hori_advance
+                  cs.metrics[:horiAdvance]
                 end
-                w = cs.width + f.kerning_unfitted(before_char, cs.char).x
+                w = width + f.kerning_unfitted(before_char, cs.char).x
                 w.tap { before_char = cs.char }
-              }.inject(:+) + (line.length - 1) * inter_char_space - [0, hori_bearing_x].min
+              }.inject(:+) + (line.length - 1) * inter_char_space - min_hori_bearing_x_all
             else
               0
             end
@@ -113,7 +123,7 @@ module Text2svg
 
           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)|
+          lines.zip(width_by_line).each do |(line, line_width)|
             x = 0r
             y += line_height
             before_char = nil
@@ -131,13 +141,13 @@ module Text2svg
 
             output << %!<g transform="matrix(1,0,0,1,0,#{y.to_i})">\n!
 
-            x -= hori_bearing_x
+            x -= min_hori_bearing_x_all
             line.each do |cs|
               x += f.kerning_unfitted(before_char, cs.char).x.to_i
               if cs.draw?
                 output << %!  <path transform="matrix(1,0,0,1,#{x.to_i},0)" d="#{cs.outline2d.join(' '.freeze)}"/>\n!
               end
-              x += cs.width
+              x += cs.metrics[:horiAdvance]
               x += inter_char_space if cs != line.last
               before_char = cs.char
             end
@@ -150,10 +160,23 @@ module Text2svg
           Content.new(output, (max_width + option_width).to_i, (y + line_height / 4).to_i, notdef_indexes)
         end
       end
+
+      private
+
+      def min_hori_bearing_x(line)
+        return 0 if line.empty?
+        point = 0
+        bearings = line.map do |cs|
+          (cs.metrics[:horiBearingX] + point).tap {
+            point += cs.metrics[:horiAdvance]
+          }
+        end
+        [bearings.min, 0].min
+      end
     end
   end
 
-  CharSet = Struct.new(:char, :hori_advance, :width, :is_draw, :outline2d) do
+  CharSet = Struct.new(:char, :metrics, :is_draw, :outline2d) do
     def draw?
       is_draw
     end

data/lib/text2svg/typography_test.rb

@@ -14,34 +14,35 @@ module Text2svgTypographyTest
       t.error('error conditions was changed')
     end
 
-    opt = Text2svg::Option.new(
-      '/Library/Fonts/Times New Roman.ttf',
-      nil,
-    )
-    [nil, :left, :right, :center].each do |text_align|
-      opt.text_align = text_align
-      [Encoding::UTF_8, Encoding::ASCII_8BIT].each do |encoding|
-        opt.encoding = encoding
-        [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
-              ['ABC', "\n", "\n\nA", "", "A\nB\n\n", "A\n\n\nC", "<", ">", "&", "=", "@", "%", "#", "("].each do |text|
-                begin
-                  c = Text2svg::Typography.build(text, opt)
-                rescue => e
-                  t.log("raise error #{e.class}: #{e.message} with text=\"#{text}\",opt=#{opt}")
-                  raise
-                end
+    Dir["data/*"].grep(/otf|ttf/).each do |font|
+      [nil, :left, :right, :center].each do |text_align|
+        [Encoding::UTF_8, Encoding::ASCII_8BIT].each do |encoding|
+          [nil, 'fill="red"'].each do |attribute|
+            [false, true].each do |bold|
+              [false, true].each do |italic|
+                opt = Text2svg::Option.new
+                opt.font = font
+                opt.text_align = text_align
+                opt.encoding = encoding
+                opt.attribute = attribute
+                opt.bold = bold
+                opt.italic = italic
 
-                unless Text2svg::Content === c
-                  t.error('return value was break')
-                end
+                ['ABC', "\n", "\n\nA", "", "A\nB\n\n", "A\n\n\nC", "<", ">", "&", "=", "@", "%", "#", "("].each do |text|
+                  begin
+                    c = Text2svg::Typography.build(text, opt)
+                  rescue => e
+                    t.log("raise error #{e.class}: #{e.message} with text=\"#{text}\",opt=#{opt}")
+                    raise
+                  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
@@ -60,7 +61,7 @@ module Text2svgTypographyTest
 
   def benchmark_build(b)
     str = [*'!'..'z'].join
-    opt = Text2svg::Option.new('/Library/Fonts/Times New Roman.ttf')
+    opt = Text2svg::Option.new('data/sporq.ttf')
     b.reset_timer
     i = 0
     while i < b.n

data/lib/text2svg/version.rb

@@ -1,3 +1,3 @@
 module Text2svg
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: freetype
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -82,7 +83,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- data/Lobster.otf
 - data/sample.jpg
+- data/sporq.ttf
 - exe/text2svg
 - lib/text2svg.rb
 - lib/text2svg/cli.rb