fontina 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a5e7e91b5b29fff080ff45bb59349ca07baf9b
-  data.tar.gz: 0973241dd78cbce62b7abff045b392c42db5acbf
+  metadata.gz: 2f01e78cf2aa5f82dea6f070a3022a7a2130845f
+  data.tar.gz: 44dde365403669fb6949e7e529fc86f7476fb5ce
 SHA512:
-  metadata.gz: 30b24eb50c609b51e14e8a592635a37ced368bbed49c1605fdd50b0da14bc07be0c13252e121dd83911ade051ee5dda0626a141843201c3a5d80cd6c9b7099f0
-  data.tar.gz: 1a452c8bc2791749578b5f8f31a79ec11dc12d4438bbb909b1dc538ef5d482294224ef32f0b758bf967ebfa766e0bf7dd5c3579203e070b97321ceca980ad07a
+  metadata.gz: fe8a6882169d9e72100c09dd5ba0cb41a80039b74f9cf29880e421ab1332f25370d0bdb95ac485cad0fb24b4a528f7433f229ab7999ec04affc41076783bdb49
+  data.tar.gz: 755834007fd8cf8987e81f9b0d86754a59eec77700c354afa3ab27e0b1368cf49c83507cd3718a5014550776cae6cd71347a4a2dc37d7ba0184d19e4adfe2e5a

data/lib/fontina/formats/open_type/constants.rb

@@ -1,18 +1,18 @@
 module Fontina
-  
+
   module Formats::OpenType
     OT_VERSION = 0x4f54544f  # OTTO
     TT_VERSION = 0x00010000
 
     FW_NORMAL = 400
     FW_BOLD   = 700
-  
+
     PLATFORMS = {
       0 => :unicode,
       1 => :mac,
       3 => :windows,
     }.freeze
-  
+
     ENCODINGS = {
       unicode: {
          0 => :unicode_1_0,
@@ -20,7 +20,7 @@ module Fontina
          3 => :unicode_2_0_bmp,
          4 => :unicode_2_0,
       }.freeze,
-  
+
       mac: {
          0 => :roman,
          1 => :japanese,
@@ -56,19 +56,19 @@ module Fontina
         31 => :sindhi,
         32 => :uninterpreted,
       }.freeze,
-  
+
       windows: {
          0 => :symbol,
-         1 => :unicode_ucs2_bmp,
-         2 => :shift_jis,
-         3 => :prc,
-         4 => :big5,
+         1 => Encoding::UCS_2BE,
+         2 => Encoding::Shift_JIS,
+         3 => Encoding::GBK,
+         4 => Encoding::Big5,
          5 => :wansung,
          6 => :johab,
-        10 => :unicode_ucs4,
+        10 => Encoding::UCS_4BE,
       }.freeze,
     }.freeze
-  
+
     LANGUAGES = {
       unicode: { 0 => nil }.freeze,
       mac: { 0xffff => nil }.merge!(LanguageCodes::MAC).freeze,

data/lib/fontina/formats/open_type/name_table.rb

@@ -15,7 +15,7 @@ module Fontina::Formats::OpenType
     uint16 :offs
 
     delayed_io :string, read_abs_offset: -> { addr + string_offs + offs } do
-      string length: :len
+      e_string length: :len, encoding: -> { encoding.value if encoding.value.is_a? Encoding }
     end
   end
 

data/lib/fontina/formats/open_type.rb

@@ -16,6 +16,7 @@ module Fontina
           %w[
             ../language_codes/mac
             ../language_codes/windows
+            shared/e_string
             open_type/constants
             open_type/name_table
             open_type/head_table

data/lib/fontina/formats/shared/e_string.rb

@@ -0,0 +1,11 @@
+module Fontina::Formats::Shared
+
+  class EString < BinData::String
+    mandatory_parameter :encoding
+
+    def snapshot
+      super.tap { |s| e = eval_parameter(:encoding) and s.force_encoding e }
+    end
+  end
+
+end

data/lib/fontina/version.rb

@@ -1,3 +1,3 @@
 module Fontina
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontina
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Petter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -161,6 +161,7 @@ files:
 - lib/fontina/formats/open_type/os2_table.rb
 - lib/fontina/formats/open_type/table.rb
 - lib/fontina/formats/open_type/table_directory.rb
+- lib/fontina/formats/shared/e_string.rb
 - lib/fontina/formats/shared/p_string.rb
 - lib/fontina/language_codes/mac.rb
 - lib/fontina/language_codes/windows.rb