hexapdf 1.7.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04f2a87f1aaa95513275432d718996b7d598fc15e476f6999f6b6fe9f29cd0f8
-  data.tar.gz: 539d2b0e984db4ca4095bf0aad5208fbbdff5a08acc80d270a6b1c824f12c87e
+  metadata.gz: d51b41e4326a58a6c3d51e8ee0ee3ce1ee194199d9967817240dac81205ba573
+  data.tar.gz: ac3ca606173c2fad485bf5df8d5fb8947c33aab2fc28b970516adedf804de5eb
 SHA512:
-  metadata.gz: c35f8b0267ef60c6392ae99d8c001e4d6b5e18ea1f5a62132d44bbf865d52cc8a9b08436e107c35a01d3a6edaeb7be9bcede20931a255416d4ea4d07778f8fc0
-  data.tar.gz: bfdedefe99c534d62b11f406b447902ea6824758153448ebfba35d0e456850134ba36a6cb2c97d668983e8a5b5b96bf0ab0a03c6136f2478a7717a0e7bb0933b
+  metadata.gz: dea3e27895918e159dedb6b8ff44b5db055e886656d1439d8d927fab57e9b1039489d9234392109b52a881ae67a02716c48a12dba9534e4d7894ab5e4c93251f
+  data.tar.gz: bef1d2e5217562c4772e1dc16a1a38e8342c741a1bcc404cabe203ed07268e8e25c2f5476749a8712362cece9dada4ed91e6e989a88872f7c4d08c3e24298823

data/CHANGELOG.md

@@ -1,3 +1,52 @@
+## 1.9.0 - 2026-06-07
+
+### Added
+
+* Support for HarfBuzz based text shaping
+* [HexaPDF::Layout::Style#shaping_engine] for specifying the used shaping engine
+* [HexaPDF::Layout::Style#font_script] for specifying the script of text
+* [HexaPDF::Layout::Style#language] for specifying the language of text
+* [HexaPDF::Layout::Style#direction] for specifying the direction of text
+* [HexaPDF::Font::TrueTypeWrapper#filename] for retrieving the filename from
+  which the wrapped font was created
+* Inter as bundled font in variants regular, bold, italic and bold italic
+* [HexaPDF::Type::Annotations::Ink] for ink annotations as well as
+  [HexaPDF::Document::Annotations#create_scribble]
+
+### Changed
+
+* [HexaPDF::Layout::TableBox] to support splitting cells
+* [HexaPDF::Font::CMap::Writer] to support ToUnicode CMaps with mappings from
+  one input code to multiple codepoints
+
+### Fixed
+
+* [HexaPDF::Layout::ContainerBox] to correctly set width and height when
+  splitting
+
+
+## 1.8.0 - 2026-05-14
+
+### Added
+
+* [HexaPDF::Task::ImportPages] for importing pages while preserving the optional
+  content configuration and interactive form fields
+* [HexaPDF::Type::FontType3#embedded?] as Type 3 fonts are always embedded
+* CLI options `--acro-form` and `--optional-content` to `hexapdf merge` for
+  specifying how interactive form fields and optional content are handled
+
+### Changed
+
+* Serialization of strings to avoid problems with buggy Ghostscript versions
+* [HexaPDF::FontLoader::FromFile] to raise an error when loading a non-TrueType
+  font
+
+### Fixed
+
+* CLI command `hexapdf fonts` to work for Type 3 fonts
+* CLI command `hexapdf images` to correctly show images nested in Form XObjects
+
+
 ## 1.7.0 - 2026-04-13
 
 ### Added
@@ -7,7 +56,7 @@
 * Support for digitally signing with DSA keys
 * Support for BrotliDecode filter
 * [HexaPDF::Type::DocumentSecurityStore] and
-  [HexaPDF::Type::ValidationRelatedInformation]
+  [HexaPDF::Type::DocumentSecurityStore::ValidationRelatedInformation]
 
 ### Changed
 

data/LICENSE

@@ -1,5 +1,5 @@
 HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-Copyright (C) 2014-2025 Thomas Leitner
+Copyright (C) 2014-2026 Thomas Leitner
 
 HexaPDF is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License version 3 as

data/README.md

@@ -177,6 +177,9 @@ Some included files have a different license:
 
 * The file `test/data/fonts/Ubuntu-Title.ttf` is licensed under the SIL Open Font License.
 
+* The files in `data/hexapdf/fonts` are licensed under SIL Open Font License, Version 1.1, see the
+  file `data/hexapdf/fonts/OFL.txt`.
+
 * The AES test vector files in `test/data/aes-test-vectors` have been created using the test vector
   file available from <http://csrc.nist.gov/groups/STM/cavp/block-ciphers.html#test-vectors>.
 

data/Rakefile

@@ -47,7 +47,7 @@ namespace :dev do
   end
 
   task :test_all do
-    versions = `rbenv versions --bare | grep -i ^3.`.split("\n")
+    versions = `rbenv versions --bare | grep -i '^3.[2-9]\\|^4.'`.split("\n")
     versions.each do |version|
       sh "eval \"$(rbenv init -)\"; rbenv shell #{version} && ruby -v && rake test"
     end

data/data/hexapdf/fonts/OFL.txt

@@ -0,0 +1,92 @@
+Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

data/examples/005-merging.rb

@@ -8,7 +8,8 @@
 #
 # For example, named destinations are not properly handled by the code.
 # Sometimes other things like attached files or a document outline
-# should also be preserved.
+# should also be preserved. For more advanced importing of pages see
+# [HexaPDF::Task::ImportPages].
 #
 # The hexapdf binary provides a command for merging files which does
 # the merging in a more sophisticated way.

data/examples/019-acro_form.rb

@@ -4,7 +4,8 @@
 # fields. HexaPDF supports the creation and processing of these forms.
 #
 # This example show-cases how to create the various form field types and their
-# possible standard appearances.
+# possible standard appearances (e.g. setting the background color and border
+# style).
 #
 # The [HexaPDF::Type::AcroForm::Form] and [HexaPDF::Type::AcroForm::Field]
 # classes provide a plethora of convenience methods for working with forms, like
@@ -52,6 +53,7 @@ canvas.text("Text fields", at: [50, 480])
 canvas.text("Single line", at: [70, 450])
 tx = form.create_text_field("Single Line", font_size: 16)
 widget = tx.create_widget(page, Rect: [200, 445, 500, 465])
+widget.background_color("lightyellow").border_style(color: "black", style: [2])
 tx.field_value = "A sample test string!"
 
 canvas.text("Multiline", at: [70, 420])

data/examples/030-pdfa.rb

@@ -13,14 +13,6 @@ require 'hexapdf'
 
 HexaPDF::Composer.create('pdfa.pdf') do |composer|
   composer.document.task(:pdfa)
-  composer.document.config['font.map'] = {
-    'Lato' => {
-      none: '/usr/share/fonts/truetype/lato/Lato-Regular.ttf',
-      bold: '/usr/share/fonts/truetype/lato/Lato-Bold.ttf',
-      italic: '/usr/share/fonts/truetype/lato/Lato-Italic.ttf',
-      bold_italic: '/usr/share/fonts/truetype/lato/Lato-BoldItalic.ttf',
-    },
-  }
 
   company = {
     name: 'Sample Corp Limited',
@@ -29,21 +21,21 @@ HexaPDF::Composer.create('pdfa.pdf') do |composer|
 
   # Define all styles
   composer.styles(
-    base: {font: 'Lato', font_size: 10, line_spacing: 1.3},
+    base: {font: 'Inter', font_size: 10, line_spacing: 1.3},
     top: {font_size: 8},
     top_box: {padding: [100, 0, 0], margin: [0, 0, 10], border: {width: [0, 0, 1]}},
-    header: {font: 'Lato bold', font_size: 20, margin: [50, 0, 20]},
+    header: {font: 'Inter bold', font_size: 20, margin: [50, 0, 20]},
     line_items: {border: {width: 1, color: "eee"}, margin: [20, 0]},
     line_item_cell: {font_size: 8},
     footer: {border: {width: [1, 0, 0], color: "darkgrey"}, padding: [5, 0, 0],
              valign: :bottom},
-    footer_heading: {font: 'Lato bold', font_size: 8, padding: [0, 0, 8]},
+    footer_heading: {font: 'Inter bold', font_size: 8, padding: [0, 0, 8]},
     footer_text: {font_size: 8, fill_color: "darkgrey"},
   )
 
   # Top part
   composer.box(:container, style: :top_box) do |container|
-    container.formatted_text([{text: company[:name], font: 'Lato bold'},
+    container.formatted_text([{text: company[:name], font: 'Inter bold'},
                               " - " + company[:address].join(' - ')], style: :top)
   end
   composer.text("Mega Client\nSmall Lane 5\n67890 Noonestown", mask_mode: :box)
@@ -52,7 +44,7 @@ HexaPDF::Composer.create('pdfa.pdf') do |composer|
            ["Service date:", "2024-02-01"]]
   composer.table(cells, column_widths: [150, 80], style: {align: :right}) do |args|
     args[] = {cell: {border: {width: 0}, padding: 2}, text_align: :right}
-    args[0..-1, 0] = {font: 'Lato bold'}
+    args[0..-1, 0] = {font: 'Inter bold'}
   end
 
   # Middle part
@@ -67,10 +59,11 @@ HexaPDF::Composer.create('pdfa.pdf') do |composer|
   cells << [nil, nil, nil, "€ #{250 * max * (max + 1) / 2},00"]
   composer.table(cells, column_widths: [250, 80], style: :line_items) do |args|
     args[] = {cell: {border: {width: 0}, padding: 8}, style: :line_item_cell}
-    args[0] = {cell: {background_color: "eee"}, font: "Lato bold"}
+    args[0] = {cell: {background_color: "eee"}, font: "Inter bold"}
     args[-1] = {cell: {background_color: "eee", border: {width: [2, 0, 0]}},
-                font: "Lato bold"}
-    args[0..-1, 1..-1] = {text_align: :right}
+                font: "Inter bold"}
+    args[0..-1, 1..-1] = {text_align: :right, shaping_engine: :harfbuzz,
+                          font_features: {tnum: true}}
   end
 
   composer.text("Please transfer the total amount via SEPA transfer to the bank " \

data/examples/034-text_shaping.rb

@@ -0,0 +1,37 @@
+# # Text Shaping
+#
+# The built-in text shaping functionality is very limited. However, it is
+# possible to switch to a HarfBuzz based implementation (using the
+# `harfbuzz-ruby` gem) that supports many languages and scripts as well as
+# OpenType features. Note that this only works with TrueType fonts!
+#
+# In general it is advised to use TrueType font files and enable HarfBuzz as the
+# result is more correct and visually better. The disadvantage is that the
+# additional processing requirements have a slight performance impact.
+#
+# By using the 'font_features' style property it is possible to selectively
+# enable/disable OpenType features like discretionary ligatures. Note that fonts
+# determine which features are on by default (like 'calt' for the Inter font
+# used in this example).
+#
+# Usage:
+# : `ruby text_shaping.rb`
+#
+
+require 'hexapdf'
+
+sample_text = <<EOT.tr("\n", " ")
+This sample shows some OpenType features, like contextual alternatives (2*3 and
+-->), discretionary ligatures (difficult?!), fractions (15/157) or compositions
+(5⃝ ×⃞ 3⃝ =⃞ 1⃝5⃝).
+EOT
+
+HexaPDF::Composer.create('text_shaping.pdf') do |composer|
+  composer.style(:base, font: 'Inter')
+  composer.style(:header, font_bold: true, margin: [10, 0, 0])
+  composer.text('Without HarfBuzz', style: :header)
+  composer.text(sample_text)
+  composer.text('With HarfBuzz', style: :header)
+  composer.text(sample_text, shaping_engine: :harfbuzz,
+                font_features: {dlig: true, frac: true})
+end

data/lib/hexapdf/cli/batch.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/command.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/debug_info.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/files.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/fonts.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -96,11 +96,13 @@ module HexaPDF
                        else
                          "Built-in"
                        end
-            size = human_readable_file_size(font.embedded? ? font.font_file[:Length] : 0)
+            size = human_readable_file_size(font.embedded? && font_type != 'Type 3' ?
+                                              font.font_file[:Length] : 0)
+            font_name = font[:BaseFont] || font[:FontDescriptor][:FontName]
             embedded = (font.embedded? ? "yes" : "no")
-            subset = (font[:BaseFont].match?(/\A[A-Z]{6}\+/) ? "yes" : "no")
+            subset = font_name.match?(/\A[A-Z]{6}\+/) ? "yes" : "no"
             printf("%5s %-40s %-12s %-10s %-3s %-3s %8s %9s\n",
-                   pindex, font[:BaseFont], font_type, encoding,
+                   pindex, font_name, font_type, encoding,
                    embedded, subset, size, "#{font.oid},#{font.gen}")
           end
         end

data/lib/hexapdf/cli/form.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/image2pdf.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/images.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -52,11 +52,10 @@ module HexaPDF
         # The mapping of XObject name to [x_ppi, y_ppi].
         attr_reader :result
 
-        # Initialize the processor with the names of the images for which the PPI should be
-        # determined.
-        def initialize(names, user_unit)
+        # Initialize the processor with the image XObjects for which the PPI should be determined.
+        def initialize(images, user_unit)
           super()
-          @names = names
+          @images = images
           @user_unit = user_unit
           @result = {}
         end
@@ -64,9 +63,8 @@ module HexaPDF
         # Determine the PPI in x- and y-directions of the specified images.
         def paint_xobject(name)
           super
-          return unless @names.delete(name)
           xobject = resources.xobject(name)
-          return unless xobject[:Subtype] == :Image
+          return unless @images.delete(xobject) && xobject[:Subtype] == :Image
 
           w, h = xobject.width, xobject.height
           llx, lly = graphics_state.ctm.evaluate(0, 0).map {|i| i * @user_unit }
@@ -75,8 +73,8 @@ module HexaPDF
 
           x_ppi = 72.0 * w / Math.sqrt((lrx - llx)**2 + (lry - lly)**2)
           y_ppi = 72.0 * h / Math.sqrt((ulx - llx)**2 + (uly - lly)**2)
-          @result[name] = [x_ppi.round, y_ppi.round]
-          raise StopIteration if @names.empty?
+          @result[xobject] = [x_ppi.round, y_ppi.round]
+          raise StopIteration if @images.empty?
         end
 
       end
@@ -182,17 +180,19 @@ module HexaPDF
         seen = {}
 
         doc.pages.each_with_index do |page, pindex|
-          image_names = []
-          xobjects = page.resources[:XObject]
-
-          xobjects&.each&.map do |name, xobject|
-            image_names << name if xobject[:Subtype] == :Image && !xobject[:ImageMask]
+          images = []
+          process_xobject_entry = lambda do |name, xobject|
+            if xobject[:Subtype] == :Image && !xobject[:ImageMask]
+              images << xobject
+            elsif xobject[:Subtype] == :Form
+              xobject.resources[:XObject]&.each(&process_xobject_entry)
+            end
           end
+          page.resources[:XObject]&.each(&process_xobject_entry)
 
-          processor = ImageLocationProcessor.new(image_names, page[:UserUnit] || 1)
+          processor = ImageLocationProcessor.new(images, page[:UserUnit] || 1)
           page.process_contents(processor)
-          processor.result.each do |name, ppi|
-            xobject = xobjects[name]
+          processor.result.each do |xobject, ppi|
             if seen[xobject]
               yield(xobject, seen[xobject], pindex + 1, ppi)
             else

data/lib/hexapdf/cli/info.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/inspect.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/merge.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -80,6 +80,14 @@ module HexaPDF
                    "false)") do |c|
           @interleave = c
         end
+        options.on("--acro-form MODE", [:merge, :ignore], "Handling of interactive forms (either " \
+                   "merge or ignore; default: merge)") do |mode|
+          @acro_form_mode = mode
+        end
+        options.on("--optional-content MODE", [:preserve, :ignore], "Handling of optional " \
+                   "content (either preserve or ignore; default: preserve)") do |mode|
+          @optional_content_mode = mode
+        end
 
         options.separator("")
         options.separator("Output related options")
@@ -89,6 +97,8 @@ module HexaPDF
         @files = []
         @initial_empty = false
         @interleave = false
+        @acro_form_mode = :merge
+        @optional_content_mode = :preserve
       end
 
       def execute #:nodoc:
@@ -179,7 +189,9 @@ module HexaPDF
           page.value.update(page.copy_inherited_values)
           page = page.deep_copy unless source_index == 0
         else
-          page = page_tree.document.import(page).deep_copy
+          page = page_tree.document.task(:import_pages, source: page.document, append: false,
+                                         pages: [page], ocgs: @optional_content_mode,
+                                         acro_form: @acro_form_mode)[0].deep_copy
         end
         if rotation == :none
           page.delete(:Rotate)

data/lib/hexapdf/cli/modify.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/optimize.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/split.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/usage.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli/watermark.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/cli.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/composer.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2025 Thomas Leitner
+# Copyright (C) 2014-2026 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as