ucode 0.2.2 → 0.3.0

data/lib/ucode/glyphs/embedded_fonts/catalog.rb

@@ -1,42 +1,26 @@
 # frozen_string_literal: true
 
-require "open3"
-require "pathname"
-
-require_relative "../../error"
-require_relative "font_entry"
-require_relative "tounicode"
-
 module Ucode
   module Glyphs
     module EmbeddedFonts
-      # Walks the Code Charts PDF once and builds a global
-      # `{codepoint => FontEntry}` index.
+      # Composes {PdfIndexer} + {CodepointMapper} to build a global
+      # `{codepoint => FontEntry}` index from a Code Charts PDF.
       #
-      # Discovery uses `mutool info` for the font list (one line per
-      # page-font), then `mutool show -g` to fetch the Type0 font dicts,
-      # their descendant CIDFont dicts, and the FontDescriptors — all in
-      # a handful of batched subprocess calls rather than one per font.
+      # Responsibilities split cleanly:
       #
-      # For each Type0 font we then fetch its ToUnicode CMap stream
-      # (one `mutool show -b -o <tmpfile>` per font — these can't be
-      # batched because each is a separate stream) and parse it into a
-      # `{cid => codepoint}` map. With `/CIDToGIDMap /Identity` (the
-      # only form we currently support), `gid == cid`, so the per-font
-      # map is directly `{codepoint => gid}`.
+      #   * {PdfIndexer} — subprocess + dict parsing → Array<RawFontDescriptor>
+      #   * {CodepointMapper} — 3-path codepoint→GID strategy → {cp => gid}
+      #   * {Catalog} (this class) — composes both into FontEntry objects
+      #     and exposes the public lookup interface
       #
-      # When multiple fonts cover the same codepoint (which happens for
-      # a handful of codepoints that appear in multiple blocks), the
-      # first font discovered wins. The discovery order follows the
-      # `mutool info` listing, which is page-major, so the earlier
-      # block's font wins — the expected behavior for the Code Charts.
+      # When multiple fonts cover the same codepoint, the first font
+      # discovered wins. Discovery order follows mutool info's page-major
+      # listing, so earlier blocks' fonts win — the expected behavior.
       class Catalog
-        # @param source [Source]
+        # @param source [PdfLocation]
         # @param correlator_configs [Hash{Integer=>ContentStreamCorrelator::Config}]
         #   maps a Type0 font's PDF object ID to the pillar-2 config to
-        #   use when the font has no /ToUnicode CMap. Empty by default
-        #   — fonts without ToUnicode and without a config are skipped
-        #   (the v0.1 behavior).
+        #   use when the font has no /ToUnicode CMap. Empty by default.
         def initialize(source, correlator_configs: {})
           @source = source
           @correlator_configs = correlator_configs
@@ -64,7 +48,7 @@ module Ucode
           index.size
         end
 
-        # @return [Integer] number of Type0 fonts discovered
+        # @return [Integer] number of Type0 fonts with non-empty maps
         def font_count
           font_entries.size
         end
@@ -86,286 +70,35 @@ module Ucode
           idx
         end
 
-        # Step 1: parse `mutool info` for the Type0 font list.
-        # Step 2: batch `mutool show -g` to get the Type0 dicts.
-        # Step 3: batch `mutool show -g` for the descendant CIDFont dicts.
-        # Step 4: batch `mutool show -g` for the FontDescriptors.
-        # Step 5: for each font, fetch + parse the ToUnicode CMap.
         def build_font_entries
-          type0_refs = discover_type0_fonts
-          return [] if type0_refs.empty?
-
-          type0_dicts = fetch_objects(type0_refs.keys)
-          descendant_refs = []
-          tounicode_refs = []
-          type0_refs.each_key do |font_obj_id|
-            d = type0_dicts[font_obj_id] || {}
-            desc_ref = first_ref(d["DescendantFonts"])
-            tu_ref = first_ref(d["ToUnicode"])
-            descendant_refs << desc_ref if desc_ref
-            tounicode_refs << tu_ref if tu_ref
-          end
-
-          descendant_dicts = fetch_objects(descendant_refs)
-          fontdesc_refs = []
-          descendant_dicts.each_value do |d|
-            fd_ref = first_ref(d["FontDescriptor"])
-            fontdesc_refs << fd_ref if fd_ref
-          end
-
-          fontdesc_dicts = fetch_objects(fontdesc_refs)
-
-          # Walk again, now with all dicts in hand, and build entries.
-          entries = []
-          type0_refs.each do |font_obj_id, base_font|
-            entry = build_entry(
-              font_obj_id: font_obj_id,
-              base_font: base_font,
-              type0_dict: type0_dicts[font_obj_id],
-              descendant_dicts: descendant_dicts,
-              fontdesc_dicts: fontdesc_dicts,
+          indexer.raw_descriptors.filter_map do |desc|
+            cp_to_gid = mapper.map(desc)
+            next nil if cp_to_gid.empty?
+
+            FontEntry.new(
+              base_font: desc.base_font,
+              font_obj_id: desc.font_obj_id,
+              fontfile_obj_id: desc.fontfile_obj_id,
+              fontfile_kind: desc.fontfile_kind,
+              tounicode_obj_id: desc.tounicode_ref,
+              cid_to_gid_map: desc.cid_map_kind,
+              codepoint_to_gid: cp_to_gid.freeze,
+              source: @source,
             )
-            entries << entry if entry
           end
-          entries
         end
 
-        # Parse `mutool info` output for Type0 fonts.
-        # Format per line: `\t<page>\t(<page_obj> 0 R):\tType0 '<name>' <enc> (<font_obj> 0 R)`
-        # Returns `{font_obj_id => base_font}` preserving first-seen order.
-        def discover_type0_fonts
-          # `mutool info` writes its report to STDERR, not STDOUT.
-          out, err, status = Open3.capture3("mutool", "info", @source.pdf_to_s)
-          unless status.success?
-            raise Ucode::EmbeddedFontsMissingError,
-                  "mutool info failed: #{(out + err).strip}"
-          end
-
-          text = out + err
-          result = {}
-          seen = Set.new
-          text.each_line do |line|
-            next unless line.include?("Type0")
-
-            # Font lines look like: "<page>\t(<pageobj> 0 R):\tType0 '<base>' <enc> (<fontobj> 0 R)"
-            m = line.match(/Type0\s+'([^']+)'\s+\S+\s+\((\d+)\s+0\s+R\)/)
-            next unless m
-
-            base_font = m[1]
-            font_obj_id = m[2].to_i
-            next if seen.include?(font_obj_id)
-
-            seen << font_obj_id
-            result[font_obj_id] = base_font
-          end
-          result
-        end
-
-        # Batch `mutool show -g` for many object numbers at once.
-        # Returns `{obj_id => parsed_dict_hash}`.
-        def fetch_objects(obj_ids)
-          return {} if obj_ids.empty?
-
-          args = ["mutool", "show", "-g",
-                  @source.pdf_to_s].concat(obj_ids.map(&:to_s))
-          out, err, status = Open3.capture3(*args)
-          unless status.success?
-            raise Ucode::EmbeddedFontsMissingError,
-                  "mutool show failed: #{err.strip}"
-          end
-
-          parse_grep_output(out)
+        def indexer
+          @indexer ||= PdfIndexer.new(source: @source)
         end
 
-        # Parse the `mutool show -g` output: one `<id> 0 obj <<...>>` per line.
-        # The dictionary body is a flat string of `/Key value` pairs;
-        # value can be a number, name, string, array, or nested dict.
-        # We extract a small set of keys we care about and represent
-        # their values as strings (caller uses helpers like first_ref).
-        def parse_grep_output(text)
-          result = {}
-          text.each_line do |line|
-            m = line.match(/^(\d+)\s+0\s+obj\s+(.*)$/)
-            next unless m
-
-            obj_id = m[1].to_i
-            result[obj_id] = parse_dict(m[2])
-          end
-          result
-        end
-
-        # We don't try to fully parse the PDF dict grammar. Instead we
-        # regex each field we need directly out of the dict body. This
-        # is robust to `<<...>>`/`[...]` nesting and to `/Key/Value`
-        # pairs (no whitespace) that break naive whitespace-split parsers.
-        def parse_dict(body)
-          body = body.to_s
-          {
-            "BaseFont" => field_match(body, %r{/BaseFont/([^\s/<>]+)}),
-            "DescendantFonts" => field_match(body,
-                                             %r{/DescendantFonts\s*\[\s*(\d+)\s+0\s+R\s*\]}),
-            "ToUnicode" => field_match(body, %r{/ToUnicode\s+(\d+)\s+0\s+R}),
-            "FontDescriptor" => field_match(body,
-                                            %r{/FontDescriptor\s+(\d+)\s+0\s+R}),
-            "FontFile2" => field_match(body, %r{/FontFile2\s+(\d+)\s+0\s+R}),
-            "FontFile3" => field_match(body, %r{/FontFile3\s+(\d+)\s+0\s+R}),
-            "CIDToGIDMap" => field_match(body,
-                                         %r{/CIDToGIDMap(?:/([^\s/<>]+)|\s+(\d+)\s+0\s+R)}),
-          }.compact
-        end
-
-        def field_match(body, regex)
-          m = body.match(regex)
-          return nil unless m
-
-          m.captures.compact.first
-        end
-
-        # Cast a captured integer string into an Integer, tolerant of nil.
-        # {parse_dict}'s regexes already extract just the digit run.
-        def first_ref(value)
-          return nil if value.nil? || value.empty?
-
-          Integer(value)
-        end
-
-        def build_entry(font_obj_id:, base_font:, type0_dict:,
-                        descendant_dicts:, fontdesc_dicts:)
-          desc_ref = first_ref(type0_dict["DescendantFonts"])
-          tu_ref = first_ref(type0_dict["ToUnicode"])
-          return nil unless desc_ref
-
-          desc_dict = descendant_dicts[desc_ref] || {}
-          fd_dict = fontdesc_for(desc_dict, fontdesc_dicts)
-          return nil unless fd_dict
-
-          fontfile_obj_id, fontfile_kind = resolve_fontfile(fd_dict)
-          return nil unless fontfile_obj_id
-
-          cid_map_kind = resolve_cid_to_gid(desc_dict)
-          return nil unless cid_map_kind
-
-          cp_to_gid = build_codepoint_to_gid(
-            font_obj_id: font_obj_id,
-            tu_ref: tu_ref,
-            cid_map_kind: cid_map_kind,
-          )
-          return nil if cp_to_gid.empty?
-
-          FontEntry.new(
-            base_font: base_font,
-            font_obj_id: font_obj_id,
-            fontfile_obj_id: fontfile_obj_id,
-            fontfile_kind: fontfile_kind,
-            tounicode_obj_id: tu_ref,
-            cid_to_gid_map: cid_map_kind,
-            codepoint_to_gid: cp_to_gid.freeze,
+        def mapper
+          @mapper ||= CodepointMapper.new(
             source: @source,
+            correlator_configs: @correlator_configs,
+            indexer: indexer,
           )
         end
-
-        def fontdesc_for(desc_dict, fontdesc_dicts)
-          fd_ref = first_ref(desc_dict["FontDescriptor"])
-          return nil unless fd_ref
-
-          fontdesc_dicts[fd_ref]
-        end
-
-        # Tier-1 path: parse the /ToUnicode CMap. Pillar-2 fallback:
-        # when no /ToUnicode is present, consult the correlator_configs
-        # registry — if the user supplied a config for this font, render
-        # the relevant page(s) to SVG and run positional correlation.
-        # Returns an empty hash when neither path produces a map (the
-        # caller treats that as "skip this font").
-        def build_codepoint_to_gid(font_obj_id:, tu_ref:, cid_map_kind:)
-          return {} if cid_map_kind != :identity
-
-          return codepoint_map_from_tounicode(tu_ref) if tu_ref
-
-          codepoint_map_from_correlator(font_obj_id)
-        end
-
-        def codepoint_map_from_tounicode(tu_ref)
-          cmap_text = fetch_tounicode(tu_ref)
-          build_codepoint_map(ToUnicode.parse(cmap_text), :identity)
-        end
-
-        def codepoint_map_from_correlator(font_obj_id)
-          config = @correlator_configs[font_obj_id]
-          return {} unless config
-
-          svg = render_pages(config.page_numbers)
-          ContentStreamCorrelator.new(config).correlate(svg)
-        end
-
-        def resolve_fontfile(fd_dict)
-          if fd_dict.key?("FontFile2")
-            [first_ref(fd_dict["FontFile2"]), :ttf]
-          elsif fd_dict.key?("FontFile3")
-            [first_ref(fd_dict["FontFile3"]), :cff]
-          end
-        end
-
-        def resolve_cid_to_gid(desc_dict)
-          raw = desc_dict["CIDToGIDMap"]
-          return nil if raw.nil?
-
-          # parse_dict captures the name without the leading slash, so
-          # "/Identity" comes through as "Identity". A stream-form map
-          # is captured as the integer obj id — not supported yet.
-          if raw.to_s == "Identity"
-            :identity
-          end
-        end
-
-        def fetch_tounicode(obj_id)
-          Tempfile.create("ucode-tounicode") do |tmp|
-            tmp.close
-            ok = system("mutool", "show", "-o", tmp.path, "-b",
-                        @source.pdf_to_s, obj_id.to_s,
-                        out: File::NULL, err: File::NULL)
-            unless ok
-              raise Ucode::EmbeddedFontsMissingError,
-                    "mutool show failed for ToUnicode obj=#{obj_id}"
-            end
-
-            File.binread(tmp.path).force_encoding("UTF-8")
-          end
-        end
-
-        # Render the given 1-based PDF pages to a single SVG string
-        # suitable for {ContentStreamCorrelator#correlate}. Each page
-        # is a separate `<svg>...</svg>` document; the correlator's
-        # `<use>` regex tolerates either a single concatenated blob or
-        # multiple documents. Output is captured from mutool's stdout.
-        def render_pages(page_numbers)
-          return "" if page_numbers.nil? || page_numbers.empty?
-
-          out, err, status = run_mutool_draw(page_numbers)
-          unless status.success?
-            raise Ucode::EmbeddedFontsMissingError,
-                  "mutool draw failed: #{err.strip}"
-          end
-
-          out
-        end
-
-        def run_mutool_draw(page_numbers)
-          Open3.capture3(
-            "mutool", "draw", "-F", "svg",
-            @source.pdf_to_s,
-            *page_numbers.map(&:to_s)
-          )
-        end
-
-        def build_codepoint_map(cid_to_cp, cid_map_kind)
-          return {} if cid_to_cp.empty? || cid_map_kind != :identity
-
-          # With /CIDToGIDMap /Identity, gid == cid.
-          cid_to_cp.each_with_object({}) do |(cid, cp), h|
-            h[cp] = cid
-          end
-        end
       end
     end
   end

data/lib/ucode/glyphs/embedded_fonts/codepoint_mapper.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require "open3"
+require "pathname"
+require "tempfile"
+
+module Ucode
+  module Glyphs
+    module EmbeddedFonts
+      # Resolves codepoint → GID for one Type0 font via a 3-path strategy:
+      #
+      # 1. **ToUnicode CMap** — the font's `/ToUnicode` stream (Tier 1
+      #    for pillar 1). Parsed by {ToUnicode}.
+      # 2. **Caller-supplied correlator config** (pillar 2) — render the
+      #    font's pages to SVG and run {ContentStreamCorrelator}.
+      # 3. **Auto-detect via mutool trace** (pillar 2b) — trace every
+      #    page and run {TraceCorrelator} positionally.
+      #
+      # Each path returns a `{codepoint => gid}` map. First non-empty
+      # result wins; the strategy stops there.
+      #
+      # Pure strategy orchestration — does NOT parse the PDF object graph
+      # (that's {PdfIndexer}'s job). Takes a {RawFontDescriptor} + the
+      # shared {PdfIndexer} (for page_count + font_appears? queries used
+      # by the trace fallback).
+      class CodepointMapper
+        # @param source [PdfLocation]
+        # @param correlator_configs [Hash{Integer=>ContentStreamCorrelator::Config}]
+        #   caller-supplied pillar-2 configs, keyed by font_obj_id
+        # @param indexer [PdfIndexer] for page_count + font_appears? queries
+        def initialize(source:, correlator_configs:, indexer:)
+          @source = source
+          @correlator_configs = correlator_configs
+          @indexer = indexer
+        end
+
+        # @param descriptor [RawFontDescriptor]
+        # @return [Hash{Integer=>Integer}] codepoint => gid; empty when
+        #   no strategy produces a map
+        def map(descriptor)
+          return {} unless descriptor.cid_map_kind == :identity
+
+          from_tounicode = map_from_tounicode(descriptor.tounicode_ref)
+          return from_tounicode unless from_tounicode.empty?
+
+          from_correlator = map_from_correlator(descriptor.font_obj_id)
+          return from_correlator unless from_correlator.empty?
+
+          map_from_trace(descriptor.base_font)
+        end
+
+        private
+
+        # ---- Strategy 1: /ToUnicode CMap --------------------------------
+
+        def map_from_tounicode(tu_ref)
+          return {} unless tu_ref
+
+          cmap_text = fetch_tounicode(tu_ref)
+          cid_to_cp = ToUnicode.parse(cmap_text)
+          build_codepoint_map(cid_to_cp)
+        end
+
+        def build_codepoint_map(cid_to_cp)
+          cid_to_cp.each_with_object({}) do |(cid, cp), h|
+            h[cp] = cid
+          end
+        end
+
+        def fetch_tounicode(obj_id)
+          Tempfile.create("ucode-tounicode") do |tmp|
+            tmp.close
+            ok = system("mutool", "show", "-o", tmp.path, "-b",
+                        @source.pdf_to_s, obj_id.to_s,
+                        out: File::NULL, err: File::NULL)
+            unless ok
+              raise Ucode::EmbeddedFontsMissingError,
+                    "mutool show failed for ToUnicode obj=#{obj_id}"
+            end
+
+            File.binread(tmp.path).force_encoding("UTF-8")
+          end
+        end
+
+        # ---- Strategy 2: caller-supplied correlator config --------------
+
+        def map_from_correlator(font_obj_id)
+          config = @correlator_configs[font_obj_id]
+          return {} unless config
+
+          svg = render_pages(config.page_numbers)
+          ContentStreamCorrelator.new(config).correlate(svg)
+        end
+
+        def render_pages(page_numbers)
+          return "" if page_numbers.nil? || page_numbers.empty?
+
+          out, err, status = Open3.capture3(
+            "mutool", "draw", "-F", "svg",
+            @source.pdf_to_s,
+            *page_numbers.map(&:to_s),
+          )
+          unless status.success?
+            raise Ucode::EmbeddedFontsMissingError,
+                  "mutool draw failed: #{err.strip}"
+          end
+
+          out
+        end
+
+        # ---- Strategy 3: auto-detect via mutool trace --------------------
+
+        def map_from_trace(base_font)
+          return {} unless @indexer.font_appears?(base_font)
+
+          runner = TraceRunner.new(@source.pdf_path)
+          correlator = TraceCorrelator.new(specimen_font_name: base_font)
+
+          (1..@indexer.page_count).each_with_object({}) do |page, mapping|
+            glyphs = runner.trace([page])
+            page_mapping = correlator.correlate(glyphs)
+            page_mapping.each do |cp, gid|
+              mapping[cp] ||= gid
+            end
+          end
+        end
+      end
+    end
+  end
+end