text2svg 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e29c2ffc44a242de91e2876aef21d394daa5daa0
-  data.tar.gz: f860b743cecb07c3678290131ecaeeafdaf10bf7
+  metadata.gz: 50a6d18c07bd996b35d694f9316685611ae3680f
+  data.tar.gz: 11ad00087eb6292b4805610df01b4c8e165fc23f
 SHA512:
-  metadata.gz: 07bfe6642e0e844de542503f5611fc04eae4f82b91e09a7fd0ae47ddaa4904f9da02c1581f3b41fe2ed4dd01246d23222b5d76bb82278f19d8598a8c69d39b15
-  data.tar.gz: 6b868b446bc1ffd78b9df88080eaf347a8503b6d27d984fe9f9d5c88b58b95ae8d611113fa81c340ee7bfa0313aa6d19079f5af2ed135c3d6622c587c7091bf4
+  metadata.gz: 999e7ce52316d2550e98b1b611b35c52c5c3868b4a3fd6f91dd3c9116723576437c4f678070a4566e9b2549658be53af4113b3e842d1eabc128e30381a99eae5
+  data.tar.gz: 11e8ec2c883b133aa8e66bfabc6243b3b557e00c3a796fcc7297c4e8a86a29a06342adde92d5d85df59d7dbb50c5528fb1e5297a13d52789c4d542e2ccb47fc2

data/lib/text2svg/cli.rb

@@ -30,6 +30,9 @@ module Text2svg
         opt.on('--char-size WCHAR,HCHAR,HDPI,VDPI', 'char size set (default "0,0,3000,3000")') do |arg|
           o.char_size = arg
         end
+        opt.on('--scale NUM', 'scale (default 1)', Numeric) do |arg|
+          o.scale = arg
+        end
       }.parse!(ARGV)
       unless o.font
         raise ArgumentError, 'require `--font` cli option. see --help'

data/lib/text2svg/option.rb

@@ -7,6 +7,7 @@ module Text2svg
     :italic,
     :attribute,
     :char_size,
+    :scale,
   )
     DEFAULTS = [
       nil,             # font
@@ -16,6 +17,7 @@ module Text2svg
       false,           # italic
       nil,             # attribute
       "0,0,3000,3000", # char_size
+      1,
     ]
 
     class << self

data/lib/text2svg/typography.rb

@@ -141,33 +141,34 @@ module Text2svg
           lines.zip(width_by_line).each_with_index do |(line, line_width), index|
             x = 0r
             y += if index == 0
-              f.face[:size][:metrics][:ascender]
+              f.face[:size][:metrics][:ascender] * option.scale
             else
-              f.line_height
+              f.line_height * option.scale
             end
             before_char = nil
 
             case option.text_align.to_sym
             when :center
-              x += (max_width - line_width) / 2r
+              x += (max_width - line_width) / 2r * option.scale
             when :right
-              x += max_width - line_width
+              x += (max_width - line_width) * option.scale
             when :left
               # nothing
             else
               warn 'text_align must be left,right or center'
             end
 
-            output << %!<g transform="matrix(1,0,0,1,0,#{y.to_i})">\n!
+            output << %!<g transform="matrix(1,0,0,1,0,#{y.round})">\n!
 
-            x -= min_hori_bearing_x_all
+            x -= min_hori_bearing_x_all * option.scale
             line.each do |cs|
-              x += f.kerning_unfitted(before_char, cs.char).x.to_i
+              x += f.kerning_unfitted(before_char, cs.char).x * option.scale
               if cs.draw?
-                output << %!  <path transform="matrix(1,0,0,1,#{x.to_i},0)" d="#{cs.outline2d.join(' '.freeze)}"/>\n!
+                d = cs.outline2d.map { |cmd, *points| [cmd, *(points.map { |i| i * option.scale })] }
+                output << %!  <path transform="matrix(1,0,0,1,#{x.round},0)" d="#{d.join(' '.freeze)}"/>\n!
               end
-              x += cs.metrics[:horiAdvance]
-              x += inter_char_space if cs != line.last
+              x += cs.metrics[:horiAdvance] * option.scale
+              x += inter_char_space * option.scale if cs != line.last
               before_char = cs.char
             end
             output << "</g>\n".freeze
@@ -175,11 +176,11 @@ module Text2svg
           output << "</g>\n".freeze if option.attribute
 
           option_width = 0
-          option_width += space_width / 1.5 if option.italic
+          option_width += (space_width / 1.5 * option.scale) if option.italic
           Content.new(
             output,
-            (max_width + option_width).to_i,
-            (y.to_i - f.face[:size][:metrics][:descender] * 1.2).ceil,
+            ((max_width + option_width) * option.scale).ceil,
+            (y - f.face[:size][:metrics][:descender] * 1.2 * option.scale).ceil,
             notdef_indexes,
           )
         end

data/lib/text2svg/typography_test.rb

@@ -1,6 +1,36 @@
 require 'text2svg/typography'
 
 module Text2svgTypographyTest
+  def check(t, opt)
+    ['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 Integer === c.width
+        t.error('return value was break')
+      end
+
+      unless Integer === c.height
+        t.error('return value was break')
+      end
+      unless Array === c.notdef_indexes
+        t.error('return value was break')
+      end
+
+      unless c.data.encoding == Encoding::UTF_8
+        t.error('encoding was changed')
+      end
+    end
+  end
+
   def test_build(t)
     c = Text2svg::Typography.build(nil, Text2svg::Option.new)
     unless Text2svg::Content === c
@@ -21,41 +51,17 @@ module Text2svgTypographyTest
             [false, true].each do |bold|
               [false, true].each do |italic|
                 ["0,0,0,0", "128,128,100,100"].each do |char_size|
-                  opt = Text2svg::Option.default
-                  opt.font = font
-                  opt.text_align = text_align
-                  opt.encoding = encoding
-                  opt.attribute = attribute
-                  opt.bold = bold
-                  opt.italic = italic
-                  opt.char_size = char_size
-
-                  ['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 Integer === c.width
-                      t.error('return value was break')
-                    end
-
-                    unless Integer === c.height
-                      t.error('return value was break')
-                    end
-                    unless Array === c.notdef_indexes
-                      t.error('return value was break')
-                    end
-
-                    unless c.data.encoding == Encoding::UTF_8
-                      t.error('encoding was changed')
-                    end
+                  [1, 0.02].each do |scale|
+                    opt = Text2svg::Option.default
+                    opt.font = font
+                    opt.text_align = text_align
+                    opt.encoding = encoding
+                    opt.attribute = attribute
+                    opt.bold = bold
+                    opt.italic = italic
+                    opt.char_size = char_size
+                    opt.scale = scale
+                    check(t, opt)
                   end
                 end
               end

data/lib/text2svg/version.rb

@@ -1,3 +1,3 @@
 module Text2svg
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2svg
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: freetype
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build svg path data from font file