hexapdf 0.20.0 → 0.20.4

data/data/hexapdf/encoding/zapfdingbats.txt

@@ -12,6 +12,8 @@
 # implied. See the License for the specific language governing
 # permissions and limitations under the License.
 # -----------------------------------------------------------
+# Modified for use with HexaPDF
+# -----------------------------------------------------------
 # Name:          ITC Zapf Dingbats Glyph List
 # Table version: 2.0
 # Date:          September 20, 2002
@@ -21,205 +23,204 @@
 #   (1) glyph name--upper/lowercase letters and digits
 #   (2) Unicode scalar value--four uppercase hexadecimal digits
 #
-a100;275E
-a101;2761
-a102;2762
-a103;2763
-a104;2764
-a105;2710
-a106;2765
-a107;2766
-a108;2767
-a109;2660
-a10;2721
-a110;2665
-a111;2666
-a112;2663
-a117;2709
-a118;2708
-a119;2707
-a11;261B
-a120;2460
-a121;2461
-a122;2462
-a123;2463
-a124;2464
-a125;2465
-a126;2466
-a127;2467
-a128;2468
-a129;2469
-a12;261E
-a130;2776
-a131;2777
-a132;2778
-a133;2779
-a134;277A
-a135;277B
-a136;277C
-a137;277D
-a138;277E
-a139;277F
-a13;270C
-a140;2780
-a141;2781
-a142;2782
-a143;2783
-a144;2784
-a145;2785
-a146;2786
-a147;2787
-a148;2788
-a149;2789
-a14;270D
-a150;278A
-a151;278B
-a152;278C
-a153;278D
-a154;278E
-a155;278F
-a156;2790
-a157;2791
-a158;2792
-a159;2793
-a15;270E
-a160;2794
-a161;2192
-a162;27A3
-a163;2194
-a164;2195
-a165;2799
-a166;279B
-a167;279C
-a168;279D
-a169;279E
-a16;270F
-a170;279F
-a171;27A0
-a172;27A1
-a173;27A2
-a174;27A4
-a175;27A5
-a176;27A6
-a177;27A7
-a178;27A8
-a179;27A9
-a17;2711
-a180;27AB
-a181;27AD
-a182;27AF
-a183;27B2
-a184;27B3
-a185;27B5
-a186;27B8
-a187;27BA
-a188;27BB
-a189;27BC
-a18;2712
-a190;27BD
-a191;27BE
-a192;279A
-a193;27AA
-a194;27B6
-a195;27B9
-a196;2798
-a197;27B4
-a198;27B7
-a199;27AC
-a19;2713
-a1;2701
-a200;27AE
-a201;27B1
-a202;2703
-a203;2750
-a204;2752
-a205;276E
-a206;2770
-a20;2714
-a21;2715
-a22;2716
-a23;2717
-a24;2718
-a25;2719
-a26;271A
-a27;271B
-a28;271C
-a29;2722
-a2;2702
-a30;2723
-a31;2724
-a32;2725
-a33;2726
-a34;2727
-a35;2605
-a36;2729
-a37;272A
-a38;272B
-a39;272C
-a3;2704
-a40;272D
-a41;272E
-a42;272F
-a43;2730
-a44;2731
-a45;2732
-a46;2733
-a47;2734
-a48;2735
-a49;2736
-a4;260E
-a50;2737
-a51;2738
-a52;2739
-a53;273A
-a54;273B
-a55;273C
-a56;273D
-a57;273E
-a58;273F
-a59;2740
-a5;2706
-a60;2741
-a61;2742
-a62;2743
-a63;2744
-a64;2745
-a65;2746
-a66;2747
-a67;2748
-a68;2749
-a69;274A
-a6;271D
-a70;274B
-a71;25CF
-a72;274D
-a73;25A0
-a74;274F
-a75;2751
-a76;25B2
-a77;25BC
-a78;25C6
-a79;2756
-a7;271E
-a81;25D7
-a82;2758
-a83;2759
-a84;275A
-a85;276F
-a86;2771
-a87;2772
-a88;2773
-a89;2768
-a8;271F
-a90;2769
-a91;276C
-a92;276D
-a93;276A
-a94;276B
-a95;2774
-a96;2775
-a97;275B
-a98;275C
-a99;275D
-a9;2720
-#END
+a100;❞
+a101;❡
+a102;❢
+a103;❣
+a104;❤
+a105;✐
+a106;❥
+a107;❦
+a108;❧
+a109;♠
+a10;✡
+a110;♥
+a111;♦
+a112;♣
+a117;✉
+a118;✈
+a119;✇
+a11;☛
+a120;①
+a121;②
+a122;③
+a123;④
+a124;⑤
+a125;⑥
+a126;⑦
+a127;⑧
+a128;⑨
+a129;⑩
+a12;☞
+a130;❶
+a131;❷
+a132;❸
+a133;❹
+a134;❺
+a135;❻
+a136;❼
+a137;❽
+a138;❾
+a139;❿
+a13;✌
+a140;➀
+a141;➁
+a142;➂
+a143;➃
+a144;➄
+a145;➅
+a146;➆
+a147;➇
+a148;➈
+a149;➉
+a14;✍
+a150;➊
+a151;➋
+a152;➌
+a153;➍
+a154;➎
+a155;➏
+a156;➐
+a157;➑
+a158;➒
+a159;➓
+a15;✎
+a160;➔
+a161;→
+a162;➣
+a163;↔
+a164;↕
+a165;➙
+a166;➛
+a167;➜
+a168;➝
+a169;➞
+a16;✏
+a170;➟
+a171;➠
+a172;➡
+a173;➢
+a174;➤
+a175;➥
+a176;➦
+a177;➧
+a178;➨
+a179;➩
+a17;✑
+a180;➫
+a181;➭
+a182;➯
+a183;➲
+a184;➳
+a185;➵
+a186;➸
+a187;➺
+a188;➻
+a189;➼
+a18;✒
+a190;➽
+a191;➾
+a192;➚
+a193;➪
+a194;➶
+a195;➹
+a196;➘
+a197;➴
+a198;➷
+a199;➬
+a19;✓
+a1;✁
+a200;➮
+a201;➱
+a202;✃
+a203;❐
+a204;❒
+a205;❮
+a206;❰
+a20;✔
+a21;✕
+a22;✖
+a23;✗
+a24;✘
+a25;✙
+a26;✚
+a27;✛
+a28;✜
+a29;✢
+a2;✂
+a30;✣
+a31;✤
+a32;✥
+a33;✦
+a34;✧
+a35;★
+a36;✩
+a37;✪
+a38;✫
+a39;✬
+a3;✄
+a40;✭
+a41;✮
+a42;✯
+a43;✰
+a44;✱
+a45;✲
+a46;✳
+a47;✴
+a48;✵
+a49;✶
+a4;☎
+a50;✷
+a51;✸
+a52;✹
+a53;✺
+a54;✻
+a55;✼
+a56;✽
+a57;✾
+a58;✿
+a59;❀
+a5;✆
+a60;❁
+a61;❂
+a62;❃
+a63;❄
+a64;❅
+a65;❆
+a66;❇
+a67;❈
+a68;❉
+a69;❊
+a6;✝
+a70;❋
+a71;●
+a72;❍
+a73;■
+a74;❏
+a75;❑
+a76;▲
+a77;▼
+a78;◆
+a79;❖
+a7;✞
+a81;◗
+a82;❘
+a83;❙
+a84;❚
+a85;❯
+a86;❱
+a87;❲
+a88;❳
+a89;❨
+a8;✟
+a90;❩
+a91;❬
+a92;❭
+a93;❪
+a94;❫
+a95;❴
+a96;❵
+a97;❛
+a98;❜
+a99;❝
+a9;✠

data/lib/hexapdf/cli/form.rb

@@ -135,12 +135,20 @@ module HexaPDF
           concrete_field_type = field.concrete_field_type
           nice_field_type = concrete_field_type.to_s.split('_').map(&:capitalize).join(' ')
           position = "(#{widget[:Rect].left}, #{widget[:Rect].bottom})"
+          field_value = if !field.field_value || concrete_field_type != :signature_field
+                          field.field_value.inspect
+                        else
+                          sig = field.field_value
+                          temp = "#{sig.signer_name} (#{sig.signing_time})"
+                          temp << " (#{sig.signing_reason})" if sig.signing_reason
+                          temp
+                        end
 
           puts "  #{field_name}"
           if command_parser.verbosity_info?
             printf("    └─ %-22s | %-20s\n", nice_field_type, position)
           end
-          puts "    └─ #{field.field_value.inspect}"
+          puts "    └─ #{field_value}"
           if command_parser.verbosity_info?
             if field.field_type == :Ch
               puts "    └─ Options: #{field.option_items.map(&:inspect).join(', ')}"

data/lib/hexapdf/encryption/security_handler.rb

@@ -249,6 +249,10 @@ module HexaPDF
         @document = document
         @encrypt_dict_hash = nil
         @encryption_details = {}
+
+        @is_encrypt_dict = document.revisions.each.with_object({}) do |rev, hash|
+          hash[rev.trailer[:Encrypt]] = true
+        end
       end
 
       # Checks if the encryption key computed by this security handler is derived from the
@@ -262,7 +266,7 @@ module HexaPDF
       #
       # See: PDF1.7 s7.6.2
       def decrypt(obj)
-        return obj if obj == document.trailer[:Encrypt] || obj.type == :XRef
+        return obj if @is_encrypt_dict[obj] || obj.type == :XRef
 
         key = object_key(obj.oid, obj.gen, string_algorithm)
         each_string_in_object(obj.value) do |str|

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

@@ -131,13 +131,12 @@ module HexaPDF
         def load_file(file)
           name2uni = {}
           uni2name = {}
-          File.open(file, 'rb') do |f|
+          File.open(file, 'r:UTF-8') do |f|
+            25.times { f.gets } # Skip comments
             while (line = f.gets)
-              next if line.start_with?('#')
-              index = line.index(';')
-              name = line[0, index].to_sym
-              codes = line[index + 1, 50].split(" ").map(&:hex).pack('U*')
-              name2uni[name] = codes
+              name, codes = line.split(';', 2)
+              name = name.to_sym
+              name2uni[name] = codes.chomp!
               uni2name[codes] = name unless uni2name.key?(codes)
             end
           end

data/lib/hexapdf/font/type1_wrapper.rb

@@ -212,24 +212,23 @@ module HexaPDF
 
       # Creates a PDF object representing the wrapped font for the given PDF document.
       def create_pdf_object(document)
-        fd = document.wrap({Type: :FontDescriptor,
-                            FontName: @wrapped_font.font_name.intern,
-                            FontWeight: @wrapped_font.weight_class,
-                            FontBBox: @wrapped_font.bounding_box,
-                            ItalicAngle: @wrapped_font.italic_angle || 0,
-                            Ascent: @wrapped_font.ascender || 0,
-                            Descent: @wrapped_font.descender || 0,
-                            CapHeight: @wrapped_font.cap_height,
-                            XHeight: @wrapped_font.x_height,
-                            StemH: @wrapped_font.dominant_horizontal_stem_width,
-                            StemV: @wrapped_font.dominant_vertical_stem_width || 0})
+        fd = document.add({Type: :FontDescriptor,
+                           FontName: @wrapped_font.font_name.intern,
+                           FontWeight: @wrapped_font.weight_class,
+                           FontBBox: @wrapped_font.bounding_box,
+                           ItalicAngle: @wrapped_font.italic_angle || 0,
+                           Ascent: @wrapped_font.ascender || 0,
+                           Descent: @wrapped_font.descender || 0,
+                           CapHeight: @wrapped_font.cap_height,
+                           XHeight: @wrapped_font.x_height,
+                           StemH: @wrapped_font.dominant_horizontal_stem_width,
+                           StemV: @wrapped_font.dominant_vertical_stem_width || 0})
         fd.flag(:fixed_pitch) if @wrapped_font.metrics.is_fixed_pitch
         fd.flag(@wrapped_font.metrics.character_set == 'Special' ? :symbolic : :nonsymbolic)
-        fd.must_be_indirect = true
 
-        dict = document.wrap({Type: :Font, Subtype: :Type1,
-                              BaseFont: @wrapped_font.font_name.intern,
-                              FontDescriptor: fd})
+        dict = document.add({Type: :Font, Subtype: :Type1,
+                             BaseFont: @wrapped_font.font_name.intern,
+                             FontDescriptor: fd})
         dict.font_wrapper = self
 
         document.register_listener(:complete_objects) do

data/lib/hexapdf/task/dereference.rb

@@ -68,9 +68,9 @@ module HexaPDF
 
       def execute #:nodoc:
         if @object
-          dereference(@object)
+          dereference_all(@object)
         else
-          dereference(@doc.trailer)
+          dereference_all(@doc.trailer)
           @result = []
           @doc.each(only_current: false) do |obj|
             if !@seen.key?(obj.data) && obj.type != :ObjStm && obj.type != :XRef
@@ -83,6 +83,11 @@ module HexaPDF
         end
       end
 
+      def dereference_all(object) # :nodoc:
+        @dereference_later = [object]
+        dereference(@dereference_later.pop) until @dereference_later.empty?
+      end
+
       def dereference(object) #:nodoc:
         return object if object.nil? || @seen.key?(object.data)
         @seen[object.data] = true
@@ -97,9 +102,12 @@ module HexaPDF
         when Array
           val.map! {|v| recurse(v) }
         when HexaPDF::Reference
-          dereference(@doc.object(val))
+          val = @doc.object(val)
+          @dereference_later.push(val)
+          val
         when HexaPDF::Object
-          dereference(val)
+          @dereference_later.push(val)
+          val
         else
           val
         end

data/lib/hexapdf/task/optimize.rb

@@ -234,7 +234,7 @@ module HexaPDF
           page.contents = processor.result
           page[:Contents].set_filter(:FlateDecode)
           xobjects = page.resources[:XObject]
-          processor.used_references.each {|ref| used_refs[xobjects[ref]] = true }
+          processor.used_references.each {|ref| used_refs[xobjects[ref]] = true } if xobjects
         end
         used_refs
       end
@@ -245,7 +245,7 @@ module HexaPDF
         unless used_refs
           used_refs = {}
           doc.pages.each do |page|
-            xobjects = page.resources[:XObject]
+            next unless (xobjects = page.resources[:XObject])
             HexaPDF::Content::Parser.parse(page.contents) do |op, operands|
               used_refs[xobjects[operands[0]]] = true if op == :Do
             end
@@ -253,7 +253,7 @@ module HexaPDF
         end
 
         doc.pages.each do |page|
-          xobjects = page.resources[:XObject]
+          next unless (xobjects = page.resources[:XObject])
           xobjects.each do |key, obj|
             next if used_refs[obj]
             xobjects.delete(key)

data/lib/hexapdf/type/annotation.rb

@@ -160,7 +160,7 @@ module HexaPDF
         end
         return unless entry.kind_of?(HexaPDF::Stream)
 
-        if entry.type == :XObject && entry[:Subtype] == :Form
+        if entry.type == :XObject && entry[:Subtype] == :Form && !entry.instance_of?(HexaPDF::Stream)
           entry
         elsif (entry[:Type].nil? || entry[:Type] == :XObject) &&
             (entry[:Subtype].nil? || entry[:Subtype] == :Form) && entry[:BBox]

data/lib/hexapdf/type/signature/adbe_pkcs7_detached.rb

@@ -78,7 +78,7 @@ module HexaPDF
 
         # Verifies the signature using the provided OpenSSL::X509::Store object.
         def verify(store, allow_self_signed: false)
-          result = VerificationResult.new
+          result = super
 
           signer_info = self.signer_info
           signer_certificate = self.signer_certificate
@@ -104,10 +104,6 @@ module HexaPDF
             result.log(:error, "Certificate key usage is missing 'Digital Signature'")
           end
 
-          verify_signing_time(result)
-
-          store.verify_callback = store_verification_callback(result,
-                                                              allow_self_signed: allow_self_signed)
           if @pkcs7.verify(certificate_chain, store, signature_dict.signed_data,
                            OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY)
             result.log(:info, "Signature valid")

data/lib/hexapdf/type/signature/adbe_x509_rsa_sha1.rb

@@ -60,7 +60,7 @@ module HexaPDF
 
         # Verifies the signature using the provided OpenSSL::X509::Store object.
         def verify(store, allow_self_signed: false)
-          result = VerificationResult.new
+          result = super
 
           signer_certificate = self.signer_certificate
           certificate_chain = self.certificate_chain
@@ -76,10 +76,6 @@ module HexaPDF
             return result
           end
 
-          verify_signing_time(result)
-
-          store.verify_callback = store_verification_callback(result,
-                                                              allow_self_signed: allow_self_signed)
           store.verify(signer_certificate, certificate_chain)
 
           if signer_certificate.public_key.verify(OpenSSL::Digest.new('SHA1'),