pdfrb 0.8.3 → 0.8.5

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

@@ -22,7 +22,7 @@ module Pdfrb
 
           arr = ocgs.is_a?(Pdfrb::Model::PdfArray) ? ocgs.to_a : ocgs
           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
@@ -90,7 +90,7 @@ module Pdfrb
 
           arr = ocgs.is_a?(Pdfrb::Model::PdfArray) ? ocgs.to_a : ocgs
           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/optional_content_membership.rb

@@ -33,11 +33,11 @@ module Pdfrb
           return enum_for(:each_ocg) unless block_given?
           return unless ocfgs && document
 
-          arr = ocfgs.is_a?(Pdfrb::Model::Reference) ? document.object(ocfgs) : ocfgs
+          arr = document.resolve(ocfgs)
           return unless arr.is_a?(Array) || arr.is_a?(Pdfrb::Model::PdfArray)
 
           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/page.rb

@@ -23,10 +23,10 @@ module Pdfrb
               if ref.nil?
                 new_stream = document.add({}, type: Pdfrb::Model::Cos::Stream)
                 new_stream.stream = ""
-                value[:Contents] = Pdfrb::Model::Reference.new(new_stream.oid, 0)
+                value[:Contents] = new_stream.ref
                 new_stream
               else
-                ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+                document.resolve(ref)
               end
             Pdfrb::Content::Canvas.new(stream, document: document)
           end
@@ -40,8 +40,7 @@ module Pdfrb
 
           streams = contents.is_a?(::Array) ? contents : [contents]
           streams.each_with_object(+"".b) do |ref_or_stream, buf|
-            stream = ref_or_stream.is_a?(Pdfrb::Model::Reference) ?
-                       document&.object(ref_or_stream) : ref_or_stream
+            stream = document&.resolve(ref_or_stream)
             next unless stream.is_a?(Pdfrb::Model::Cos::Stream)
 
             buf << stream.decoded_stream
@@ -182,12 +181,11 @@ module Pdfrb
           return enum_for(:each_annotation) unless block_given?
           return unless annotations && document
 
-          arr = annotations.is_a?(Pdfrb::Model::Reference) ?
-                  document.object(annotations) : annotations
+          arr = document.resolve(annotations)
           return unless arr.is_a?(Array) || arr.is_a?(Pdfrb::Model::PdfArray)
 
           arr.each do |entry|
-            obj = entry.is_a?(Pdfrb::Model::Reference) ? document.object(entry) : entry
+            obj = document.resolve(entry)
             yield obj if obj
           end
         end

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/pattern.rb

@@ -16,25 +16,9 @@ module Pdfrb
       # to patterns.
       class PatternMap < Pdfrb::Model::Cos::Dictionary
         arlington_object "PatternMap"
+        include NameMap
 
-        def [](name)
-          value[name.to_sym] || value[name.to_s]
-        end
-
-        def add(name, pattern)
-          value[name.to_sym] = pattern
-          name.to_sym
-        end
-
-        def each_pattern(&)
-          return enum_for(:each_pattern) unless block_given?
-
-          value.each(&)
-        end
-
-        def names
-          value.keys
-        end
+        alias each_pattern each_entry
       end
     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/shading.rb

@@ -116,25 +116,9 @@ module Pdfrb
       # to shadings.
       class ShadingMap < Pdfrb::Model::Cos::Dictionary
         arlington_object "ShadingMap"
+        include NameMap
 
-        def [](name)
-          value[name.to_sym] || value[name.to_s]
-        end
-
-        def add(name, shading)
-          value[name.to_sym] = shading
-          name.to_sym
-        end
-
-        def each_shading(&)
-          return enum_for(:each_shading) unless block_given?
-
-          value.each(&)
-        end
-
-        def names
-          value.keys
-        end
+        alias each_shading each_entry
       end
     end
   end

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

@@ -24,14 +24,9 @@ module Pdfrb
       # keyed by DN component (CN, O, C, ...).
       class SubjectDN < Pdfrb::Model::Cos::Dictionary
         arlington_object "SubjectDN"
+        include NameMap
 
-        def [](component)
-          value[component.to_sym] || value[component.to_s]
-        end
-
-        def components
-          value.keys
-        end
+        alias components names
       end
 
       # Document timestamp signature (s12.8.1, /DocTimeStamp): an
@@ -88,14 +83,9 @@ module Pdfrb
       # validation data for one signature.
       class VRIMap < Pdfrb::Model::Cos::Dictionary
         arlington_object "VRIMap"
+        include NameMap
 
-        def [](signature_hash)
-          value[signature_hash.to_sym] || value[signature_hash.to_s]
-        end
-
-        def signature_hashes
-          value.keys
-        end
+        alias signature_hashes names
       end
 
       # Associated-file embedded-file parameters (PDF 2.0 App Note
@@ -165,14 +155,9 @@ module Pdfrb
       # developer names to their DevExtensions entries.
       class Extensions < Pdfrb::Model::Cos::Dictionary
         arlington_object "Extensions"
+        include NameMap
 
-        def [](developer)
-          value[developer.to_sym] || value[developer.to_s]
-        end
-
-        def developers
-          value.keys
-        end
+        alias developers names
       end
 
       # GTS Procedural Steps group (prepress): identifies a

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

@@ -38,19 +38,7 @@ module Pdfrb
       # ExtGState dictionaries.
       class GraphicsStateParameterMap < Pdfrb::Model::Cos::Dictionary
         arlington_object "GraphicsStateParameterMap"
-
-        def [](name)
-          value[name.to_sym] || value[name.to_s]
-        end
-
-        def add(name, parameters)
-          value[name.to_sym] = parameters
-          name.to_sym
-        end
-
-        def names
-          value.keys
-        end
+        include NameMap
       end
 
       # Transparency group /Group dictionary (s11.2.4.5): isolation

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/structure_attributes.rb

@@ -45,24 +45,16 @@ module Pdfrb
       # names mapped to standard structure types.
       class RoleMap < Pdfrb::Model::Cos::Dictionary
         arlington_object "RoleMap"
+        include NameMap
 
-        def [](custom_name)
-          value[custom_name.to_sym] || value[custom_name.to_s]
-        end
-
-        def custom_names
-          value.keys
-        end
+        alias custom_names names
       end
 
       # Namespaced role map (s14.7.3, /RoleMapNS): per-namespace role
       # maps keyed by namespace URI.
       class RoleMapNS < Pdfrb::Model::Cos::Dictionary
         arlington_object "RoleMapNS"
-
-        def [](namespace)
-          value[namespace.to_sym] || value[namespace.to_s]
-        end
+        include NameMap
       end
 
       # Style dictionary (s14.9.2, /Styles entries): number-of-style
@@ -77,14 +69,9 @@ module Pdfrb
       # attribute-owner dictionaries shared by structure elements.
       class ClassMap < Pdfrb::Model::Cos::Dictionary
         arlington_object "ClassMap"
+        include NameMap
 
-        def [](class_name)
-          value[class_name.to_sym] || value[class_name.to_s]
-        end
-
-        def class_names
-          value.keys
-        end
+        alias class_names names
       end
 
       # Reference structure element kid (s14.8.2.4, /Reference):

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/model/type/xobject_form.rb

@@ -89,19 +89,7 @@ module Pdfrb
       # Resources /XObject dictionary (s7.8.3): name -> XObject.
       class XObjectMap < Pdfrb::Model::Cos::Dictionary
         arlington_object "XObjectMap"
-
-        def [](name)
-          value[name.to_sym] || value[name.to_s]
-        end
-
-        def add(name, xobject)
-          value[name.to_sym] = xobject
-          name.to_sym
-        end
-
-        def names
-          value.keys
-        end
+        include NameMap
       end
     end
   end

data/lib/pdfrb/model/type.rb

@@ -40,6 +40,8 @@ module Pdfrb
         end
       end
 
+      autoload :NameMap, "pdfrb/model/type/name_map"
+
       # Base semantic types.
       autoload :FileTrailer, "pdfrb/model/type/file_trailer"
       autoload :Catalog, "pdfrb/model/type/catalog"

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/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.3"
+  VERSION = "0.8.5"
 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

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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdfrb
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-28 00:00:00.000000000 Z
+date: 2026-08-29 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
@@ -1143,6 +1145,7 @@ files:
 - lib/pdfrb/model/type/misc_helpers.rb
 - lib/pdfrb/model/type/movie.rb
 - lib/pdfrb/model/type/movie_annotation.rb
+- lib/pdfrb/model/type/name_map.rb
 - lib/pdfrb/model/type/names.rb
 - lib/pdfrb/model/type/namespace.rb
 - lib/pdfrb/model/type/object_reference.rb