pdfrb 0.8.4 → 0.8.5

data/lib/pdfrb/document/fonts.rb

@@ -5,6 +5,9 @@ require "stringio"
 module Pdfrb
   class Document
     class Fonts
+      autoload :Subsetting, "pdfrb/document/fonts/subsetting"
+      include Subsetting
+
       STANDARDS = %w[
         Helvetica Helvetica-Bold Helvetica-Oblique Helvetica-BoldOblique
         Times-Roman Times-Bold Times-Italic Times-BoldItalic
@@ -152,21 +155,6 @@ module Pdfrb
         desc&.value&.key?(:FontFile2)
       end
 
-      def subset_fonts!
-        @font_streams.each do |resource, data|
-          next unless valid_font_data?(data)
-
-          codepoints = @used_codepoints[resource]
-          next if codepoints.empty?
-
-          begin
-            subset_font(resource, data, codepoints)
-          rescue StandardError
-            next
-          end
-        end
-      end
-
       class << self
         def loaders; @loaders ||= []; end
         def register_loader(loader); loaders.unshift(loader); end
@@ -178,13 +166,13 @@ module Pdfrb
 
         widths = Array.new(256, DEFAULT_WIDTH)
         tu_stream = build_tounicode(doc)
-        tu_ref = Pdfrb::Model::Reference.new(tu_stream.oid, tu_stream.gen)
+        tu_ref = tu_stream.ref
         fd = doc.add({
           Type: :FontDescriptor, FontName: name.to_sym, Flags: 32,
           FontBBox: [0, 0, 1000, 1000], ItalicAngle: 0,
           Ascent: 800, Descent: -200, CapHeight: 700, StemV: 80
         }, type: Pdfrb::Model::Cos::Dictionary)
-        fd_ref = Pdfrb::Model::Reference.new(fd.oid, fd.gen)
+        fd_ref = fd.ref
         font_hash = {
           Type: :Font, Subtype: :Type1, BaseFont: name.to_sym,
           FirstChar: 0, LastChar: 255, Widths: widths,
@@ -399,18 +387,6 @@ module Pdfrb
         name.to_s.gsub(/[\s()\[\]<>{}\/%]+/, "-")
       end
 
-      # Generate a deterministic 6-letter subset tag from the font bytes
-      # so re-embedding the same font produces the same prefix. Format
-      # is six uppercase ASCII letters derived from the SHA-1 of the
-      # first 1 KB of the font file (per PDF spec s9.6.4).
-      def subset_tag_for(font_bytes)
-        require "digest"
-        digest = Digest::SHA1.digest(font_bytes.byteslice(0, 1024) || "")
-        digest.byteslice(0, 6).bytes.each_with_object(+"") do |b, s|
-          s << ((b % 26) + 65).chr
-        end
-      end
-
       def true_type_subtype(data)
         magic = data&.byteslice(0, 4)
         # Per PDF spec s9.6.2 + s9.9: magic distinguishes the two
@@ -444,14 +420,14 @@ module Pdfrb
 
       def default_font(name)
         tu_stream = self.class.build_tounicode(document)
-        tu_ref = Pdfrb::Model::Reference.new(tu_stream.oid, tu_stream.gen)
+        tu_ref = tu_stream.ref
 
         fd = document.add({
           Type: :FontDescriptor, FontName: name.to_sym, Flags: 32,
           FontBBox: [0, 0, 1000, 1000], ItalicAngle: 0,
           Ascent: 800, Descent: -200, CapHeight: 700, StemV: 80
         }, type: Pdfrb::Model::Cos::Dictionary)
-        fd_ref = Pdfrb::Model::Reference.new(fd.oid, fd.gen)
+        fd_ref = fd.ref
 
         if @pending_io_data && valid_font_data?(@pending_io_data)
           font_file = document.add(
@@ -466,11 +442,11 @@ module Pdfrb
             font_file.value[:Subtype] = :OpenType
             font_file.value[:Length1] = @pending_io_data.bytesize
             fd.value[:FontFile3] =
-              Pdfrb::Model::Reference.new(font_file.oid, font_file.gen)
+              font_file.ref
           else
             font_file.value[:Length1] = @pending_io_data.bytesize
             fd.value[:FontFile2] =
-              Pdfrb::Model::Reference.new(font_file.oid, font_file.gen)
+              font_file.ref
           end
         end
 
@@ -483,58 +459,12 @@ module Pdfrb
         }, type: subtype == :TrueType ? Pdfrb::Model::Type::FontTrueType : Pdfrb::Model::Type::FontType1)
       end
 
-      # Build the subsetted font bytes for +resource+ and replace the
-      # descriptor's font-file stream (FontFile2 for TrueType
-      # outlines, FontFile3/OpenType for CFF).
-      def subset_font(resource, data, codepoints)
-        subset, font_file_key =
-          if data.byteslice(0, 4) == "OTTO".b
-            # CFF outlines: map codepoints to glyph IDs via the OTF
-            # cmap (it addresses CFF glyphs too), subset the 'CFF '
-            # table, and rebuild the OTF container.
-            cmap = Pdfrb::Font::TrueType::File.new(data).cmap
-            gids = codepoints.filter_map { |cp| cmap.glyph_id_for(cp) }.uniq
-            [Pdfrb::Font::CFF::Subsetter.subset_otf(data, gids), :FontFile3]
-          else
-            ttf = Pdfrb::Font::TrueType::File.new(data)
-            subsetter = Pdfrb::Font::TrueType::Subsetter.new(ttf, codepoints.to_a)
-            [subsetter.subset, :FontFile2]
-          end
-        dict = @font_dicts[resource]
-        return unless dict
-
-        desc_ref = dict.value[:FontDescriptor]
-        return unless desc_ref
-
-        desc = desc_ref.is_a?(Pdfrb::Model::Reference) ? document.object(desc_ref) : desc_ref
-        return unless desc
-
-        # Reuse the add-time stream object in place rather than
-        # allocating a replacement — a second stream would leave the
-        # full original orphaned in the file (doubling output size).
-        fd_stream = desc.value[font_file_key]
-        fd_stream = document.object(fd_stream) if fd_stream.is_a?(Pdfrb::Model::Reference)
-        if fd_stream.is_a?(Pdfrb::Model::Cos::Stream)
-          fd_stream.stream = subset
-          fd_stream.value[:Length] = subset.bytesize
-          fd_stream.value.delete(:Filter)
-          if font_file_key == :FontFile3
-            fd_stream.value[:Subtype] = :OpenType
-            fd_stream.value[:Length1] = subset.bytesize
-          end
-        end
-      end
-
       # Fonts attach to the page-tree ROOT's /Resources so every page
       # inherits them (s7.7.3.2 resource inheritance). Attaching to
       # the Catalog instead — as this used to — produced a stray key
       # no viewer honours, leaving written pages without fonts.
       def attach_to_resources(resource, font_dict)
-        ref = Pdfrb::Model::Reference.new(font_dict.oid, font_dict.gen)
-        root = document.pages.pages_root
-        root.value[:Resources] ||= {}
-        root.value[:Resources][:Font] ||= {}
-        root.value[:Resources][:Font][resource] = ref
+        document.pages.attach_resource(:Font, resource, font_dict.ref)
       end
     end
   end

data/lib/pdfrb/document/form.rb

@@ -98,7 +98,7 @@ module Pdfrb
 
         fields = acroform[:Fields] || []
         fields.each do |ref|
-          obj = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          obj = document.resolve(ref)
           yield obj if obj
         end
       end
@@ -165,13 +165,13 @@ module Pdfrb
         fields = acroform[:Fields]
         return nil unless fields
 
-        field_ref = Pdfrb::Model::Reference.new(field.oid, field.gen)
+        field_ref = field.ref
         fields.delete_if { |r| r == field_ref || (r.is_a?(Pdfrb::Model::Reference) && r.oid == field.oid) }
 
         # Remove widget annotation from page /Annots
         page_ref = field.value[:P]
         if page_ref
-          page = page_ref.is_a?(Pdfrb::Model::Reference) ? document.object(page_ref) : page_ref
+          page = document.resolve(page_ref)
           annots = page&.value&.[](:Annots)
           annots&.delete_if { |r| r == field_ref || (r.is_a?(Pdfrb::Model::Reference) && r.oid == field.oid) }
         end
@@ -219,7 +219,7 @@ module Pdfrb
         page_ref = field.value[:P]
         return unless page_ref
 
-        page = page_ref.is_a?(Pdfrb::Model::Reference) ? document.object(page_ref) : page_ref
+        page = document.resolve(page_ref)
         return unless page
 
         name = register_form_on_page(page, form_stream)
@@ -248,7 +248,7 @@ module Pdfrb
                  end
         return nil unless target
 
-        target.is_a?(Pdfrb::Model::Reference) ? document.object(target) : target
+        document.resolve(target)
       end
 
       def dictionary?(value)
@@ -278,7 +278,7 @@ module Pdfrb
         resources = page.value[:Resources] = Pdfrb::Model::Cos::Dictionary.new({}) unless resources.is_a?(Pdfrb::Model::Cos::Dictionary)
         xobjects = resources.value[:XObject] || {}
         name = unique_xobject_name(xobjects)
-        xobjects[name] = Pdfrb::Model::Reference.new(form_stream.oid, form_stream.gen)
+        xobjects[name] = form_stream.ref
         resources.value[:XObject] = xobjects
         name
       end
@@ -306,7 +306,7 @@ module Pdfrb
             Subtype: :Widget,
             T: name,
             Rect: rect,
-            P: Pdfrb::Model::Reference.new(page.oid, page.gen),
+            P: page.ref,
             FT: :Tx,
           },
           type: Pdfrb::Model::Type::Annotation
@@ -317,7 +317,7 @@ module Pdfrb
 
       def add_annot_to_page(page, widget)
         annots = page.value[:Annots]
-        ref = Pdfrb::Model::Reference.new(widget.oid, widget.gen)
+        ref = widget.ref
         if annots.nil?
           page.value[:Annots] = [ref]
         elsif annots.is_a?(::Array)
@@ -330,7 +330,7 @@ module Pdfrb
       def register_field(field)
         acroform = document.catalog.value[:AcroForm]
         fields = acroform[:Fields]
-        ref = Pdfrb::Model::Reference.new(field.oid, field.gen)
+        ref = field.ref
         fields << ref
       end
     end

data/lib/pdfrb/document/form_xobject.rb

@@ -50,7 +50,7 @@ module Pdfrb
         resources = page.value[:Resources]
         resources = {} unless resources.is_a?(::Hash)
         xobjects = resources[:XObject] || {}
-        xobjects[@name] = Pdfrb::Model::Reference.new(@stream.oid, @stream.gen)
+        xobjects[@name] = @stream.ref
         resources[:XObject] = xobjects
         page.value[:Resources] = resources
       end

data/lib/pdfrb/document/graphics_state.rb

@@ -24,7 +24,7 @@ module Pdfrb
       def register(page, **params)
         gs = document.add({ Type: :ExtGState, **params },
                           type: Pdfrb::Model::Type::GraphicsStateParameter)
-        ref = Pdfrb::Model::Reference.new(gs.oid, gs.gen)
+        ref = gs.ref
 
         resources = ensure_resources(page)
         ext_gstate = resources.value[:ExtGState] || {}

data/lib/pdfrb/document/images.rb

@@ -46,12 +46,7 @@ module Pdfrb
       end
 
       def attach_to_resources(name, image)
-        ref = Pdfrb::Model::Reference.new(image.oid, image.gen)
-        # Page-tree root so every page inherits it (s7.7.3.2).
-        root = document.pages.pages_root
-        root.value[:Resources] ||= {}
-        root.value[:Resources][:XObject] ||= {}
-        root.value[:Resources][:XObject][name] = ref
+        document.pages.attach_resource(:XObject, name, image.ref)
       end
     end
   end

data/lib/pdfrb/document/info.rb

@@ -63,7 +63,7 @@ module Pdfrb
 
         info = document.add({}, type: Pdfrb::Model::Cos::Dictionary)
         if document.trailer
-          document.trailer[:Info] = Pdfrb::Model::Reference.new(info.oid, info.gen)
+          document.trailer[:Info] = info.ref
         end
         info
       end

data/lib/pdfrb/document/layers.rb

@@ -26,7 +26,7 @@ module Pdfrb
           { Type: :OCG, Name: name },
           type: Pdfrb::Model::Cos::Dictionary
         )
-        ref = Pdfrb::Model::Reference.new(ocg.oid, ocg.gen)
+        ref = ocg.ref
         @groups << { ref: ref, ocg: ocg, default_on: default_on }
         ocg
       end

data/lib/pdfrb/document/metadata.rb

@@ -62,7 +62,7 @@ module Pdfrb
 
         if obj.nil? && create
           obj = document.add({}, type: Pdfrb::Model::Type::Info)
-          document.trailer[:Info] = Pdfrb::Model::Reference.new(obj.oid, obj.gen)
+          document.trailer[:Info] = obj.ref
         end
         @cached_info = obj
       end

data/lib/pdfrb/document/outline.rb

@@ -29,16 +29,16 @@ module Pdfrb
           { Type: :Outlines },
           type: Pdfrb::Model::Cos::Dictionary
         )
-        root_ref = Pdfrb::Model::Reference.new(root.oid, root.gen)
+        root_ref = root.ref
 
         prev_dict = nil
         first_ref = nil
         @entries.each do |entry|
           dict = entry.build!(@document)
-          ref = Pdfrb::Model::Reference.new(dict.oid, dict.gen)
+          ref = dict.ref
 
           dict.value[:Parent] = root_ref
-          dict.value[:Prev] = Pdfrb::Model::Reference.new(prev_dict.oid, dict.gen) if prev_dict
+          dict.value[:Prev] = prev_dict.ref if prev_dict
           dict.value[:Next] = nil
           prev_dict&.value&.[]=(:Next, ref)
 
@@ -47,7 +47,7 @@ module Pdfrb
         end
 
         root.value[:First] = first_ref
-        root.value[:Last] = Pdfrb::Model::Reference.new(prev_dict.oid, prev_dict.gen) if prev_dict
+        root.value[:Last] = prev_dict.ref if prev_dict
         root.value[:Count] = @entries.length
 
         @document.catalog.value[:Outlines] = root_ref
@@ -78,11 +78,11 @@ module Pdfrb
           first_ref = nil
           @children.each do |child|
             child_dict = child.build!(document)
-            child_ref = Pdfrb::Model::Reference.new(child_dict.oid, child_dict.gen)
-            parent_ref = Pdfrb::Model::Reference.new(dict.oid, dict.gen)
+            child_ref = child_dict.ref
+            parent_ref = dict.ref
 
             child_dict.value[:Parent] = parent_ref
-            child_dict.value[:Prev] = Pdfrb::Model::Reference.new(prev_child_dict.oid, prev_child_dict.gen) if prev_child_dict
+            child_dict.value[:Prev] = prev_child_dict.ref if prev_child_dict
             child_dict.value[:Next] = nil
             prev_child_dict&.value&.[]=(:Next, child_ref)
 
@@ -91,7 +91,7 @@ module Pdfrb
           end
 
           dict.value[:First] = first_ref
-          dict.value[:Last] = Pdfrb::Model::Reference.new(prev_child_dict.oid, prev_child_dict.gen) if prev_child_dict
+          dict.value[:Last] = prev_child_dict.ref if prev_child_dict
           dict.value[:Count] = @children.length
         end
 

data/lib/pdfrb/document/output_intents.rb

@@ -42,7 +42,7 @@ module Pdfrb
         )
         catalog = document.catalog
         intents = catalog.value[:OutputIntents]
-        ref = Pdfrb::Model::Reference.new(intent.oid, intent.gen)
+        ref = intent.ref
         if intents.nil?
           catalog.value[:OutputIntents] = [ref]
         elsif intents.is_a?(::Array)
@@ -63,7 +63,7 @@ module Pdfrb
           type: Pdfrb::Model::Cos::Stream
         )
         stream.stream = profile.raw_data
-        ref = Pdfrb::Model::Reference.new(stream.oid, stream.gen)
+        ref = stream.ref
         add(ref, identifier: identifier, condition: condition, registry: registry, subtype: subtype)
       end
 
@@ -74,7 +74,7 @@ module Pdfrb
         return self unless intents
 
         intents.each do |ref|
-          obj = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          obj = document.resolve(ref)
           yield obj if obj
         end
         self

data/lib/pdfrb/document/pages.rb

@@ -31,9 +31,9 @@ module Pdfrb
         # one lazily when it attaches XObjects.
         page_hash = {
           Type: :Page,
-          Parent: Pdfrb::Model::Reference.new(root.oid, root.gen),
+          Parent: root.ref,
           MediaBox: media_box,
-          Contents: Pdfrb::Model::Reference.new(contents.oid, 0)
+          Contents: contents.ref
         }
         page_hash[:BleedBox] = bleed_box if bleed_box
         page_hash[:TrimBox] = trim_box if trim_box
@@ -42,7 +42,7 @@ module Pdfrb
         page = document.add(page_hash, type: Pdfrb::Model::Type::Page)
         page.value[:Rotate] = rotate if rotate.nonzero?
         kids = (root.value[:Kids] ||= [])
-        kids << Pdfrb::Model::Reference.new(page.oid, page.gen)
+        kids << page.ref
         root.value[:Count] = (root.value[:Count] || 0) + 1
         page
       end
@@ -57,7 +57,8 @@ module Pdfrb
 
       def count
         raw = pages_root[:Count]
-        resolved = raw.is_a?(Pdfrb::Model::Reference) ? document.object(raw)&.value : raw
+        resolved = document.resolve(raw)
+        resolved = resolved.value if resolved.is_a?(Pdfrb::Model::Object)
         case resolved
         when Integer then resolved
         when Numeric then resolved.to_i
@@ -136,6 +137,17 @@ module Pdfrb
         end
       end
 
+      # Attach +ref+ under +category+ (e.g. :Font, :XObject,
+      # :Shading) in the page-tree root's /Resources, where every
+      # page inherits it (s7.7.3.2). The single seam for resource
+      # placement — placement policy changes land here.
+      def attach_resource(category, name, ref)
+        root = pages_root
+        root.value[:Resources] ||= {}
+        root.value[:Resources][category] ||= {}
+        root.value[:Resources][category][name] = ref
+      end
+
       # The page-tree root (Catalog /Pages), seeding an empty tree if
       # needed. Resources placed here are inherited by every page
       # (s7.7.3.2).
@@ -149,7 +161,7 @@ module Pdfrb
         # No /Pages yet — seed an empty tree.
         root = document.add({ Type: :Pages, Kids: [], Count: 0 },
                             type: Pdfrb::Model::Type::PageTreeNode)
-        catalog.value[:Pages] = Pdfrb::Model::Reference.new(root.oid, root.gen)
+        catalog.value[:Pages] = root.ref
         root
       end
 
@@ -163,8 +175,7 @@ module Pdfrb
         kids = kids.value if kids.is_a?(Pdfrb::Model::Cos::Dictionary) && !kids.is_a?(::Hash)
 
         Array(kids).each do |kid_ref|
-          kid = kid_ref.is_a?(Pdfrb::Model::Reference) ?
-                  document.object(kid_ref) : kid_ref
+          kid = document.resolve(kid_ref)
           next unless kid
 
           type = kid.is_a?(Pdfrb::Model::Cos::Dictionary) ? kid.value[:Type] : nil
@@ -181,7 +192,7 @@ module Pdfrb
       def ref_to(page)
         return page if page.is_a?(Pdfrb::Model::Reference)
 
-        Pdfrb::Model::Reference.new(page.oid, page.gen)
+        page.ref
       end
     end
   end

data/lib/pdfrb/document/pdf_a.rb

@@ -48,7 +48,7 @@ module Pdfrb
                   type: Pdfrb::Model::Cos::Stream)
         icc.stream = bytes
         output_intents.add(
-          Pdfrb::Model::Reference.new(icc.oid, icc.gen),
+          icc.ref,
           identifier: SRGB_IDENTIFIER,
           condition: "sRGB IEC61966-2.1",
           registry: SRGB_REGISTRY,

data/lib/pdfrb/document/portfolio.rb

@@ -100,9 +100,9 @@ module Pdfrb
             },
             type: Pdfrb::Model::Cos::Dictionary
           )
-          filespec.value[:EF] = Pdfrb::Model::Reference.new(ef.oid, ef.gen)
+          filespec.value[:EF] = ef.ref
           filespec.value[:AFRelationship] = :Unspecified
-          Pdfrb::Model::Reference.new(filespec.oid, filespec.gen)
+          filespec.ref
         end
       end
 
@@ -112,7 +112,7 @@ module Pdfrb
           type: Pdfrb::Model::Cos::Stream
         )
         embedded.stream = item.file_bytes
-        Pdfrb::Model::Reference.new(embedded.oid, embedded.gen)
+        embedded.ref
       end
     end
   end

data/lib/pdfrb/document/shadings.rb

@@ -109,7 +109,7 @@ module Pdfrb
           {
             FunctionType: 3,
             Domain: Pdfrb::Model::PdfArray.new([0, 1]),
-            Functions: functions.map { |f| Pdfrb::Model::Reference.new(f.oid, f.gen) },
+            Functions: functions.map(&:ref),
             Bounds: Pdfrb::Model::PdfArray.new(bounds),
             Encode: Pdfrb::Model::PdfArray.new(stops.each_cons(2).map { [0, 1] }.flatten),
           },
@@ -142,14 +142,7 @@ module Pdfrb
 
       def register(name, shading_obj)
         @registry[name] = shading_obj
-        document.catalog
-        # Attach to the page-tree root so every page inherits it
-        # (s7.7.3.2); the Catalog has no /Resources key in PDF.
-        root = document.pages.pages_root
-        root.value[:Resources] ||= {}
-        root.value[:Resources][:Shading] ||= {}
-        root.value[:Resources][:Shading][name] =
-          Pdfrb::Model::Reference.new(shading_obj.oid, shading_obj.gen)
+        document.pages.attach_resource(:Shading, name, shading_obj.ref)
       end
 
       def next_name

data/lib/pdfrb/document/stamps.rb

@@ -19,7 +19,7 @@ module Pdfrb
       # @return [Symbol] the resource name (e.g., :St1).
       def stamp_everywhere(form_xobject, at: [0, 0])
         name = next_stamp_name
-        ref = Pdfrb::Model::Reference.new(form_xobject.oid, form_xobject.gen)
+        ref = form_xobject.ref
 
         document.pages.each do |page|
           register_xobject_in_resources(page, name, ref)
@@ -31,7 +31,7 @@ module Pdfrb
       # Stamp a Form XObject on a single page.
       def stamp_page(page, form_xobject, at: [0, 0])
         name = next_stamp_name
-        ref = Pdfrb::Model::Reference.new(form_xobject.oid, form_xobject.gen)
+        ref = form_xobject.ref
         register_xobject_in_resources(page, name, ref)
         emit_do_operator(page, name, at)
         name

data/lib/pdfrb/document/structure.rb

@@ -35,13 +35,13 @@ module Pdfrb
         )
         catalog = document.catalog
         catalog.value[:StructTreeRoot] =
-          Pdfrb::Model::Reference.new(root_elem.oid, root_elem.gen)
+          root_elem.ref
         mark_info = catalog.value[:MarkInfo]
         if mark_info.nil?
           mark_info = document.add({ Marked: true },
                                    type: Pdfrb::Model::Cos::Dictionary)
           catalog.value[:MarkInfo] =
-            Pdfrb::Model::Reference.new(mark_info.oid, mark_info.gen)
+            mark_info.ref
         end
         @root = root_elem
       end
@@ -59,7 +59,7 @@ module Pdfrb
           page_ref = if page.is_a?(Pdfrb::Model::Reference)
                        page
                      else
-                       Pdfrb::Model::Reference.new(page.oid, page.gen)
+                       page.ref
                      end
           elem.value[:Pg] = page_ref
         end
@@ -166,7 +166,7 @@ module Pdfrb
           nums << page_idx
           nums << entries.length
           entries.each do |_mcid, elem| # rubocop:disable Style/HashEachMethods
-            nums << Pdfrb::Model::Reference.new(elem.oid, elem.gen)
+            nums << elem.ref
           end
         end
 
@@ -189,7 +189,7 @@ module Pdfrb
         return 0 unless page_ref
 
         document.pages.each_with_index do |page, idx|
-          page_obj = page.is_a?(Pdfrb::Model::Reference) ? document.object(page) : page
+          page_obj = document.resolve(page)
           return idx if page_obj == page_ref || page == page_ref
         end
         0
@@ -215,16 +215,16 @@ module Pdfrb
       def append_child(parent, child)
         children = parent.value[:K]
         if children.nil?
-          parent.value[:K] = [Pdfrb::Model::Reference.new(child.oid, child.gen)]
+          parent.value[:K] = [child.ref]
         elsif children.is_a?(::Array)
-          children << Pdfrb::Model::Reference.new(child.oid, child.gen)
+          children << child.ref
         else
           parent.value[:K] = [
             children,
-            Pdfrb::Model::Reference.new(child.oid, child.gen),
+            child.ref,
           ]
         end
-        child.value[:P] = Pdfrb::Model::Reference.new(parent.oid, parent.gen)
+        child.value[:P] = parent.ref
       end
 
       public

data/lib/pdfrb/document.rb

@@ -88,6 +88,13 @@ module Pdfrb
     # Resolve a Reference to its Object. New/modified objects take
     # precedence over xref-loaded ones; otherwise consult the
     # ObjectReader (which caches per oid).
+    # Resolve a value to the object it denotes: References are
+    # dereferenced against this document; anything else is returned
+    # unchanged. The single seam for "give me the thing itself".
+    def resolve(value)
+      value.is_a?(Pdfrb::Model::Reference) ? object(value) : value
+    end
+
     def object(reference)
       return reference unless reference.is_a?(Pdfrb::Model::Reference)
 
@@ -430,9 +437,9 @@ module Pdfrb
 
     def seed_empty_structure
       pages = add({ Type: :Pages, Kids: [], Count: 0 })
-      catalog = add({ Type: :Catalog, Pages: Pdfrb::Model::Reference.new(pages.oid, 0) })
+      catalog = add({ Type: :Catalog, Pages: pages.ref })
       @catalog = catalog
-      @empty_trailer = { Size: @next_oid, Root: Pdfrb::Model::Reference.new(catalog.oid, 0) }
+      @empty_trailer = { Size: @next_oid, Root: catalog.ref }
     end
 
     def recover_or_raise(error)

data/lib/pdfrb/encryption/security_handler.rb

@@ -21,8 +21,7 @@ module Pdfrb
         ref = trailer[:Encrypt]
         return nil unless ref
 
-        encrypt = ref.is_a?(Pdfrb::Model::Reference) ?
-                    document.object(ref) : ref
+        encrypt = document.resolve(ref)
         return nil unless encrypt
 
         filter = encrypt[:Filter] || :Standard