hexapdf 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34c65a5eca10ade6778049ce85a8913ce180c32fed6826254e61a9cd801482fb
-  data.tar.gz: 7fd2cd5870e03acd71e5d723e41199664d9cabd2ddb1fd9430f997918cc15dd3
+  metadata.gz: a0354d0b129396ae7c479e806b3115f0be7a7f7d74d47df13f9ad82e5f93df50
+  data.tar.gz: 15f8a80efbffea1724ffdd54bc2f204816def3980ba59986336b742eed3ce6b3
 SHA512:
-  metadata.gz: 843a8e201d625d0d1d4a6755aeecf0d2ed810372058d1fec0136bf781e51ed9c46346d3d52fb4d0eda50100aac0b29112f6e4d42c3555bc923deee4583dbba00
-  data.tar.gz: d2042cb0b6cbd82bae3d6252a87ef68ee7791e02bf87e96a233d10bf3bb37eb991dca63c7293396ad5c75d03ecc668938722dbc03ade777131c4cc190cbfbda4
+  metadata.gz: dc132b215e6d6bd2ab6684e269c559e1d55301403c2c035e32eb7fc213572b86e993f1307c219f6e0aec6bbd8da36ab6d10146c82b89e52f68ca5c90949ef819
+  data.tar.gz: 9bd6252238d418844de0d9e08250dc6b7d8a620fc1e4f232bea6870986764ced86dadc0e4794512ae6abc347a6cf95569b5af7ff35c54833d57b2c2513a0d987

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.12.1 - 2020-08-16
+
+### Added
+
+* [HexaPDF::Font::Encoding::Base#code] for retrieving the code for a given
+  glyph name
+
+### Fixed
+
+* [HexaPDF::Font::Type1Wrapper#encode] to correctly resolve the code for a glyph
+  name
+
+
 ## 0.12.0 - 2020-08-12
 
 ### Added

data/lib/hexapdf/font/encoding/base.rb

@@ -73,6 +73,14 @@ module HexaPDF
           @unicode_cache[code] ||= GlyphList.name_to_unicode(name(code))
         end
 
+        # Returns the code for the given glyph name (a Symbol) or +nil+ if there is no code for the
+        # given glyph name.
+        #
+        # If multiple codes reference the given glyph name, the first found is always returned.
+        def code(name)
+          @code_to_name.key(name)
+        end
+
       end
 
     end

data/lib/hexapdf/font/encoding/difference_encoding.rb

@@ -60,6 +60,12 @@ module HexaPDF
           code_to_name[code] || base_encoding.name(code)
         end
 
+        # Returns the code for the given glyph name, either from this object, if a code references
+        # the name, or from the base encoding.
+        def code(name)
+          code_to_name.key(name) || base_encoding.code(name)
+        end
+
       end
 
     end

data/lib/hexapdf/font/type1_wrapper.rb

@@ -192,7 +192,7 @@ module HexaPDF
             if glyph.name == @wrapped_font.missing_glyph_id
               raise HexaPDF::Error, "Glyph for #{glyph.str.inspect} missing"
             end
-            code = @encoding.code_to_name.key(glyph.name)
+            code = @encoding.code(glyph.name)
             if code
               code.chr.freeze
             elsif @max_code < 255

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 
 end

data/test/hexapdf/font/encoding/test_base.rb

@@ -32,4 +32,14 @@ describe HexaPDF::Font::Encoding::Base do
       assert_nil(@base.unicode(66))
     end
   end
+
+  describe "code" do
+    it "returns the code for an existing glyph name" do
+      assert_equal(65, @base.code(:A))
+    end
+
+    it "returns nil if the glyph name is not referenced" do
+      assert_nil(@base.code(:Unknown))
+    end
+  end
 end

data/test/hexapdf/font/encoding/test_difference_encoding.rb

@@ -18,4 +18,12 @@ describe HexaPDF::Font::Encoding::DifferenceEncoding do
       assert_equal(:B, @enc.name(66))
     end
   end
+
+  describe "code" do
+    it "takes the encoding differences into account" do
+      assert_equal(65, @enc.code(:A))
+      @enc.code_to_name[65] = :Known
+      assert_equal(65, @enc.code(:Known))
+    end
+  end
 end

data/test/hexapdf/font/test_type1_wrapper.rb

@@ -13,11 +13,12 @@ describe HexaPDF::Font::Type1Wrapper do
   end
 
   it "can be used with an existing PDF object" do
-    font = @doc.add({Type: :Font, Subtype: :Type1, Encoding: :WinAnsiEncoding,
+    font = @doc.add({Type: :Font, Subtype: :Type1, Encoding: {Differences: [65, :B]},
                      BaseFont: :"Times-Roman"})
     wrapper = HexaPDF::Font::Type1Wrapper.new(@doc, FONT_TIMES, pdf_object: font)
-    assert_equal([:T, :e, :s, :t], wrapper.decode_utf8("Test").map(&:name))
-    assert_equal("a", wrapper.encode(wrapper.glyph(:a)))
+    assert_equal([:B, :E, :A, :S, :T], wrapper.decode_utf8("BEAST").map(&:name))
+    assert_equal("A", wrapper.encode(wrapper.glyph(:A)))
+    assert_equal("A", wrapper.encode(wrapper.glyph(:B)))
   end
 
   it "returns 1 for the scaling factor" do

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.12.0)>>
+      <</Producer(HexaPDF version 0.12.1)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.12.0)>>
+      <</Producer(HexaPDF version 0.12.1)>>
       endobj
       2 0 obj
       <</Length 10>>stream

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse