text2svg 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bfacdff9cb34a8770ff99e984013f4ff9a4f837
-  data.tar.gz: 0909e9114da286c14ec1bb577c7ac2c858902ddd
+  metadata.gz: bc9791dd9a1ca2e7c574f2d925ee0b60c54b6d6e
+  data.tar.gz: 558e0e2c3812fa6442d88740cf85edfd7a07f6b5
 SHA512:
-  metadata.gz: aa3d335335590c1c9a76cdd12a2bdd758e14651c76eb5b42c5f8fe064789a3ad5a3daee73e76ae7ff00ee507b496be9639cf9b08ae53e5954b36fb1af02d0879
-  data.tar.gz: 137eb22ad7a9be9a9f742d3158d69f78dda6f7bf844bdb38add81e32aff7a4037be6d25ce2e3de7d52d26b696f6057398127d1031dd67d7c3429b323939bfeb2
+  metadata.gz: 251968686481b39e1158be711a606bb9db0981310341f0840ec71535992fdcb79a47f919bd70ea60cf35e3b910449d02b5e10670a97a622570e90856a757206b
+  data.tar.gz: 01d3f3a4cf6201c176d3e4640247e7de661a4cb633e8db8e2e4514533a3be53dea485475c2cc98a92650a636a767e198e0a3aee929e2077de3dbacee808c13b7

data/lib/text2svg/typography.rb

@@ -81,19 +81,32 @@ module Text2svg
 
             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
+              metrics[:width] = space_width * 2r
+              metrics[:height] = 0
+              metrics[:horiBearingX] = space_width * 2r
+              metrics[:horiBearingY] = 0
+              metrics[:horiAdvance] = space_width * 2r
+              metrics[:vertBearingX] = 0
+              metrics[:vertBearingY] = 0
+              metrics[:vertAdvance] = 0
+
               false
             elsif WHITESPACE.match char
-              FreeType::C::FT_Glyph_Metrics.members.each do |m|
-                metrics[m] = space_width
-              end
+              metrics[:width] = space_width
+              metrics[:height] = 0
+              metrics[:horiBearingX] = space_width
+              metrics[:horiBearingY] = 0
+              metrics[:horiAdvance] = space_width
+              metrics[:vertBearingX] = 0
+              metrics[:vertBearingY] = 0
+              metrics[:vertAdvance] = 0
+
               false
             else
               FreeType::C::FT_Glyph_Metrics.members.each do |m|
                 metrics[m] = glyph.metrics[m]
               end
+
               true
             end
             line << CharSet.new(char, metrics, is_draw, glyph.outline.svg_path_data)
@@ -127,9 +140,13 @@ module Text2svg
 
           output << %(<g #{option.attribute}>\n) if option.attribute
 
-          lines.zip(width_by_line).each do |(line, line_width)|
+          lines.zip(width_by_line).each_with_index do |(line, line_width), index|
             x = 0r
-            y += line_height
+            y += if index == 0
+              line.map { |cs| cs.metrics[:horiBearingY] }.max || 0
+            else
+              line_height
+            end
             before_char = nil
 
             case option.text_align.to_sym
@@ -161,7 +178,12 @@ module Text2svg
 
           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)
+          Content.new(
+            output,
+            (max_width + option_width).to_i,
+            (y + (lines.last.map { |cs| cs.metrics[:height] - cs.metrics[:horiBearingY] }.max || 0)).to_i,
+            notdef_indexes
+          )
         end
       end
 

data/lib/text2svg/typography_test.rb

@@ -30,7 +30,7 @@ module Text2svgTypographyTest
                   opt.italic = italic
                   opt.char_size = char_size
 
-                  ['ABC', "\n", "\n\nA", "", "A\nB\n\n", "A\n\n\nC", "<", ">", "&", "=", "@", "%", "#", "("].each do |text|
+                  ['ABC', "\n", "\n\nA", "", "A\nB\n\n", "A\n  \n\nC", "<", ">", "&", "=", "@", "%", "#", "("].each do |text|
                     begin
                       c = Text2svg::Typography.build(text, opt)
                     rescue => e

data/lib/text2svg/version.rb

@@ -1,3 +1,3 @@
 module Text2svg
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2svg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-12 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.2.5
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Build svg path data from font file