pdfrb 0.8.4 → 0.8.6

data/lib/pdfrb/model/type/page_tree_node.rb

@@ -32,11 +32,11 @@ module Pdfrb
           return enum_for(:each_child) unless block_given?
           return unless kids && document
 
-          arr = kids.is_a?(Pdfrb::Model::Reference) ? document.object(kids) : kids
+          arr = document.resolve(kids)
           return unless arr.is_a?(Array)
 
           arr.each do |kid_ref|
-            obj = kid_ref.is_a?(Pdfrb::Model::Reference) ? document.object(kid_ref) : kid_ref
+            obj = document.resolve(kid_ref)
             yield obj if obj
           end
         end

data/lib/pdfrb/model/type/rich_media_configuration.rb

@@ -23,7 +23,7 @@ module Pdfrb
 
           arr = instances.is_a?(Pdfrb::Model::PdfArray) ? instances.to_a : instances
           arr.each do |ref|
-            obj = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+            obj = document.resolve(ref)
             yield obj if obj
           end
         end

data/lib/pdfrb/model/type/struct_elem.rb

@@ -76,11 +76,11 @@ module Pdfrb
           return enum_for(:each_child) unless block_given?
           return unless kids && document
 
-          arr = kids.is_a?(Pdfrb::Model::Reference) ? document.object(kids) : kids
+          arr = document.resolve(kids)
           return unless arr.is_a?(Array) || arr.is_a?(Pdfrb::Model::PdfArray)
 
           arr.each do |kid|
-            obj = kid.is_a?(Pdfrb::Model::Reference) ? document.object(kid) : kid
+            obj = document.resolve(kid)
             yield obj if obj
           end
         end

data/lib/pdfrb/model/type/struct_tree_root.rb

@@ -21,11 +21,11 @@ module Pdfrb
           return enum_for(:each_child) unless block_given?
           return unless children && document
 
-          arr = children.is_a?(Pdfrb::Model::Reference) ? document.object(children) : children
+          arr = document.resolve(children)
           return unless arr.is_a?(Array) || arr.is_a?(Pdfrb::Model::PdfArray)
 
           arr.each do |kid_ref|
-            obj = kid_ref.is_a?(Pdfrb::Model::Reference) ? document.object(kid_ref) : kid_ref
+            obj = document.resolve(kid_ref)
             yield obj if obj
           end
         end

data/lib/pdfrb/model/type/thread.rb

@@ -21,7 +21,7 @@ module Pdfrb
           ref = value[:F]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /I — optional DocInfo dict with article metadata.
@@ -29,7 +29,7 @@ module Pdfrb
           ref = value[:I]
           return nil unless ref && document
 
-          resolved = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          resolved = document.resolve(ref)
           return nil unless resolved
 
           Pdfrb::Model::Type::Info.new(resolved.value) if resolved.value.is_a?(::Hash)
@@ -40,7 +40,7 @@ module Pdfrb
           ref = value[:Metadata]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
       end
     end

data/lib/pdfrb/model/type/three_d_stream.rb

@@ -39,7 +39,7 @@ module Pdfrb
 
           arr = views.is_a?(Pdfrb::Model::PdfArray) ? views.to_a : views
           arr.each do |ref|
-            obj = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+            obj = document.resolve(ref)
             yield obj if obj
           end
         end

data/lib/pdfrb/model/type/viewport.rb

@@ -31,7 +31,7 @@ module Pdfrb
           ref = value[:Measure]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
       end
     end

data/lib/pdfrb/model/type/vri.rb

@@ -53,7 +53,7 @@ module Pdfrb
           ref = value[:TS]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         private

data/lib/pdfrb/model/type/web_capture_command.rb

@@ -36,7 +36,7 @@ module Pdfrb
           ref = value[:S]
           return nil unless ref && document
 
-          resolved = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          resolved = document.resolve(ref)
           return nil unless resolved
 
           Pdfrb::Model::Type::WebCaptureCommandSettings.new(resolved.value)

data/lib/pdfrb/model/type/web_capture_image_set.rb

@@ -32,7 +32,7 @@ module Pdfrb
 
           arr = refs.is_a?(Pdfrb::Model::PdfArray) ? refs.value : refs
           arr = [arr] unless arr.is_a?(::Array)
-          arr.filter_map { |r| r.is_a?(Pdfrb::Model::Reference) ? document.object(r) : r }
+          arr.filter_map { |r| document.resolve(r) }
         end
 
         # /CT — optional content type (RFC 2045).

data/lib/pdfrb/model/type/web_capture_page_set.rb

@@ -31,7 +31,7 @@ module Pdfrb
 
           arr = refs.is_a?(Pdfrb::Model::PdfArray) ? refs.value : refs
           arr = [arr] unless arr.is_a?(::Array)
-          arr.filter_map { |r| r.is_a?(Pdfrb::Model::Reference) ? document.object(r) : r }
+          arr.filter_map { |r| document.resolve(r) }
         end
 
         # /CT — optional content type.
@@ -64,7 +64,7 @@ module Pdfrb
           arr = refs.is_a?(Pdfrb::Model::PdfArray) ? refs.value : refs
           arr = [arr] unless arr.is_a?(::Array)
           arr.filter_map do |r|
-            resolved = r.is_a?(Pdfrb::Model::Reference) ? document.object(r) : r
+            resolved = document.resolve(r)
             next nil unless resolved && resolved.value.is_a?(::Hash)
 
             Pdfrb::Model::Type::WebCaptureCommand.new(resolved.value)

data/lib/pdfrb/pdf_version.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  # PDF header version comparisons (ISO 32000-2, s7.2). Version strings
+  # are dot-separated numerics ("1.4", "2.0"); comparison is
+  # numeric-per-component, never lexical ("1.10" > "1.9").
+  module PdfVersion
+    module_function
+
+    # @return [Integer] -1, 0, or 1 as +a+ is earlier, equal, or later
+    #   than +b+.
+    def compare(a, b)
+      aa = a.to_s.split(".").map(&:to_i)
+      bb = b.to_s.split(".").map(&:to_i)
+      (aa <=> bb) || 0
+    end
+
+    # @return [Boolean] whether +version+ meets or exceeds +minimum+.
+    def at_least?(version, minimum)
+      compare(version, minimum) >= 0
+    end
+  end
+end

data/lib/pdfrb/task/extract_images.rb

@@ -15,8 +15,7 @@ module Pdfrb
         document.pages.each_with_index do |page, idx|
           xobjects = xobject_map(page, document)
           xobjects&.each do |name, ref|
-            stream = ref.is_a?(Pdfrb::Model::Reference) ?
-                       document.object(ref) : ref
+            stream = document.resolve(ref)
             next unless stream.is_a?(Pdfrb::Model::Cos::Stream)
             next unless stream.value[:Subtype] == :Image
 

data/lib/pdfrb/task/extract_text.rb

@@ -148,7 +148,7 @@ module Pdfrb
           return nil unless fonts.is_a?(::Hash)
 
           entry = fonts[name] || fonts[name.to_sym] || fonts[name.to_s]
-          entry.is_a?(Pdfrb::Model::Reference) ? @document.object(entry) : entry
+          @document.resolve(entry)
         end
       end
       private_constant :FontResolver

data/lib/pdfrb/task/merge.rb

@@ -20,7 +20,7 @@ module Pdfrb
           new_value[:Parent] = parent_ref(target)
           new_page = target.add(new_value, type: Pdfrb::Model::Type::Page)
           kids = pages_root(target).value[:Kids]
-          kids << Pdfrb::Model::Reference.new(new_page.oid, new_page.gen)
+          kids << new_page.ref
           pages_root(target).value[:Count] = (pages_root(target).value[:Count] || 0) + 1
         end
       end
@@ -30,7 +30,7 @@ module Pdfrb
         ref = target.catalog.value[:Pages] || begin
           root = target.add({ Type: :Pages, Kids: [], Count: 0 },
                             type: Pdfrb::Model::Type::PageTreeNode)
-          target.catalog.value[:Pages] = Pdfrb::Model::Reference.new(root.oid, 0)
+          target.catalog.value[:Pages] = root.ref
           target.catalog.value[:Pages]
         end
         target.object(ref)
@@ -39,7 +39,7 @@ module Pdfrb
 
       def parent_ref(target)
         root = pages_root(target)
-        Pdfrb::Model::Reference.new(root.oid, root.gen)
+        root.ref
       end
       private_class_method :parent_ref
     end

data/lib/pdfrb/task/optimize.rb

@@ -55,9 +55,7 @@ module Pdfrb
       # {duplicate_oid => canonical_oid} that was applied.
       def dedup_streams!(document)
         canonical_for = {}
-        document.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
-          next unless obj.indirect?
+        document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
           next if obj.value[:Type] == :ObjStm
 
           key = stream_dedup_key(obj)
@@ -65,9 +63,7 @@ module Pdfrb
         end
 
         replacements = {}
-        document.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
-          next unless obj.indirect?
+        document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
           next if obj.value[:Type] == :ObjStm
 
           key = stream_dedup_key(obj)

data/lib/pdfrb/task/thumbnail.rb

@@ -29,7 +29,7 @@ module Pdfrb
           thumb = build_thumbnail(document, page, dpi: dpi, max_width: max_width)
           next unless thumb
 
-          page.value[:Thumb] = Pdfrb::Model::Reference.new(thumb.oid, thumb.gen)
+          page.value[:Thumb] = thumb.ref
           count += 1
         end
         count

data/lib/pdfrb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pdfrb
-  VERSION = "0.8.4"
+  VERSION = "0.8.6"
 end

data/lib/pdfrb/writer.rb

@@ -46,8 +46,7 @@ module Pdfrb
       encrypt_ref = trailer[:Encrypt]
       return {} unless encrypt_ref
 
-      encrypt_dict = encrypt_ref.is_a?(Pdfrb::Model::Reference) ?
-                        document.object(encrypt_ref) : encrypt_ref
+      encrypt_dict = document.resolve(encrypt_ref)
       return {} unless encrypt_dict
 
       handler = Pdfrb::Encryption::StandardSecurityHandler.new(
@@ -288,7 +287,7 @@ module Pdfrb
     def write_trailer(xref_pos, prev: nil)
       root = document.catalog
       root_ref = root && root.is_a?(Pdfrb::Model::Object) && root.indirect? ?
-                   Pdfrb::Model::Reference.new(root.oid, root.gen) : nil
+                   root.ref : nil
       size = [(@xref_offsets.keys.max || 0) + 1, document.next_oid || 1].max
 
       existing = document.trailer || {}
@@ -334,7 +333,7 @@ module Pdfrb
       return if inherited.nil?
 
       Array(root.value[:Kids]).each do |kid_ref|
-        page = kid_ref.is_a?(Pdfrb::Model::Reference) ? document.object(kid_ref) : kid_ref
+        page = document.resolve(kid_ref)
         next unless page.is_a?(Pdfrb::Model::Cos::Dictionary)
         next if page.value.key?(:Resources)
 
@@ -369,7 +368,7 @@ module Pdfrb
       root = document.catalog
       return nil unless root && root.indirect?
 
-      Pdfrb::Model::Reference.new(root.oid, root.gen)
+      root.ref
     end
 
     def trailer_hash_for_stream
@@ -393,26 +392,19 @@ module Pdfrb
       return current unless catalog
 
       v = current
-      if (catalog.value[:AF] || catalog.value[:Collection]) && compare_versions(v, "2.0").negative?
+      if (catalog.value[:AF] || catalog.value[:Collection]) && Pdfrb::PdfVersion.compare(v, "2.0").negative?
         v = "2.0"
       end
-      if catalog.value[:OCProperties] && compare_versions(v, "1.5").negative?
+      if catalog.value[:OCProperties] && Pdfrb::PdfVersion.compare(v, "1.5").negative?
         v = "1.5"
       end
       document.version = v
       v
     end
 
-    def compare_versions(a, b)
-      aa = a.to_s.split(".").map(&:to_i)
-      bb = b.to_s.split(".").map(&:to_i)
-      (aa <=> bb) || 0
-    end
-
     def compress_content_streams
       require "zlib"
-      document.each_indirect_object do |obj|
-        next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+      document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
         next if obj.value[:Filter]
         next unless obj.stream
         next if obj.value[:Type] == :Metadata

data/lib/pdfrb/xmp.rb

@@ -43,7 +43,7 @@ Pdfrb::Document.prepend(Module.new do
     )
     stream.stream = xmp_data
     catalog.value[:Metadata] =
-      Pdfrb::Model::Reference.new(stream.oid, stream.gen)
+      stream.ref
   end
 
   def sync_pdfa_metadata!
@@ -61,6 +61,6 @@ Pdfrb::Document.prepend(Module.new do
     )
     stream.stream = xmp_data
     catalog.value[:Metadata] =
-      Pdfrb::Model::Reference.new(stream.oid, stream.gen)
+      stream.ref
   end
 end)

data/lib/pdfrb.rb

@@ -18,6 +18,7 @@ module Pdfrb
   autoload :Configuration, "pdfrb/configuration"
   autoload :DataDir, "pdfrb/data_dir"
   autoload :PdfConstants, "pdfrb/pdf_constants"
+  autoload :PdfVersion, "pdfrb/pdf_version"
 
   autoload :Source, "pdfrb/source"
   autoload :Model, "pdfrb/model"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdfrb
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-29 00:00:00.000000000 Z
+date: 2026-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark
@@ -865,6 +865,7 @@ files:
 - lib/pdfrb/document/encryption.rb
 - lib/pdfrb/document/files.rb
 - lib/pdfrb/document/fonts.rb
+- lib/pdfrb/document/fonts/subsetting.rb
 - lib/pdfrb/document/form.rb
 - lib/pdfrb/document/form_xobject.rb
 - lib/pdfrb/document/graphics_state.rb
@@ -924,6 +925,7 @@ files:
 - lib/pdfrb/font/encoding/zapf_dingbats_encoding.rb
 - lib/pdfrb/font/glyph_list.rb
 - lib/pdfrb/font/metrics_helper.rb
+- lib/pdfrb/font/sfnt.rb
 - lib/pdfrb/font/true_type.rb
 - lib/pdfrb/font/true_type/cmap.rb
 - lib/pdfrb/font/true_type/file.rb
@@ -1259,6 +1261,7 @@ files:
 - lib/pdfrb/model/type/xobject_image.rb
 - lib/pdfrb/model/type/xref_stream.rb
 - lib/pdfrb/pdf_constants.rb
+- lib/pdfrb/pdf_version.rb
 - lib/pdfrb/serializer.rb
 - lib/pdfrb/source.rb
 - lib/pdfrb/source/header_reader.rb