harfbuzz 0.3 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91353145ce3cd90e818ed73cc55f3c04eca4c2f4
-  data.tar.gz: 1cce672a648ef09d704538e8ca54b76e40bee79a
+SHA256:
+  metadata.gz: 9f1994c4e013fface603443dcb45250688ad78d0d3b2629c2d264f442a7c5b71
+  data.tar.gz: 280dbf3262160b8aa7eec734203a18f78eb69be977d7f770b56cb5d2fb9204e4
 SHA512:
-  metadata.gz: 3992107ed59cae7f51a3049f7ea4d9782a3664f3cb30b114689b135f86250fe004f8ce26e1328542f4ecd7018d24e038ba6a6183e4457be9de81a288d0c4ea9a
-  data.tar.gz: 26bfdce861b3d20c8875df4434af889b071b8990247ca7e1e2d7fc2603d00b2a110303c1ca270209731bd7b71135751c9430be2db7834d32da050b454f9da419
+  metadata.gz: 6f5dfdbf1ee3fa758fe3649922a831ede67aab3e168b3bb85467b9694147abf00131969b68db7d23f744eae82f83f49e6dd3e7292d01199265fb9d509cceb077
+  data.tar.gz: 0c136c2afed468e220324c9bce978e77344b749853c665714dface90a5e7590a2fb0698eaaf43173df1e12c05097c9421126786afd368b8d1a7710c8e5a1e19d

data/.gitignore

@@ -1,3 +1,3 @@
 .DS_Store
 Gemfile.lock
-pkg/
+*.gem

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Only important or user-facing changes are listed here. See commit log for typos, refactoring, documentation tweaks, etc.
 
+## 0.4 / 2018-01-08
+
+- Modernize/simplify gem structure.
+- Improve exception messages.
+
 ## 0.3 / 2016-05-10
 
 - Add new Harfbuzz bindings:

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
-# # use local FFI gem
-# gem 'ffi', path: '~/src/ffi'
-
-# Specify your gem's dependencies in itinerary.gemspec
 gemspec

data/README.md

@@ -53,6 +53,8 @@ Memory management may not be correct. (I've seen crashes when processing large a
 
 ## To-do
 
+- Update for recent (version 4.0+) versions of Harfbuzz.
+
 - Implement hb_buffer_set_* functions.
 
 - Add documentation.

data/Rakefile

@@ -1,10 +1,9 @@
-require 'bundler'
 require 'bundler/gem_tasks'
+Bundler.require
 require 'rake/testtask'
 
-Rake::TestTask.new
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/test_*.rb']
+end
 
-desc 'Run benchmark'
-task :benchmark do
-  load './examples/benchmark.rb'
-end
+task :default => :test

data/examples/benchmark.rb

@@ -8,7 +8,7 @@ Features = %w{+dlig +hlig}
 
 Benchmark.bm do |benchmark|
   benchmark.report do
-    face = Harfbuzz::Face.new(Harfbuzz::Blob.new(File.open('/Library/Fonts/ACaslonPro-Regular.otf', 'rb')))
+    face = Harfbuzz::Face.new(Harfbuzz::Blob.new(File.open('/Users/johnl/Fonts/A/Adobe Caslon Pro/ACaslonPro-Regular.otf', 'rb')))
     font = Harfbuzz::Font.new(face)
     Words.each do |word|
       buffer = Harfbuzz::Buffer.new

data/examples/example.rb

@@ -14,7 +14,7 @@ puts "Shapers: #{Harfbuzz.shapers.join(', ')}"
 # Create a font to be used for shaping. To get the most of out this example, use an OpenType font.
 #
 
-face = Harfbuzz::Face.new(File.open('/Library/Fonts/ACaslonPro-Regular.otf', 'rb'))
+face = Harfbuzz::Face.new(File.open('/Users/johnl/Fonts/A/Adobe Caslon Pro/ACaslonPro-Regular.otf', 'rb'))
 
 puts "Font face index: #{face.index}"
 puts "Font face upem: #{face.upem}"
@@ -82,7 +82,7 @@ buffer.length.times do |i|
   info, position = glyph_infos[i], glyph_positions[i]
   glyph_name = font.glyph_to_string(info.codepoint)
   glyph_extents = font.glyph_extents(info.codepoint)
-  puts "/%-10.10s %5u | mask: %04X | cluster: %2u | advance: %4d,%4d | offset: %4d,%4d | bearing: %4d,%4d | size: %4d,%4d" % [
+  puts "/%-10.10s | gid: %5u | mask: %04X | cluster: %2u | advance: %4d,%4d | offset: %4d,%4d | bearing: %4d,%4d | size: %4d,%4d" % [
     glyph_name,
     info.codepoint,
     info.mask,

data/harfbuzz.gemspec

@@ -1,22 +1,22 @@
 Gem::Specification.new do |s|
   s.name          = 'harfbuzz'
-  s.version       = '0.3'
+  s.version       = '0.5'
   s.summary       = 'Ruby interface to the Harfbuzz text shaping engine'
   s.author        = 'John Labovitz'
   s.email         = 'johnl@johnlabovitz.com'
   s.description   = %q{
     Harfbuzz is a Ruby interface to the Harfbuzz text shaping engine.
   }
+  s.license       = 'MIT'
   s.homepage      = 'http://github.com/jslabovitz/harfbuzz-gem'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = %w{lib}
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_path  = 'lib'
 
-  s.add_dependency 'ffi'
+  s.add_dependency 'ffi', '~> 1.15'
 
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'minitest-power_assert'
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'minitest', '~> 5.16'
+  s.add_development_dependency 'minitest-power_assert', '~> 0.3'
 end

data/lib/harfbuzz/base.rb

@@ -4,7 +4,7 @@ module Harfbuzz
 
     def self.finalize(method, ptr)
       proc {
-        Harfbuzz.send(method, ptr) unless ptr == 0
+        Harfbuzz.send(method, ptr) if ptr
       }
     end
 

data/lib/harfbuzz/buffer.rb

@@ -62,6 +62,7 @@ module Harfbuzz
   end
 
   attach_function :hb_buffer_create, [], :hb_buffer_t
+  attach_function :hb_buffer_destroy, [:hb_buffer_t], :void
   attach_function :hb_buffer_add_utf8, [
     :hb_buffer_t,   # buffer
     :pointer,       # text
@@ -91,7 +92,7 @@ module Harfbuzz
     end
 
     def add_utf8(text, offset=0, length=-1)
-      raise "expected text in UTF-8 encoding, but received #{text.encoding}" unless text.encoding == Encoding::UTF_8
+      raise "Expected text in UTF-8 encoding, but received #{text.encoding} (#{text.inspect})" unless text.encoding == Encoding::UTF_8
       text_ptr = FFI::MemoryPointer.new(:char, text.bytesize)
       text_ptr.put_bytes(0, text)
       Harfbuzz.hb_buffer_add_utf8(@hb_buffer, text_ptr, text.bytesize, offset, length)

data/lib/harfbuzz/face.rb

@@ -6,6 +6,7 @@ module Harfbuzz
     :hb_blob_t,         # blob
     :uint,              # index
   ], :hb_face_t
+  attach_function :hb_face_destroy, [:hb_face_t], :void
   attach_function :hb_face_get_index, [:hb_face_t], :uint
   attach_function :hb_face_get_upem, [:hb_face_t], :uint
   attach_function :hb_face_get_glyph_count, [:hb_face_t], :uint

data/lib/harfbuzz/font.rb

@@ -76,11 +76,19 @@ module Harfbuzz
   end
 
   attach_function :hb_font_create, [:hb_face_t], :hb_font_t
+  attach_function :hb_font_destroy, [:hb_font_t], :void
   attach_function :hb_font_set_scale, [
     :hb_font_t,     # font
     :int,           # x_scale
     :int,           # y_scale
   ], :void
+  attach_function :hb_font_set_ptem, [
+    :hb_font_t,
+    :float,
+  ], :void
+  attach_function :hb_font_get_ptem, [
+    :hb_font_t,
+  ], :float
   attach_function :hb_ft_font_set_funcs, [:hb_font_t], :void
   attach_function :hb_font_get_scale, [
     :hb_font_t,     # font
@@ -115,14 +123,23 @@ module Harfbuzz
     :hb_codepoint_t,     # glyph
     GlyphExtents.by_ref  # extents
   ], :hb_bool_t
+  attach_function :hb_font_get_glyph_advance_for_direction, [
+    :hb_font_t,          # font
+    :hb_codepoint_t,     # glyph
+    # :hb_direction_t,     # direction
+    :int,                # direction
+    :pointer,            # x
+    :pointer,            # y
+  ], :void
 
   class Font < Base
 
     attr_reader :hb_font
 
-    def initialize(face)
+    def initialize(face, size=nil)
       @hb_font = Harfbuzz.hb_font_create(face.hb_face)
-      Harfbuzz.hb_font_set_scale(@hb_font, face.upem, face.upem)
+      # Harfbuzz.hb_font_set_scale(@hb_font, face.upem, face.upem)
+      Harfbuzz.hb_font_set_ptem(@hb_font, size) if size
       Harfbuzz.hb_ft_font_set_funcs(@hb_font)
       define_finalizer(:hb_font_destroy, @hb_font)
     end
@@ -147,6 +164,10 @@ module Harfbuzz
       ]
     end
 
+    def ptem
+      Harfbuzz.hb_font_get_ptem(@hb_font)
+    end
+
     def glyph_to_string(glyph)
       string_ptr = FFI::MemoryPointer.new(:char, 20)
       Harfbuzz.hb_font_glyph_to_string(@hb_font, glyph, string_ptr, 20)
@@ -179,6 +200,17 @@ module Harfbuzz
       glyph_extents
     end
 
+    def glyph_advance_for_direction(glyph, direction)
+      x_ptr = FFI::MemoryPointer.new(:int32, 1)
+      y_ptr = FFI::MemoryPointer.new(:int32, 1)
+      Harfbuzz.hb_font_get_glyph_advance_for_direction(@hb_font, glyph, direction, x_ptr, y_ptr)
+      if Harfbuzz.hb_direction_is_horizontal(direction)
+        x_ptr.read_int32
+      else
+        y_ptr.read_int32
+      end
+    end
+
     if Harfbuzz.version_at_least(1,1,3)
 
       def h_extents

data/lib/harfbuzz.rb

@@ -13,6 +13,37 @@ module Harfbuzz
   typedef :bool,    :hb_bool_t
   typedef :int32,   :hb_position_t
 
+  # hb_direction_t enum
+  HB_DIRECTION_INVALID = 0
+  HB_DIRECTION_LTR = 4
+  HB_DIRECTION_RTL = 5
+  HB_DIRECTION_TTB = 6
+  HB_DIRECTION_BTT = 7
+
+  def self.hb_direction_is_valid(dir)
+    dir & ~3 == 4
+  end
+
+  def self.hb_direction_is_horizontal(dir)
+    dir & ~1 == 4
+  end
+
+  def self.hb_direction_is_vertical(dir)
+    dir & ~1 == 6
+  end
+
+  def self.hb_direction_is_forward(dir)
+    dir & ~2 == 4
+  end
+
+  def self.hb_direction_is_backward(dir)
+    dir & ~2 == 5
+  end
+
+  def self.hb_direction_reverse(dir)
+    dir ^ 1
+  end
+
 end
 
 require 'harfbuzz/version'

data/test/helpers.rb

@@ -7,7 +7,7 @@ module Harfbuzz
   module Setup
 
     def setup
-      @data = File.open('/Library/Fonts/ACaslonPro-Regular.otf', 'rb')
+      @data = File.open('/Users/johnl/Fonts/A/Adobe Caslon Pro/ACaslonPro-Regular.otf', 'rb')
       @blob = Harfbuzz::Blob.new(@data)
       @face = Harfbuzz::Face.new(@blob)
       @font = Harfbuzz::Font.new(@face)

data/test/test_font.rb

@@ -6,6 +6,11 @@ module Harfbuzz
 
     include Setup
 
+    def test_init_with_size
+      font2 = Harfbuzz::Font.new(@face, 12)
+      assert { font2.ptem == 12.0 }
+    end
+
     def test_scale
       scale = @font.scale
       assert { scale.kind_of?(Array) }
@@ -38,6 +43,11 @@ module Harfbuzz
       assert { extents.height != 0 }
     end
 
+    def test_glyph_advance
+      advance = @font.glyph_advance_for_direction(1, Harfbuzz::HB_DIRECTION_LTR)
+      assert { advance > 0 }
+    end
+
   end
 
 end

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: harfbuzz
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.5'
 platform: ruby
 authors:
 - John Labovitz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: minitest-power_assert
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 description: "\n    Harfbuzz is a Ruby interface to the Harfbuzz text shaping engine.\n
   \ "
 email: johnl@johnlabovitz.com
@@ -114,9 +100,10 @@ files:
 - test/test_shaper.rb
 - test/test_version.rb
 homepage: http://github.com/jslabovitz/harfbuzz-gem
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,9 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: Ruby interface to the Harfbuzz text shaping engine
 test_files:
@@ -144,4 +130,3 @@ test_files:
 - test/test_general.rb
 - test/test_shaper.rb
 - test/test_version.rb
-has_rdoc: