idml 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8ffd92b6fd96bc1b018ed0875a0344e4c96692b18a12f3ab7999db3bc0c257
-  data.tar.gz: b454cdc91f17dabacd2c35a8f1b808aacbb23b40a91b7b392eab68c7b109935c
+  metadata.gz: b96b3531c996da57cb6d46da274a55b9abbd352329617065da6a98b8176868a1
+  data.tar.gz: 9e8dfa3c572ab6b2f96e90194321cfd212160baf408016c829abf16e8e8f60dc
 SHA512:
-  metadata.gz: 9d1c153af76705ddef5cdf58334d1f23010dd0a88c3559f9fd7da87cf94a52f2a48c386dddd6a443f2877c0df25e9ae618a3388e117d5c825b99814ee2d35973
-  data.tar.gz: 86eaa92d00b471cb085dc32f81e6c7618a856583ff340bd88f5b535378cfa8e46c73685d5fb6090a10be22e3c3425066b54859ce98be78cb31a2dcfc598a71b2
+  metadata.gz: dcbcb115a524896a38c1f9c44bdbde7bbac2a504f574388555702c3ffafc97908e7d3b029832e15f157903e3ab0ec1c945bd9751bc23046f7d1aeacbca6eab14
+  data.tar.gz: cfb3023e1c1c45408151fe02c6c02e065a0092f3aa7576d425c9637cd3e7080e6c7359b93d58e31e6bc18fdaa4795ea5b8cd01a67b5eca2f989a6bea6cbb6415

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    idml (0.5.5)
+    idml (0.6.0)
       bigdecimal
       lutaml-model (~> 0.8.18)
       pdfrb
@@ -183,7 +183,7 @@ CHECKSUMS
   ffi (1.17.4-x86_64-darwin) sha256=aa70390523cf3235096cf64962b709b4cfbd5c082a2cb2ae714eb0fe2ccda496
   ffi (1.17.4-x86_64-linux-gnu) sha256=9d3db14c2eae074b382fa9c083fe95aec6e0a1451da249eab096c34002bc752d
   ffi (1.17.4-x86_64-linux-musl) sha256=3fdf9888483de005f8ef8d1cf2d3b20d86626af206cbf780f6a6a12439a9c49e
-  idml (0.5.5)
+  idml (0.6.0)
   json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
   language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87

data/TODO.pdf/77-pdfa-xmp-output-intent.md

@@ -1,6 +1,6 @@
 # TODO PDF 77: PDF/A XMP packet and Catalog /Metadata stream
 
-## Status: PARTIAL — XMP packet emitted; ICC output intent deferred
+## Status: DONE — XMP + ICC output intent both implemented
 
 ## What was implemented
 

data/TODO.pdf/93-per-run-font-resolution.md

@@ -1,6 +1,6 @@
 # TODO PDF 93: Per-run font resolution from CharacterStyleRange
 
-## Status: PLANNED (last major rendering fidelity gap)
+## Status: DONE — font_map architecture implemented
 
 ## Problem
 

data/lib/idml/render/font_setup.rb

@@ -50,6 +50,31 @@ module Idml
         nil
       end
 
+      # Pre-registers every non-missing font in the document and
+      # returns a map of family_name → pdfrb Symbol resource. Used
+      # by the renderer to resolve per-run AppliedFont references.
+      # Falls back to DEFAULT_FONT for families that can't be resolved.
+      def font_map(writer)
+        map = {}
+        return map unless @package&.fonts
+
+        @package.fonts.font_family.each do |family|
+          next unless family.name
+
+          map[family.name] = resource_for_family(writer, family)
+        end
+        map
+      end
+
+      def resource_for_family(writer, family)
+        path = find_font_file(family)
+        return DEFAULT_FONT unless path
+
+        writer.register_font(path)
+      rescue StandardError
+        DEFAULT_FONT
+      end
+
       private
 
       def resolve_document_font_path

data/lib/idml/render/pipeline.rb

@@ -43,12 +43,13 @@ module Idml
                                    font_search_paths: @font_search_paths)
         font_resource = font_setup.register(writer)
         font_metrics = font_setup.metrics_for(writer, font_resource)
+        font_map = font_setup.font_map(writer)
 
         page_index = -1
         @package.spreads.each do |spread|
           page_index = render_spread(writer, spread, layer_filter,
                                      font_ref_resolver, font_resource,
-                                     font_metrics, structure,
+                                     font_metrics, font_map, structure,
                                      position_tracker, page_index)
         end
 
@@ -88,15 +89,15 @@ module Idml
       end
 
       def render_spread(writer, spread, layer_filter, font_ref_resolver,
-                        font_resource, font_metrics, structure,
+                        font_resource, font_metrics, font_map, structure,
                         position_tracker, page_offset)
         pages = spread.spread.flat_map(&:page)
         image_refs = ImageCollector.new(writer: writer,
                                         base_dir: File.dirname(@package.path),
                                         page_height: DEFAULT_HEIGHT).collect(spread)
         renderer = build_renderer(layer_filter, font_ref_resolver,
-                                  font_resource, font_metrics, structure,
-                                  position_tracker)
+                                  font_resource, font_metrics, font_map,
+                                  structure, position_tracker)
         current = page_offset
 
         pages.each do |page|
@@ -125,10 +126,11 @@ module Idml
       end
 
       def build_renderer(layer_filter, font_ref_resolver, font_resource,
-                         font_metrics, structure, position_tracker)
+                         font_metrics, font_map, structure, position_tracker)
         SpreadRenderer.new(
           font_metrics: font_metrics,
           font_ps_name: font_resource,
+          font_map: font_map,
           package: @package,
           layer_filter: layer_filter,
           font_ref_resolver: font_ref_resolver,

data/lib/idml/render/render_context.rb

@@ -13,6 +13,7 @@ module Idml
       :font_ref_resolver,
       :color_resolver,
       :font_ps_name,
+      :font_map,
       :page_width,
       :page_height,
       :layer_filter,

data/lib/idml/render/renderers/group_renderer.rb

@@ -18,6 +18,7 @@ module Idml
                 font_ref_resolver: context.font_ref_resolver,
                 color_resolver: context.color_resolver,
                 font_ps_name: context.font_ps_name,
+                font_map: context.font_map,
                 page_width: context.page_width,
                 page_height: context.page_height,
                 layer_filter: context.layer_filter,

data/lib/idml/render/renderers/text_frame_renderer.rb

@@ -116,7 +116,7 @@ module Idml
             line_width = line.width
             canvas.text(line_text(line),
                         at: [line_x, line_y],
-                        font: context.font_ps_name,
+                        font: font_for_run(run, context),
                         size: size)
             record_position(context, line, line_x, line_y, line_width, size,
                             cursor)
@@ -142,6 +142,20 @@ module Idml
         end
         private_class_method :record_position
 
+        # Resolves the font resource for a styled run. Checks the
+        # run's `applied_font` (family name from CSR's AppliedFont)
+        # against the document's font_map. Falls back to the document
+        # default when no per-run font is specified or the family
+        # isn registered.
+        def self.font_for_run(run, context)
+          family = run.applied_font
+          return context.font_ps_name unless family
+          return context.font_ps_name unless context.font_map
+
+          context.font_map[family] || context.font_ps_name
+        end
+        private_class_method :font_for_run
+
         def self.line_text(line)
           line.glyphs.map { |g| [g.codepoint].pack("U") }.join
         end
@@ -166,7 +180,7 @@ module Idml
           runs.map do |run|
             {
               text: run.text,
-              font: context.font_ps_name,
+              font: font_for_run(run, context),
               size: run.point_size,
             }
           end

data/lib/idml/render/spread_renderer.rb

@@ -7,7 +7,7 @@ module Idml
       def initialize(font_metrics: nil, font_ps_name: Render::DEFAULT_FONT,
                      package: nil, layer_filter: LayerFilter::EXCLUDE_NONE,
                      font_ref_resolver: nil, structure: nil,
-                     position_tracker: nil)
+                     position_tracker: nil, font_map: {})
         @font_metrics = font_metrics
         @font_ps_name = font_ps_name
         @package = package
@@ -15,6 +15,7 @@ module Idml
         @font_ref_resolver = font_ref_resolver
         @structure = structure
         @position_tracker = position_tracker
+        @font_map = font_map
       end
 
       def render(canvas, spread, page_width:, page_height:, image_refs: [],
@@ -25,6 +26,7 @@ module Idml
           font_ref_resolver: @font_ref_resolver,
           color_resolver: build_color_resolver,
           font_ps_name: @font_ps_name,
+          font_map: @font_map,
           page_width: page_width,
           page_height: page_height,
           layer_filter: @layer_filter,

data/lib/idml/render.rb

@@ -2,16 +2,6 @@
 
 require "pdfrb"
 
-# pdfrb 0.6.0 autoloads OptContentUsage from opt_content_ext.rb but
-# that file doesn't define it, causing eager_load! to crash.
-# Trigger the autoload (catching the failure) then define a stub.
-begin
-  Pdfrb::Model::Type::OptContentUsage
-rescue NameError
-  Pdfrb::Model::Type.const_set(:OptContentUsage,
-                               Class.new(Pdfrb::Model::Cos::Dictionary))
-end
-
 module Idml
   module Render
     autoload :ColorHelper,         "#{__dir__}/render/color_helper"

data/lib/idml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Idml
-  VERSION = "0.5.5"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idml
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Ribose