pdfrb 0.8.4 → 0.8.6

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)
 
@@ -275,6 +282,16 @@ module Pdfrb
       end
     end
 
+    # Yield every indirect object of +klass+ (e.g. all Streams, all
+    # Dictionaries). Enumerator when blockless.
+    def each_indirect_of(klass)
+      return enum_for(:each_indirect_of, klass) unless block_given?
+
+      each_indirect_object do |obj|
+        yield obj if obj.is_a?(klass)
+      end
+    end
+
     # Walk every revision in the document's incremental-update chain,
     # from the latest (most recent) revision backward via /Prev.
     # Each revision yields a (revision_index, xref, trailer) tuple
@@ -430,9 +447,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

data/lib/pdfrb/font/sfnt.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  module Font
+    # sfnt container (OpenType/TTF) table directory: the shared seam
+    # for reading and rebuilding the wrapper around font outlines.
+    # Both subsetters (TrueType glyf and CFF) rebuild the directory
+    # around their subset tables; this module owns that format so
+    # the two implementations cannot drift (they once disagreed even
+    # on whether checksums are computed).
+    module Sfnt
+      Entry = Struct.new(:tag, :offset, :byte_length)
+
+      module_function
+
+      # Parse the table directory of an sfnt byte string.
+      # Returns [sfnt_version, Array<Entry>].
+      def parse_directory(sfnt)
+        num_tables = (sfnt.getbyte(4) * 256) + sfnt.getbyte(5)
+        version = sfnt.byteslice(0, 4)
+        entries = (0...num_tables).map do |i|
+          base = 12 + (i * 16)
+          Entry.new(
+            sfnt.byteslice(base, 4),
+            sfnt.byteslice(base + 8, 4).unpack1("N"),
+            sfnt.byteslice(base + 12, 4).unpack1("N")
+          )
+        end
+        [version, entries]
+      end
+
+      # Raw bytes of +tag+'s table, or nil.
+      def table_bytes(sfnt, tag)
+        entry = parse_directory(sfnt)[1].find { |e| e.tag == tag }
+        entry && sfnt.byteslice(entry.offset, entry.byte_length)
+      end
+
+      # Rebuild an sfnt wrapper: +sfnt_version+ is the 4-byte magic
+      # (e.g. "\x00\x01\x00\x00" or "OTTO"), +tables+ an Array of
+      # [tag, data] pairs. Checksums are computed per the sfnt spec
+      # (sum of big-endian u32s over zero-padded data).
+      def rebuild(sfnt_version, tables)
+        num = tables.length
+        search_range = (2**Math.log2(num).floor) * 16
+        entry_selector = Math.log2(num).floor
+        range_shift = (num * 16) - search_range
+
+        out = +"".b
+        out << sfnt_version.b
+        out << [num, search_range, entry_selector, range_shift].pack("n4")
+
+        sorted = tables.sort_by { |tag, _| tag }
+        offset = 12 + (num * 16)
+        sorted.each do |tag, data|
+          out << tag.b << [checksum(data), offset, data.bytesize].pack("NNN")
+          offset += (data.bytesize + 3) & ~3
+        end
+        sorted.to_h.each_value do |data|
+          out << data.b
+          out << ("\x00".b * ((4 - (out.bytesize % 4)) % 4))
+        end
+        out
+      end
+
+      def checksum(data)
+        padded = data + ("\x00".b * ((4 - (data.bytesize % 4)) % 4))
+        sum = 0
+        padded.unpack("N*").each { |w| sum = (sum + w) & 0xFFFFFFFF }
+        sum
+      end
+    end
+  end
+end

data/lib/pdfrb/font/true_type/subsetter.rb

@@ -310,58 +310,7 @@ module Pdfrb
 
         # rubocop:disable-next Metrics/MethodLength
         def assemble_ttf(tables)
-          checksum_placeholder = [0].pack("N")
-          num = tables.length
-          search_range = power_of_2_floor(num) * 16
-          entry_selector = Math.log2(search_range / 16).to_i
-          range_shift = (num * 16) - search_range
-
-          header_size = 12
-          dir_size = num * 16
-          data_offset = header_size + dir_size
-
-          # Pad data_offset to 4 bytes
-          data_offset = (data_offset + 3) & ~3
-
-          out = +""
-          out << SFNT_VERSION.pack("N") # sfnt version
-          out << [num].pack("n")
-          out << [search_range].pack("n")
-          out << [entry_selector].pack("n")
-          out << [range_shift].pack("n")
-
-          # Sort tables by tag
-          sorted = tables.sort_by { |tag, _| tag }
-
-          # Calculate offsets
-          current = data_offset
-          offsets = {}
-          sorted.each do |tag, data|
-            offsets[tag] = current
-            current += data.bytesize
-            current = (current + 3) & ~3
-
-            # Directory
-            out << tag.to_s
-            out << checksum_placeholder # checksum (skip)
-            out << [offsets[tag]].pack("N")
-            out << [data.bytesize].pack("N")
-          end
-
-          # Pad to data_offset
-          while out.bytesize < data_offset
-            out << "\x00"
-          end
-
-          # Table data
-          sorted.each_value do |data|
-            out << data
-            while (out.bytesize % 4).nonzero?
-              out << "\x00"
-            end
-          end
-
-          out.force_encoding(::Encoding::BINARY)
+          Pdfrb::Font::Sfnt.rebuild(SFNT_VERSION.pack("N"), tables)
         end
 
         # rubocop:disable Naming/MethodName
@@ -382,11 +331,6 @@ module Pdfrb
         def pad_to_even(str); str << "\x00" if (str.bytesize % 2).nonzero?; end
 
         # rubocop:enable Naming/MethodName
-        def power_of_2_floor(n)
-          p = 1
-          while p * 2 <= n; p *= 2; end
-          p
-        end
       end
     end
   end

data/lib/pdfrb/font/true_type/wrapper.rb

@@ -16,7 +16,7 @@ module Pdfrb
           tu_stream = build_tounicode(document, ttf)
           font_file = embed_font_file(document, ttf_data)
 
-          fd.value[:FontFile2] = Pdfrb::Model::Reference.new(font_file.oid, font_file.gen)
+          fd.value[:FontFile2] = font_file.ref
 
           document.add(
             {
@@ -26,8 +26,8 @@ module Pdfrb
               FirstChar: 0,
               LastChar: 255,
               Widths: widths,
-              FontDescriptor: Pdfrb::Model::Reference.new(fd.oid, fd.gen),
-              ToUnicode: Pdfrb::Model::Reference.new(tu_stream.oid, tu_stream.gen),
+              FontDescriptor: fd.ref,
+              ToUnicode: tu_stream.ref,
               Encoding: :WinAnsiEncoding,
             },
             type: Pdfrb::Model::Type::FontTrueType

data/lib/pdfrb/font.rb

@@ -10,6 +10,7 @@ module Pdfrb
     autoload :CMap, "pdfrb/font/cmap"
     autoload :TrueType, "pdfrb/font/true_type"
     autoload :CFF, "pdfrb/font/cff"
+    autoload :Sfnt, "pdfrb/font/sfnt"
     autoload :Type1, "pdfrb/font/type1"
     autoload :Metrics, "pdfrb/font/metrics_helper"
     autoload :MetricsHelper, "pdfrb/font/metrics_helper"

data/lib/pdfrb/font_loader/true_type.rb

@@ -45,12 +45,12 @@ module Pdfrb
               Descent: -200,
               CapHeight: 700,
               StemV: 80,
-              FontFile2: Pdfrb::Model::Reference.new(font_stream.oid, 0)
+              FontFile2: font_stream.ref
             },
             type: Pdfrb::Model::Type::FontDescriptor
           )
           font_dict.value[:FontDescriptor] =
-            Pdfrb::Model::Reference.new(descriptor.oid, 0)
+            descriptor.ref
         end
 
         font_dict

data/lib/pdfrb/font_loader/type3.rb

@@ -40,7 +40,7 @@ module Pdfrb
           stream = document.add({ Length: glyph.procedure.bytesize },
                                 type: Pdfrb::Model::Cos::Stream)
           stream.stream = glyph.procedure
-          char_procs[glyph.name.to_sym] = Pdfrb::Model::Reference.new(stream.oid, stream.gen)
+          char_procs[glyph.name.to_sym] = stream.ref
           widths[code] = glyph.width
           encoding[:Differences] << code << glyph.name.to_sym
         end

data/lib/pdfrb/importer.rb

@@ -38,10 +38,10 @@ module Pdfrb
 
     def import_reference(ref, source_doc)
       cached = @mappings[ref.oid]
-      return Pdfrb::Model::Reference.new(cached.oid, cached.gen) if cached
+      return cached.ref if cached
 
       in_progress = @in_progress[ref.oid]
-      return Pdfrb::Model::Reference.new(in_progress.oid, in_progress.gen) if in_progress
+      return in_progress.ref if in_progress
 
       source_obj = source_doc.object(ref)
       return nil unless source_obj
@@ -58,7 +58,7 @@ module Pdfrb
       end
       @mappings[ref.oid] = stub
       @in_progress.delete(ref.oid)
-      Pdfrb::Model::Reference.new(stub.oid, stub.gen)
+      stub.ref
     end
 
     def import_hash(hash, source_doc)

data/lib/pdfrb/linearization/writer.rb

@@ -239,7 +239,7 @@ module Pdfrb
       def build_trailer(xref_offset)
         root = @document.catalog
         root_ref = if root.is_a?(Pdfrb::Model::Object) && root.indirect?
-                     Pdfrb::Model::Reference.new(root.oid, root.gen)
+                     root.ref
                    end
         size = [@document.next_oid || 1, 2].max
 

data/lib/pdfrb/model/object.rb

@@ -27,6 +27,13 @@ module Pdfrb
         @document = document
       end
 
+      # The indirect reference denoting this object. The single
+      # seam for "a reference to this" — callers never construct
+      # Reference.new(obj.oid, obj.gen) by hand.
+      def ref
+        Pdfrb::Model::Reference.new(oid, gen)
+      end
+
       # True when this object is referenced indirectly (oid > 0).
       def indirect?
         @oid > 0

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

@@ -17,7 +17,7 @@ module Pdfrb
 
           arr = targets.is_a?(Array) ? targets : [targets]
           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/action_sound.rb

@@ -23,7 +23,7 @@ module Pdfrb
           ref = value[:Sound]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /Volume — optional, -1.0 to 1.0 (default 1.0).
@@ -52,7 +52,7 @@ module Pdfrb
           ref = value[:Next]
           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/add_action_catalog.rb

@@ -41,7 +41,7 @@ module Pdfrb
           ref = value[key]
           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/add_action_form_field.rb

@@ -34,7 +34,7 @@ module Pdfrb
           ref = value[key]
           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/add_action_page_object.rb

@@ -24,7 +24,7 @@ module Pdfrb
           ref = value[key]
           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/add_action_screen_annotation.rb

@@ -54,7 +54,7 @@ module Pdfrb
           ref = value[key]
           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/add_action_widget_annotation.rb

@@ -64,7 +64,7 @@ module Pdfrb
           ref = value[key]
           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/alternate_image.rb

@@ -16,7 +16,7 @@ module Pdfrb
           ref = value[:Image]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /DefaultForPrinting — optional, default false. When true,
@@ -31,7 +31,7 @@ module Pdfrb
           ref = value[:OC]
           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/bead.rb

@@ -19,7 +19,7 @@ module Pdfrb
           ref = value[:T]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /N — required indirect next Bead.
@@ -27,7 +27,7 @@ module Pdfrb
           ref = value[:N]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /V — required indirect previous Bead.
@@ -35,7 +35,7 @@ module Pdfrb
           ref = value[:V]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /P — required indirect Page the bead sits on.
@@ -43,7 +43,7 @@ module Pdfrb
           ref = value[:P]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /R — required rectangle on the page.

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

@@ -123,7 +123,7 @@ module Pdfrb
           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/d_part.rb

@@ -21,7 +21,7 @@ module Pdfrb
           ref = value[:DPartRootNode]
           return nil unless ref && document
 
-          resolved = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          resolved = document.resolve(ref)
           return nil unless resolved && resolved.value.is_a?(::Hash)
 
           DPart.new(resolved.value)
@@ -57,7 +57,7 @@ module Pdfrb
           ref = value[:Parent]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /DParts — array of arrays of child DParts. Mutually
@@ -71,7 +71,7 @@ module Pdfrb
           ref = value[:Start]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         # /End — indirect ref to the last Page in this part.
@@ -79,7 +79,7 @@ module Pdfrb
           ref = value[:End]
           return nil unless ref && document
 
-          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          document.resolve(ref)
         end
 
         def leaf?

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

@@ -45,7 +45,7 @@ module Pdfrb
 
           arr = certs.is_a?(Pdfrb::Model::PdfArray) ? certs.to_a : certs
           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/dss.rb

@@ -73,7 +73,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
       end
     end

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

@@ -24,7 +24,7 @@ module Pdfrb
 
           arr = sub_functions.is_a?(Pdfrb::Model::PdfArray) ? sub_functions.to_a : sub_functions
           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/generic_appearance.rb

@@ -31,7 +31,7 @@ module Pdfrb
             type: Pdfrb::Model::Cos::Stream
           )
           stream.stream = "q Q\n"
-          annotation[:AP] = { N: Pdfrb::Model::Reference.new(stream.oid, stream.gen) }
+          annotation[:AP] = { N: stream.ref }
           stream
         end
       end

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