idml 0.2.6 → 0.2.8

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

@@ -9,7 +9,7 @@ module Idml
           rect = context.item
           return if rect.visible == false
 
-          box = placement_box(rect, context.page_height)
+          box = Placement.box(rect, context.page_height)
           return unless box
 
           Blending.wrap(canvas, rect.transparency_setting) do
@@ -18,13 +18,6 @@ module Idml
           end
         end
 
-        def self.placement_box(rect, page_height)
-          bounds = rect.geometric_bounds
-          return nil unless bounds
-
-          Geometry.placement_rect(bounds, rect.item_transform, page_height)
-        end
-
         def self.render_fill(canvas, rect, context, box)
           return unless rect.fill_color
           return if rect.fill_color == "Color/None"
@@ -101,23 +94,19 @@ module Idml
         private_class_method :gradient_stops
 
         def self.render_stroke(canvas, rect, context, box)
-          return unless strokeable?(rect)
+          return unless StrokeStyle.strokeable?(rect)
 
           color = context.color_resolver&.resolve(rect.stroke_color)
           return unless color
 
-          canvas.stroke_color(ColorHelper.to_canvas(color))
-          canvas.line_width = rect.stroke_weight
-          canvas.rectangle(box[:x], box[:y], box[:width], box[:height])
-          canvas.stroke
+          StrokeStyle.apply(canvas, rect) do
+            canvas.stroke_color(ColorHelper.to_canvas(color))
+            canvas.line_width = rect.stroke_weight
+            canvas.rectangle(box[:x], box[:y], box[:width], box[:height])
+            canvas.stroke
+          end
         end
         private_class_method :render_stroke
-
-        def self.strokeable?(rect)
-          rect.stroke_color &&
-            rect.stroke_color != "Color/None" &&
-            rect.stroke_weight&.positive?
-        end
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Idml
           return if table.visible == false
           return if table.table_row.empty?
 
-          box = RectangleRenderer.placement_box(table, context.page_height)
+          box = Placement.box(table, context.page_height)
           return unless box
 
           row_count = table.table_row.length

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

@@ -43,15 +43,7 @@ module Idml
         private_class_method :chain_head?
 
         def self.frame_box(frame, page_height)
-          bounds = frame.geometric_bounds
-          unless bounds
-            return { x: 72.0, y: page_height - 72.0, width: 400.0,
-                     height: 600.0 }
-          end
-
-          transform = Geometry.parse_transform(frame.item_transform)
-          transformed = Geometry.transform_bounds(bounds, transform)
-          Geometry.bounds_to_pdf_rect(transformed, page_height)
+          Placement.box(frame, page_height, fallback: true)
         end
         private_class_method :frame_box
 

data/lib/idml/render/stroke_style.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Idml
+  module Render
+    # Maps IDML stroke-style attributes on a page item to the four
+    # pdfrb Canvas setters that control PDF stroke rendering:
+    # `line_cap=`, `line_join=`, `miter_limit=`, `dash_pattern=`.
+    #
+    # IDML → PDF enum mapping per PDF 32000-1 §8.4.3:
+    #
+    #   EndCap        → LineCap
+    #     ButtEndCap        → 0
+    #     RoundEndCap       → 1
+    #     ProjectingEndCap  → 2
+    #
+    #   EndJoin       → LineJoin
+    #     MiterEndJoin   → 0
+    #     RoundEndJoin   → 1
+    #     BevelEndJoin   → 2
+    #
+    # `StrokeDashAndGap` is a flat list `[d1, g1, d2, g2, ...]` — pdfrb
+    # accepts the same shape as `dash_pattern=[array, phase]`.
+    module StrokeStyle
+      CAP_MAP = {
+        "ButtEndCap" => 0,
+        "RoundEndCap" => 1,
+        "ProjectingEndCap" => 2,
+      }.freeze
+
+      JOIN_MAP = {
+        "MiterEndJoin" => 0,
+        "RoundEndJoin" => 1,
+        "BevelEndJoin" => 2,
+      }.freeze
+
+      # True when the item has a renderable stroke: a non-None stroke
+      # color and a positive stroke weight.
+      def self.strokeable?(item)
+        !!(item.stroke_color &&
+          item.stroke_color != "Color/None" &&
+          item.stroke_weight&.positive?)
+      end
+
+      # Apply stroke-style settings from `item` to `canvas` inside a
+      # saved graphics state, then yield so the caller can emit the
+      # path and call `canvas.stroke`. The save/restore ensures
+      # cap/join/miter/dash settings don't bleed into subsequent
+      # strokes on the same page.
+      def self.apply(canvas, item)
+        canvas.save_graphics_state do
+          set_cap(canvas, item.end_cap)
+          set_join(canvas, item.end_join)
+          set_miter(canvas, item.miter_limit)
+          set_dash(canvas, item.stroke_dash_and_gap)
+          yield
+        end
+      end
+
+      def self.set_cap(canvas, raw)
+        code = CAP_MAP[raw]
+        canvas.line_cap = code if code
+      end
+      private_class_method :set_cap
+
+      def self.set_join(canvas, raw)
+        code = JOIN_MAP[raw]
+        canvas.line_join = code if code
+      end
+      private_class_method :set_join
+
+      def self.set_miter(canvas, raw)
+        return unless raw
+
+        value = raw.to_f
+        return unless value >= 1.0
+
+        canvas.miter_limit = value
+      end
+      private_class_method :set_miter
+
+      def self.set_dash(canvas, raw)
+        return unless raw
+
+        array = parse_dash_array(raw)
+        return unless array.length >= 2
+
+        canvas.dash_pattern = [array, 0]
+      end
+      private_class_method :set_dash
+
+      def self.parse_dash_array(raw)
+        raw.to_s.split(/\s+/).map(&:to_f)
+      end
+      private_class_method :parse_dash_array
+    end
+  end
+end

data/lib/idml/render.rb

@@ -12,7 +12,9 @@ module Idml
              "#{__dir__}/render/font_reference_resolver"
     autoload :GradientResolver,    "#{__dir__}/render/gradient_resolver"
     autoload :Blending,            "#{__dir__}/render/blending"
+    autoload :StrokeStyle,         "#{__dir__}/render/stroke_style"
     autoload :LayerFilter,         "#{__dir__}/render/layer_filter"
+    autoload :Placement,           "#{__dir__}/render/placement"
     autoload :StoryThreader,       "#{__dir__}/render/story_threader"
     autoload :PdfrbWriter, "#{__dir__}/render/pdfrb_writer"
     autoload :SpreadRenderer,      "#{__dir__}/render/spread_renderer"
@@ -23,11 +25,16 @@ module Idml
 
     DEFAULT_FONT = "Helvetica"
 
+    # Render an IDML package to a PDF file. All options except
+    # `package:` and `to:` are keyword-only and optional.
+    # rubocop:disable Metrics/ParameterLists
     def self.render(package:, to:, font_search_paths: nil, compliance: nil,
-                   tagged: false)
-      Pipeline.new(package, to, font_search_paths, compliance: compliance,
-                                                   tagged: tagged).call
+                   tagged: false, subset_fonts: true)
+      Pipeline.new(package, to, font_search_paths,
+                   compliance: compliance, tagged: tagged,
+                   subset_fonts: subset_fonts).call
     end
+    # rubocop:enable Metrics/ParameterLists
   end
 end
 

data/lib/idml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idml
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Ribose
@@ -211,6 +211,13 @@ files:
 - TODO.pdf/68-radial-gradient-shadings.md
 - TODO.pdf/69-transparency-blend-modes.md
 - TODO.pdf/70-stroke-styling.md
+- TODO.pdf/71-shared-placement-module.md
+- TODO.pdf/72-stroke-styling.md
+- TODO.pdf/73-gradient-resolver-cleanup.md
+- TODO.pdf/74-renderer-spec-coverage.md
+- TODO.pdf/75-pdf-metadata-from-xmp.md
+- TODO.pdf/76-tagged-pdf-structure.md
+- TODO.pdf/77-pdfa-xmp-output-intent.md
 - TODO.pdf/README.md
 - exe/idml
 - idml.gemspec
@@ -385,6 +392,7 @@ files:
 - lib/idml/render/page_item_renderer.rb
 - lib/idml/render/pdfrb_writer.rb
 - lib/idml/render/pipeline.rb
+- lib/idml/render/placement.rb
 - lib/idml/render/render_context.rb
 - lib/idml/render/renderers.rb
 - lib/idml/render/renderers/graphic_line_renderer.rb
@@ -395,6 +403,7 @@ files:
 - lib/idml/render/renderers/text_frame_renderer.rb
 - lib/idml/render/spread_renderer.rb
 - lib/idml/render/story_threader.rb
+- lib/idml/render/stroke_style.rb
 - lib/idml/render/style_resolver.rb
 - lib/idml/text_engine.rb
 - lib/idml/text_engine/cjk_layout.rb