freetype 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 753294da701bc4144a7be8a3dead8f738b124cf2
-  data.tar.gz: 36af82be6476778d84a738dbfedd136ece627ae6
+  metadata.gz: c36f62b7c9de44960d5c1610bdad80291833313e
+  data.tar.gz: 46b17c2d49414d9fdad8b8ea6072b342286aab00
 SHA512:
-  metadata.gz: 1ea7b0f90ef2cfec35d4c2e5964334cc36bae5b1589d893a2552039dd604f0c439362d3e9e196898a9486ea101ee9b5a13fb454d45d75eb25673c28f098c3a8a
-  data.tar.gz: 973d1397fc88fe29d576dfdbff4f02b72884386558a271ae0c04505f44a571bb09a0f82acd9d6570ecf6f94a80a0f0310bf5f185b8616ab85ad0bdd0aeb1fb6d
+  metadata.gz: 372d0d55f362b88693b72d12e17336319afea3b75a2a67d1eaedaaa235c02e775f86652e71764a4f5644b3451c98a3e23bced0ff7f31e4819866546877c936a3
+  data.tar.gz: 55ac0bd04129157365706a0a91ffe5aceea88e3c5f4108ffd0563a40e0e589bb8dd972c33ba0167540228c4962e66ec184eefc88b949543a1add02bacc5285b8

data/README.md

@@ -1,5 +1,7 @@
 # FreeType
 
+[![Build Status](https://travis-ci.org/ksss/freetype.svg?branch=master)](https://travis-ci.org/ksss/freetype)
+
 FreeType is freetype wrapper using by ffi
 
 ## Installation
@@ -78,27 +80,15 @@ raise FreeType::Error.find(err) unless err == 0
 
 ```ruby
 require 'freetype/api'
+# or require 'freetype'
 
 include FreeType::API
 
-Library.open do |lib|
-  lib.face_open('font.ttf') do |face|
-    face.set_char_size(0, 32 * 32, 300, 300)
-    outline = face.outline('a')
-    p outline.points #=> [#<FreeType::API::Outline tag=-1 x= 10 y=24>, ...]
-    p face.kerning_unfitted('A', 'W') #=> #<FreeType::API::Vector x=-10 y=0>
-  end
-end
-```
-
-### Use All
-
-```ruby
-require 'freetype'
-
-FreeType::API::Library.open do |lib|
-  face = FFI::MemoryPointer.new(:pointer)
-  FreeType::C::FT_New_Face(lib.pointer, 'font.otf', 0, face)
+Font.open('font.ttf') do |font|
+  font.set_char_size(0, 32 * 32, 300, 300)
+  outline = font.glyph('a').outline
+  p outline.points #=> [#<FreeType::API::Outline tag=-1 x= 10 y=24>, ...]
+  p font.kerning_unfitted('A', 'W') #=> #<FreeType::API::Vector x=-10 y=0>
 end
 ```
 

data/lib/freetype/api.rb

@@ -4,6 +4,22 @@ require 'freetype/error'
 module FreeType
   # high level API for freetype wrapping by FFI
   module API
+    def library_version
+      library = ::FFI::MemoryPointer.new(:pointer)
+      err = FreeType::C::FT_Init_FreeType(library)
+      raise FreeType::Error.find(err) unless err == 0
+
+      amajor = ::FFI::MemoryPointer.new(:int)
+      aminor = ::FFI::MemoryPointer.new(:int)
+      apatch = ::FFI::MemoryPointer.new(:int)
+      FreeType::C::FT_Library_Version(library.get_pointer(0), amajor, aminor, apatch)
+      "#{amajor.get_int(0)}.#{aminor.get_int(0)}.#{apatch.get_int(0)}"
+    ensure
+      err = FreeType::C::FT_Done_Library(library.get_pointer(0))
+      raise FreeType::Error.find(err) unless err == 0
+    end
+    module_function :library_version
+
     module IOInterface
       def open(*args)
         i = new(*args)
@@ -19,58 +35,30 @@ module FreeType
       end
     end
 
-    class Library
+    class Font
       extend IOInterface
       include C
 
-      def initialize
+      attr_reader :face
+      def initialize(font_path)
         @library = ::FFI::MemoryPointer.new(:pointer)
         err = FT_Init_FreeType(@library)
         raise FreeType::Error.find(err) unless err == 0
-      end
-
-      def face_open(font)
-        Face.open(pointer, font) do |f|
-          yield f
-        end
-      end
 
-      def pointer
-        @library.get_pointer(0)
-      end
+        @font_path = font_path
 
-      def version
-        amajor = ::FFI::MemoryPointer.new(:int)
-        aminor = ::FFI::MemoryPointer.new(:int)
-        apatch = ::FFI::MemoryPointer.new(:int)
-        FT_Library_Version(@library.get_pointer(0), amajor, aminor, apatch)
-        "#{amajor.get_int(0)}.#{aminor.get_int(0)}.#{apatch.get_int(0)}"
+        f = ::FFI::MemoryPointer.new(:pointer)
+        err = FT_New_Face(@library.get_pointer(0), @font_path, 0, f)
+        raise FreeType::Error.find(err) unless err == 0
+        @face = FT_FaceRec.new(f.get_pointer(0))
       end
 
       def close
-        err = FT_Done_Library(@library.get_pointer(0))
+        err = FT_Done_Face(@face)
         raise FreeType::Error.find(err) unless err == 0
-        @library.free
-      end
-    end
 
-    class Face
-      extend IOInterface
-      include C
-
-      attr_reader :font_path
-      def initialize(library, font_path)
-        @library = library
-        @font_path = font_path
-        @outline = nil
-        f = ::FFI::MemoryPointer.new(:pointer)
-        err = FT_New_Face(@library, @font_path, 0, f)
+        err = FT_Done_Library(@library.get_pointer(0))
         raise FreeType::Error.find(err) unless err == 0
-        @face = FT_FaceRec.new(f.get_pointer(0))
-      end
-
-      def raw
-        @face
       end
 
       def select_charmap(enc_code)
@@ -122,11 +110,6 @@ module FreeType
         get_kerning(before_char, after_char, :FT_KERNING_UNSCALED)
       end
 
-      def close
-        err = FT_Done_Face(@face)
-        raise FreeType::Error.find(err) unless err == 0
-      end
-
       private
 
       def get_kerning(before_char, after_char, kerning_mode)
@@ -164,8 +147,8 @@ module FreeType
         @glyph = glyph
       end
 
-      def raw
-        @glyph
+      def [](key)
+        @glyph[key]
       end
 
       def metrics
@@ -176,7 +159,7 @@ module FreeType
         Outline.new(@glyph[:outline])
       end
 
-      def space_width
+      def char_width
         @glyph[:metrics][:horiAdvance]
       end
     end
@@ -188,8 +171,8 @@ module FreeType
         @outline = outline
       end
 
-      def raw
-        @outline
+      def [](key)
+        @outline[key]
       end
 
       def points
@@ -212,76 +195,6 @@ module FreeType
         return [] if @outline[:n_points] == 0
         @outline[:tags].get_array_of_char(0, @outline[:n_points])
       end
-
-      def to_svg_path
-        end_ptd_of_counts = contours
-        contours = []
-        contour = []
-        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 = 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
 
     Point = Struct.new(:tag, :x, :y) do

data/lib/freetype/api_test.rb

@@ -3,98 +3,74 @@ require 'freetype/api'
 module FreeTypeApiTest
   include FreeType::API
 
-  def libopen
-    Library.open do |lib|
-      ['data/Prida01.otf', 'data/Starjedi.ttf'].each do |font|
-        lib.face_open(font) do |f|
-          f.set_char_size(0, 0, 300, 300)
-          yield f
-        end
+  def font_open
+    ['data/Prida01.otf', 'data/Starjedi.ttf'].each do |font|
+      Font.open(font) do |f|
+        yield f, font
       end
     end
   end
 
-  def test_Library(t)
-    lib = nil
-    ret = Library.open do |l|
-      lib = l
+  def test_library_version(t)
+    v = FreeType::API.library_version
+    unless String === v
+      t.error 'return value was break'
+    end
+    unless /\A\d+.\d+.\d+\z/ =~ v
+      t.error "version format was break got #{v}"
+    end
+  end
 
-      unless /\A\d+\.\d+\.\d+\z/.match l.version
-        t.error "return value break got #{l.version}"
-      end
+  def test_Font(t)
+    font = nil
+    ret = Font.open('data/Prida01.otf') do |f|
+      font = f
 
       :abc
     end
-    if lib.nil?
+    if font.nil?
       t.error('cannot get FT_Library in `open` with block')
     end
     if ret != :abc
       t.error 'want to return last value in block'
     end
-  end
 
-  def test_Face(t)
-    face = nil
-    Library.open do |lib|
-      ['data/Prida01.otf', 'data/Starjedi.ttf'].each do |font|
-        lib.face_open(font) do |f|
-          face = f
-          if f.char_index('a') == 0
-            t.error('ascii char not defined this font')
-          end
-          if f.char_index('㍿') != 0
-            t.error("I don't know why set character was defined in font")
-          end
-
-          v = f.kerning('A', 'W')
-          unless v
-            t.error('#kerning return object was changed')
-          end
-          unless Fixnum === v.x && Fixnum === v.y
-            t.error('Not vector object. Check spec for FT_Get_Kerning()')
-          end
-
-          if /darwin/ =~ RUBY_PLATFORM
-            begin
-              err = StringIO.new
-              origerr = $stderr
-              $stderr = err
-              f.glyph('a')
-            rescue FreeType::Error::Invalid_Size_Handle
-              if err.string.empty?
-                t.error('recommend warn miss?')
-              end
-            else
-              t.error('check freetype spec')
-            ensure
-              $stderr = origerr
-            end
-          end
-
-          f.set_char_size(0, 0, 300, 300)
-
-          bbox = f.bbox
-          unless BBox === bbox
-            t.error('FreeType::API::Face#bbox return value was break')
-          end
-
-          unless Glyph === f.glyph('a')
-            t.error 'return value was break'
-          end
-
-          # unless Glyph === f.notdef
-          #   t.error 'return value was break'
-          # end
-        end
+    font_open do |f, _font|
+      if f.char_index('a') == 0
+        t.error('ascii char not defined this font')
+      end
+      if f.char_index('㍿') != 0
+        t.error("I don't know why set character was defined in font")
+      end
+
+      v = f.kerning('A', 'W')
+      unless v
+        t.error('#kerning return object was changed')
+      end
+      unless Fixnum === v.x && Fixnum === v.y
+        t.error('Not vector object. Check spec for FT_Get_Kerning()')
+      end
+
+      f.set_char_size(0, 0, 300, 300)
+
+      bbox = f.bbox
+      unless BBox === bbox
+        t.error('FreeType::API::Face#bbox return value was break')
+      end
+
+      unless Glyph === f.glyph('a')
+        t.error 'return value was break'
+      end
+
+      unless Glyph === f.notdef
+        t.error 'return value was break'
       end
-    end
-    if face.nil?
-      t.error('cannot get FT_Face in `open` with block')
     end
   end
 
   def test_glyph(t)
-    libopen do |f|
+    font_open do |f|
+      f.set_char_size(0, 0, 300, 300)
       table = { 'a' => nil, 'b' => nil, 'c' => nil, 'd' => nil }
       table.each do |char, _|
         glyph = f.glyph(char)
@@ -104,8 +80,8 @@ module FreeTypeApiTest
           t.error 'return value was break'
         end
 
-        space_width = glyph.space_width
-        unless Fixnum === space_width
+        char_width = glyph.char_width
+        unless Fixnum === char_width
           t.error 'return value was break'
         end
 
@@ -118,7 +94,8 @@ module FreeTypeApiTest
   end
 
   def test_outline(t)
-    libopen do |f|
+    font_open do |f|
+      f.set_char_size(0, 0, 300, 300)
       table = { 'a' => nil, 'b' => nil, 'c' => nil, 'd' => nil }
       table.each do |char, _|
         outline = f.glyph(char).outline

data/lib/freetype/c.rb

@@ -235,6 +235,9 @@ module FreeType
     # id = FT_Get_Char_Index(face, 'A'.ord) -> glyph id or 0 (undefined)
     attach_function :FT_Get_Char_Index, [:pointer, :ulong], :uint
 
+    # err = FT_Get_Glyph_Name(face, 0, buff, 32)
+    attach_function :FT_Get_Glyph_Name, [:pointer, :uint, :pointer, :uint], :FT_Error
+
     # v = FT_Vector.new
     # err = FT_Get_Kerning(face, before_id, id, :FT_KERNING_DEFAULT, v)
     # p v

data/lib/freetype/c_test.rb

@@ -12,11 +12,19 @@ module FFITest
 
     FONTS.each do |font|
       face = ::FFI::MemoryPointer.new(:pointer)
-      err = FT_New_Face(library.get_pointer(0), font, 0, face)
-      raise FreeType::Error.find(err) unless err == 0
-
-      yield FT_FaceRec.new(face.get_pointer(0)), font
+      begin
+        err = FT_New_Face(library.get_pointer(0), font, 0, face)
+        raise FreeType::Error.find(err) unless err == 0
+
+        yield FT_FaceRec.new(face.get_pointer(0)), font
+      ensure
+        err = FT_Done_Face(face.get_pointer(0))
+        raise FreeType::Error.find(err) unless err == 0
+      end
     end
+  ensure
+    err = FT_Done_Library(library.get_pointer(0))
+    raise FreeType::Error.find(err) unless err == 0
   end
 
   def test_Library(t)
@@ -38,6 +46,12 @@ module FFITest
     unless a.all? { |i| Fixnum === i }
       t.error 'miss get values from FT_Library_Version()'
     end
+    t.log "freetype version: #{a.join('.')}"
+  ensure
+    err = FT_Done_Library(library.get_pointer(0))
+    if err != 0
+      t.error FreeType::Error.find(err).message
+    end
   end
 
   def test_Face(t)
@@ -53,24 +67,28 @@ module FFITest
         t.fatal FreeType::Error.find(err).message
       end
 
-      face = FT_FaceRec.new(face.get_pointer(0))
-      err = FT_Select_Charmap(face, :FT_ENCODING_UNICODE)
-      if err != 0
-        t.error FreeType::Error.find(err).message
+      begin
+        face = FT_FaceRec.new(face.get_pointer(0))
+        err = FT_Select_Charmap(face, :FT_ENCODING_UNICODE)
+        if err != 0
+          t.error FreeType::Error.find(err).message
+        end
+      ensure
+        err = FT_Done_Face(face)
+        if err != 0
+          t.error FreeType::Error.find(err).message
+        end
       end
     end
+  ensure
+    err = FT_Done_Library(library.get_pointer(0))
+    if err != 0
+      t.error FreeType::Error.find(err).message
+    end
   end
 
   def test_FT_Set_Char_Size(t)
     libopen do |face|
-      if /darwin/ =~ RUBY_PLATFORM
-        err = FT_Load_Char(face, 'a'.ord, FreeType::C::FT_LOAD_DEFAULT)
-        e = FreeType::Error.find(err)
-        unless FreeType::Error::Invalid_Size_Handle === e
-          t.fatal 'check freetype spec'
-        end
-      end
-
       err = FT_Set_Char_Size(face, 0, 32, 300, 300)
       if err != 0
         t.error FreeType::Error.find(err).message
@@ -83,6 +101,19 @@ module FFITest
     end
   end
 
+  def test_FT_Get_Glyph_Name(t)
+    libopen do |face|
+      buff = FFI::MemoryPointer.new(:pointer)
+      err = FT_Get_Glyph_Name(face, 0, buff, 32)
+      if err != 0
+        t.error FreeType::Error.find(err).message
+      end
+      unless String === buff.get_string(0)
+        t.error 'May buffering miss?'
+      end
+    end
+  end
+
   def test_char(t)
     libopen do |face, _font|
       err = FT_Set_Char_Size(face, 0, 32, 300, 300)

data/lib/freetype/version.rb

@@ -1,3 +1,3 @@
 module FreeType
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freetype
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi