hexapdf 0.32.2 → 0.33.0

data/lib/hexapdf/layout/text_box.rb

@@ -74,13 +74,14 @@ module HexaPDF
 
         @width = @height = 0
         @result = if style.position == :flow
-                    @tl.fit(@items, frame.width_specification, frame.shape.bbox.height)
+                    @tl.fit(@items, frame.width_specification, frame.shape.bbox.height,
+                            apply_first_text_indent: !split_box?)
                   else
                     @width = reserved_width
                     @height = reserved_height
                     width = (@initial_width > 0 ? @initial_width : available_width) - @width
                     height = (@initial_height > 0 ? @initial_height : available_height) - @height
-                    @tl.fit(@items, width, height)
+                    @tl.fit(@items, width, height, apply_first_text_indent: !split_box?)
                   end
         @width += if @initial_width > 0 || style.align == :center || style.align == :right
                     width
@@ -103,7 +104,8 @@ module HexaPDF
       def split(available_width, available_height, frame)
         fit(available_width, available_height, frame) unless @result
 
-        if style.position != :flow && (@width > available_width || @height > available_height)
+        if style.position != :flow && (float_compare(@width, available_width) > 0 ||
+                                       float_compare(@height, available_height) > 0)
           [nil, self]
         elsif @result.remaining_items.empty?
           [self]

data/lib/hexapdf/layout/text_fragment.rb

@@ -259,7 +259,7 @@ module HexaPDF
       # The width of the text fragment.
       #
       # It is the sum of the widths of its items and is calculated by using the algorithm presented
-      # in PDF1.7 s9.4.4. By using kerning values as the first and/or last items, the text contained
+      # in PDF2.0 s9.4.4. By using kerning values as the first and/or last items, the text contained
       # in the fragment may spill over the left and/or right boundary.
       def width
         @width ||= @items.sum {|item| style.scaled_item_width(item) }

data/lib/hexapdf/layout/text_layouter.rb

@@ -51,7 +51,8 @@ module HexaPDF
     # * Existing line breaking characters inside of TextFragment objects are respected when fitting
     #   text. If this is not wanted, they have to be removed beforehand.
     #
-    # * The first line may be indented by setting Style#text_indent which may also be negative.
+    # * The first line of each paragraph may be indented by setting Style#text_indent which may also
+    #   be negative.
     #
     # * Text can be fitted into arbitrarily shaped areas, even containing holes.
     #
@@ -658,7 +659,7 @@ module HexaPDF
       end
 
       # :call-seq:
-      #   text_layouter.fit(items, width, height) -> result
+      #   text_layouter.fit(items, width, height, apply_first_text_indent: true) -> result
       #
       # Fits the items into the given area and returns a Result object with all the information.
       #
@@ -693,7 +694,14 @@ module HexaPDF
       # The text segmentation algorithm specified via #style is applied to the items in case they
       # are not already in segmented form. This also means that Result#remaining_items always
       # contains segmented items.
-      def fit(items, width, height)
+      #
+      # Optional arguments:
+      #
+      # +apply_first_text_indent+::
+      #     Specifies whether style.text_indent should be applied to the first line. This should be
+      #     set to +false+ if the items start with a continuation of a paragraph instead of starting
+      #     a new paragraph (e.g. after a page break).
+      def fit(items, width, height, apply_first_text_indent: true)
         unless items.empty? || items[0].respond_to?(:type)
           items = style.text_segmentation_algorithm.call(items)
         end
@@ -704,7 +712,7 @@ module HexaPDF
         rest = items
 
         # processing state variables
-        indent = style.text_indent
+        indent = apply_first_text_indent ? style.text_indent : 0
         line_fragments = []
         line_height = 0
         previous_line = nil

data/lib/hexapdf/layout.rb

@@ -57,6 +57,7 @@ module HexaPDF
     autoload(:ColumnBox, 'hexapdf/layout/column_box')
     autoload(:ListBox, 'hexapdf/layout/list_box')
     autoload(:PageStyle, 'hexapdf/layout/page_style')
+    autoload(:TableBox, 'hexapdf/layout/table_box')
 
   end
 

data/lib/hexapdf/name_tree_node.rb

@@ -55,7 +55,7 @@ module HexaPDF
   # HexaPDF::Utils::SortedTreeNode) to add or retrieve entries. They ensure that the name tree stays
   # valid.
   #
-  # See: PDF1.7 s7.9.6
+  # See: PDF2.0 s7.9.6
   class NameTreeNode < Dictionary
 
     include Utils::SortedTreeNode

data/lib/hexapdf/number_tree_node.rb

@@ -44,7 +44,7 @@ module HexaPDF
   # Number trees are similar to name trees but use integers as keys instead of strings. See
   # HexaPDF::NameTreeNode for a more detailed explanation.
   #
-  # See: PDF1.7 s7.9.7, HexaPDF::NameTreeNode
+  # See: PDF2.0 s7.9.7, HexaPDF::NameTreeNode
   class NumberTreeNode < Dictionary
 
     include Utils::SortedTreeNode

data/lib/hexapdf/object.rb

@@ -117,7 +117,7 @@ module HexaPDF
   #
   # See: HexaPDF::Dictionary, HexaPDF::Stream, HexaPDF::Reference, HexaPDF::Document
   #
-  # See: PDF1.7 s7.3.10, s7.3.8
+  # See: PDF2.0 s7.3.10, s7.3.8
   class Object
 
     include Comparable
@@ -143,18 +143,27 @@ module HexaPDF
 
     # Makes sure that the object itself as well as all nested values are direct objects.
     #
+    # The +document+ argument needs to contain the Document instance to which +object+ belongs so
+    # that references can be correctly resolved.
+    #
     # If an indirect object is found, it is turned into a direct object and the indirect object is
     # deleted from the document.
-    def self.make_direct(object)
+    def self.make_direct(object, document)
       if object.kind_of?(HexaPDF::Object) && object.indirect?
+        raise HexaPDF::Error, "Can't make a stream object a direct object" if object.data.stream
         object_to_delete = object
         object = object.value
         object_to_delete.document.delete(object_to_delete)
       end
-      if object.kind_of?(Hash)
-        object.transform_values! {|val| make_direct(val) }
-      elsif object.kind_of?(Array)
-        object.map! {|val| make_direct(val) }
+      case object
+      when HexaPDF::Object
+        object.data.value = make_direct(object.data.value, document)
+      when Hash
+        object.transform_values! {|val| make_direct(val, document) }
+      when Array
+        object.map! {|val| make_direct(val, document) }
+      when Reference
+        object = make_direct(document.object(object), document)
       end
       object
     end
@@ -255,7 +264,7 @@ module HexaPDF
     # type.
     #
     # However, the Type and Subtype fields can easily be used for this. Subclasses for PDF objects
-    # that don't have such fields may use a unique name that has to begin with XX (see PDF1.7 sE.2)
+    # that don't have such fields may use a unique name that has to begin with XX (see PDF2.0 sE.2)
     # and therefore doesn't clash with names defined by the PDF specification.
     #
     # For basic objects this always returns +:Unknown+.
@@ -297,6 +306,8 @@ module HexaPDF
     end
 
     # Makes a deep copy of the source PDF object and resets the object identifier.
+    #
+    # Note that indirect references are *not* copied! If that is also needed, use Importer::copy.
     def deep_copy
       obj = dup
       obj.instance_variable_set(:@data, @data.dup)

data/lib/hexapdf/parser.rb

@@ -41,11 +41,11 @@ require 'hexapdf/xref_section'
 
 module HexaPDF
 
-  # Parses an IO stream according to PDF1.7 to get at the contained objects.
+  # Parses an IO stream according to PDF2.0 to get at the contained objects.
   #
   # This class also contains higher-level methods for getting indirect objects and revisions.
   #
-  # See: PDF1.7 s7
+  # See: PDF2.0 s7
   class Parser
 
     # The IO stream which is parsed.
@@ -125,7 +125,7 @@ module HexaPDF
     #
     # Returns an array containing [object, oid, gen, stream].
     #
-    # See: PDF1.7 s7.3.10, s7.3.8
+    # See: PDF2.0 s7.3.10, s7.3.8
     def parse_indirect_object(offset = nil)
       @tokenizer.pos = offset + @header_offset if offset
       oid = @tokenizer.next_token
@@ -267,7 +267,7 @@ module HexaPDF
     #
     # This method can only parse cross-reference sections, not cross-reference streams!
     #
-    # See: PDF1.7 s7.5.4, s7.5.5; ADB1.7 sH.3-3.4.3
+    # See: PDF2.0 s7.5.4, s7.5.5; ADB1.7 sH.3-3.4.3
     def parse_xref_section_and_trailer(offset)
       @tokenizer.pos = offset + @header_offset
       token = @tokenizer.next_token
@@ -346,7 +346,7 @@ module HexaPDF
     #
     # If strict parsing is disabled, the whole file is searched for the offset.
     #
-    # See: PDF1.7 s7.5.5, ADB1.7 sH.3-3.4.4
+    # See: PDF2.0 s7.5.5, ADB1.7 sH.3-3.4.4
     def startxref_offset
       return @startxref_offset if defined?(@startxref_offset)
 
@@ -397,7 +397,7 @@ module HexaPDF
 
     # Returns the PDF version number that is stored in the file header.
     #
-    # See: PDF1.7 s7.5.2
+    # See: PDF2.0 s7.5.2
     def file_header_version
       unless @header_version
         raise_malformed("PDF file header is missing or corrupt", pos: 0)
@@ -413,7 +413,7 @@ module HexaPDF
     # restriction so that the header may appear in the first 1024 bytes. We follow the Adobe
     # convention.
     #
-    # See: PDF1.7 s7.5.2, ADB1.7 sH.3-3.4.1
+    # See: PDF2.0 s7.5.2, ADB1.7 sH.3-3.4.1
     def retrieve_pdf_header_offset_and_version
       @io.seek(0)
       @header_offset = (@io.read(1024) || '').index(/%PDF-(\d\.\d)/) || 0

data/lib/hexapdf/pdf_array.rb

@@ -44,7 +44,7 @@ module HexaPDF
   # #[] method. Therefore not all Array methods are implemented - use the #value directly if other
   # methods are needed.
   #
-  # See: PDF1.7 s7.3.6
+  # See: PDF2.0 s7.3.6
   class PDFArray < HexaPDF::Object
 
     include Enumerable

data/lib/hexapdf/rectangle.rb

@@ -51,7 +51,7 @@ module HexaPDF
   # where +left+ is the bottom left x-coordinate, +bottom+ is the bottom left y-coordinate, +right+
   # is the top right x-coordinate and +top+ is the top right y-coordinate.
   #
-  # See: PDF1.7 s7.9.5
+  # See: PDF2.0 s7.9.5
   class Rectangle < HexaPDF::PDFArray
 
     # Returns the x-coordinate of the bottom-left corner.

data/lib/hexapdf/reference.rb

@@ -50,7 +50,7 @@ module HexaPDF
   # keys. Furthermore the implementation is compatible to the one of Object, i.e. the hash of a
   # Reference object is the same as the hash of an indirect Object.
   #
-  # See: PDF1.7 s7.3.10, Object
+  # See: PDF2.0 s7.3.10, Object
   class Reference
 
     include Comparable

data/lib/hexapdf/revision.rb

@@ -48,7 +48,7 @@ module HexaPDF
   # If a revision doesn't have an associated cross-reference section, it wasn't created from a PDF
   # file.
   #
-  # See: PDF1.7 s7.5.6, Revisions
+  # See: PDF2.0 s7.5.6, Revisions
   class Revision
 
     include Enumerable

data/lib/hexapdf/revisions.rb

@@ -55,7 +55,7 @@ module HexaPDF
   # this should only be done if one is familiar with the inner workings of HexaPDF. Otherwise it is
   # best to use the convenience methods of this class to create, access or delete indirect objects.
   #
-  # See: PDF1.7 s7.5.6, HexaPDF::Revision
+  # See: PDF2.0 s7.5.6, HexaPDF::Revision
   class Revisions
 
     class << self
@@ -76,7 +76,7 @@ module HexaPDF
           seen_xref_offsets = {}
 
           while offset && !seen_xref_offsets.key?(offset)
-            # PDF1.7 s7.5.5 states that :Prev needs to be indirect, Adobe's reference 3.4.4 says it
+            # PDF2.0 s7.5.5 states that :Prev needs to be indirect, Adobe's reference 3.4.4 says it
             # should be direct. Adobe's POV is followed here. Same with :XRefStm.
             xref_section, trailer = parser.load_revision(offset)
             seen_xref_offsets[offset] = true
@@ -167,7 +167,7 @@ module HexaPDF
     # For references to unknown objects, +nil+ is returned but free objects are represented by a
     # PDF Null object, not by +nil+!
     #
-    # See: PDF1.7 s7.3.9
+    # See: PDF2.0 s7.3.9
     def object(ref)
       i = @revisions.size - 1
       while i >= 0

data/lib/hexapdf/serializer.rb

@@ -79,7 +79,7 @@ module HexaPDF
   #
   # If no serialization method for a specific class is found, the ancestors classes are tried.
   #
-  # See: PDF1.7 s7.3
+  # See: PDF2.0 s7.3
   class Serializer
 
     # The encrypter to use for encrypting strings and streams. If +nil+, strings and streams are not
@@ -163,21 +163,21 @@ module HexaPDF
 
     # Serializes the +nil+ value.
     #
-    # See: PDF1.7 s7.3.9
+    # See: PDF2.0 s7.3.9
     def serialize_nilclass(_obj)
       "null"
     end
 
     # Serializes the +true+ value.
     #
-    # See: PDF1.7 s7.3.2
+    # See: PDF2.0 s7.3.2
     def serialize_trueclass(_obj)
       "true"
     end
 
     # Serializes the +false+ value.
     #
-    # See: PDF1.7 s7.3.2
+    # See: PDF2.0 s7.3.2
     def serialize_falseclass(_obj)
       "false"
     end
@@ -187,21 +187,21 @@ module HexaPDF
     # This method should be used for cases where it is known that the object is either an Integer
     # or a Float.
     #
-    # See: PDF1.7 s7.3.3
+    # See: PDF2.0 s7.3.3
     def serialize_numeric(obj)
       obj.kind_of?(Integer) ? obj.to_s : serialize_float(obj)
     end
 
     # Serializes an Integer object.
     #
-    # See: PDF1.7 s7.3.3
+    # See: PDF2.0 s7.3.3
     def serialize_integer(obj)
       obj.to_s
     end
 
     # Serializes a Float object.
     #
-    # See: PDF1.7 s7.3.3
+    # See: PDF2.0 s7.3.3
     def serialize_float(obj)
       if -0.0001 < obj && obj < 0.0001 && obj != 0
         sprintf("%.6f", obj)
@@ -215,7 +215,7 @@ module HexaPDF
     # The regexp matches all characters that need to be escaped and the substs hash contains the
     # mapping from these characters to their escaped form.
     #
-    # See PDF1.7 s7.3.5
+    # See PDF2.0 s7.3.5
     NAME_SUBSTS = {} # :nodoc:
     [0..32, 127..255, Tokenizer::DELIMITER.bytes, Tokenizer::WHITESPACE.bytes, [35]].each do |a|
       a.each {|c| NAME_SUBSTS[c.chr] = "##{c.to_s(16).rjust(2, '0')}" }
@@ -225,7 +225,7 @@ module HexaPDF
 
     # Serializes a Symbol object (i.e. a PDF name object).
     #
-    # See: PDF1.7 s7.3.5
+    # See: PDF2.0 s7.3.5
     def serialize_symbol(obj)
       NAME_CACHE[obj] ||=
         begin
@@ -240,7 +240,7 @@ module HexaPDF
 
     # Serializes an Array object.
     #
-    # See: PDF1.7 s7.3.6
+    # See: PDF2.0 s7.3.6
     def serialize_array(obj)
       str = +"["
       index = 0
@@ -256,7 +256,7 @@ module HexaPDF
 
     # Serializes a Hash object (i.e. a PDF dictionary object).
     #
-    # See: PDF1.7 s7.3.7
+    # See: PDF2.0 s7.3.7
     def serialize_hash(obj)
       str = +"<<"
       obj.each do |k, v|
@@ -274,7 +274,7 @@ module HexaPDF
 
     # Serializes a String object.
     #
-    # See: PDF1.7 s7.3.4
+    # See: PDF2.0 s7.3.4
     def serialize_string(obj)
       obj = if @encrypter && @object.kind_of?(HexaPDF::Object) && @object.indirect?
               encrypter.encrypt_string(obj, @object)
@@ -294,7 +294,7 @@ module HexaPDF
     # The ISO PDF specification differs in respect to the supported date format. When converting
     # to a date string, a format suitable for both is output.
     #
-    # See: PDF1.7 s7.9.4, ADB1.7 3.8.3
+    # See: PDF2.0 s7.9.4, ADB1.7 3.8.3
     def serialize_time(obj)
       zone = obj.strftime("%z'")
       if zone == "+0000'"
@@ -330,14 +330,14 @@ module HexaPDF
       end
     end
 
-    # See: PDF1.7 s7.3.10
+    # See: PDF2.0 s7.3.10
     def serialize_hexapdf_reference(obj)
       "#{obj.oid} #{obj.gen} R"
     end
 
     # Serializes the streams dictionary and its stream.
     #
-    # See: PDF1.7 s7.3.8
+    # See: PDF2.0 s7.3.8
     def serialize_hexapdf_stream(obj)
       if !obj.indirect?
         raise HexaPDF::Error, "Can't serialize PDF stream without object identifier"

data/lib/hexapdf/stream.rb

@@ -88,7 +88,9 @@ module HexaPDF
 
     # Returns a Fiber for getting at the data of the stream represented by this object.
     def fiber(chunk_size = 0)
-      if @source.kind_of?(Proc)
+      if @source.kind_of?(FiberDoubleForString)
+        @source.dup
+      elsif @source.kind_of?(Proc)
         FiberWithLength.new(@length, &@source)
       elsif @source.kind_of?(String)
         HexaPDF::Filter.source_from_file(@source, pos: @offset || 0, length: @length || -1,
@@ -134,7 +136,7 @@ module HexaPDF
   #
   # Note that support for external streams (/F, /FFilter, /FDecodeParms) is not yet implemented!
   #
-  # See: PDF1.7 s7.3.8, Dictionary
+  # See: PDF2.0 s7.3.8, Dictionary
   class Stream < Dictionary
 
     define_field :Length,       type: Integer # not required, will be auto-filled when writing

data/lib/hexapdf/tokenizer.rb

@@ -42,7 +42,7 @@ module HexaPDF
 
   # Tokenizes the content of an IO object following the PDF rules.
   #
-  # See: PDF1.7 s7.2
+  # See: PDF2.0 s7.2
   class Tokenizer
 
     # Represents a keyword in a PDF file.
@@ -61,12 +61,12 @@ module HexaPDF
 
     # Characters defined as whitespace.
     #
-    # See: PDF1.7 s7.2.2
+    # See: PDF2.0 s7.2.2
     WHITESPACE = " \n\r\0\t\f"
 
     # Characters defined as delimiters.
     #
-    # See: PDF1.7 s7.2.2
+    # See: PDF2.0 s7.2.2
     DELIMITER = "()<>{}/[]%"
 
     WHITESPACE_MULTI_RE = /[#{WHITESPACE}]+/ # :nodoc:
@@ -171,7 +171,7 @@ module HexaPDF
     # If the +allow_end_array_token+ argument is +true+, the ']' token is permitted to facilitate
     # the use of this method during array parsing.
     #
-    # See: PDF1.7 s7.3
+    # See: PDF2.0 s7.3
     def next_object(allow_end_array_token: false, allow_keyword: false)
       token = next_token
 
@@ -231,7 +231,7 @@ module HexaPDF
     # If a problem is detected, yields to caller where the argument +recoverable+ is truthy if the
     # problem is recoverable.
     #
-    # See: PDF1.7 7.5.4
+    # See: PDF2.0 7.5.4
     def next_xref_entry #:yield: recoverable
       prepare_string_scanner(20)
       if !@ss.skip(/(\d{10}) (\d{5}) ([nf])(?: \r| \n|\r\n|(\r\r|\r|\n))/) || @ss[4]
@@ -242,7 +242,7 @@ module HexaPDF
 
     # Skips all whitespace at the current position.
     #
-    # See: PDF1.7 s7.2.2
+    # See: PDF2.0 s7.2.2
     def skip_whitespace
       prepare_string_scanner
       prepare_string_scanner while @ss.skip(WHITESPACE_MULTI_RE)
@@ -268,7 +268,7 @@ module HexaPDF
 
     # Parses the keyword at the current position.
     #
-    # See: PDF1.7 s7.2
+    # See: PDF2.0 s7.2
     def parse_keyword
       str = scan_until(WHITESPACE_OR_DELIMITER_RE) || @ss.scan(/.*/)
       TOKEN_CACHE[str]
@@ -278,12 +278,12 @@ module HexaPDF
 
     # Parses the number (integer or real) at the current position.
     #
-    # See: PDF1.7 s7.3.3
+    # See: PDF2.0 s7.3.3
     def parse_number
       val = scan_until(WHITESPACE_OR_DELIMITER_RE) || @ss.scan(/.*/)
       if val.match?(/\A[+-]?\d++(?!\.)\z/)
         tmp = val.to_i
-        # Handle object references, see PDF1.7 s7.3.10
+        # Handle object references, see PDF2.0 s7.3.10
         prepare_string_scanner(10)
         if @ss.scan(REFERENCE_RE)
           tmp = if tmp > 0
@@ -315,7 +315,7 @@ module HexaPDF
 
     # Parses the literal string at the current position.
     #
-    # See: PDF1.7 s7.3.4.2
+    # See: PDF2.0 s7.3.4.2
     def parse_literal_string
       @ss.pos += 1
       str = "".b
@@ -358,7 +358,7 @@ module HexaPDF
 
     # Parses the hex string at the current position.
     #
-    # See: PDF1.7 s7.3.4.3
+    # See: PDF2.0 s7.3.4.3
     def parse_hex_string
       @ss.pos += 1
       data = scan_until(/(?=>)/)
@@ -373,7 +373,7 @@ module HexaPDF
 
     # Parses the name at the current position.
     #
-    # See: PDF1.7 s7.3.5
+    # See: PDF2.0 s7.3.5
     def parse_name
       @ss.pos += 1
       str = scan_until(WHITESPACE_OR_DELIMITER_RE) || @ss.scan(/.*/)
@@ -389,7 +389,7 @@ module HexaPDF
     #
     # It is assumed that the initial '[' has already been scanned.
     #
-    # See: PDF1.7 s7.3.6
+    # See: PDF2.0 s7.3.6
     def parse_array
       result = []
       while true
@@ -408,7 +408,7 @@ module HexaPDF
     #
     # It is assumed that the initial '<<' has already been scanned.
     #
-    # See: PDF1.7 s7.3.7
+    # See: PDF2.0 s7.3.7
     def parse_dictionary
       result = {}
       while true

data/lib/hexapdf/type/acro_form/appearance_generator.rb

@@ -61,7 +61,7 @@ module HexaPDF
       # By subclassing and overriding the necessary methods it is possible to define custom
       # appearances.
       #
-      # See: PDF1.7 s12.5.5, s12.7
+      # See: PDF2.0 s12.5.5, s12.7
       class AppearanceGenerator
 
         # Creates a new instance for the given +widget+.
@@ -200,7 +200,7 @@ module HexaPDF
         def create_text_appearances
           default_resources = @document.acro_form.default_resources
           font, font_size, font_color = retrieve_font_information(default_resources)
-          style = HexaPDF::Layout::Style.new(font: font, fill_color: font_color)
+          style = HexaPDF::Layout::Style.new(font: font, font_size: font_size, fill_color: font_color)
           border_style = @widget.border_style
           padding = [1, border_style.width].max
 
@@ -226,8 +226,6 @@ module HexaPDF
 
           canvas = form.canvas
           apply_background_and_border(border_style, canvas)
-          style.font_size = calculate_font_size(font, font_size, height, border_style)
-          style.clear_cache
 
           canvas.marked_content_sequence(:Tx) do
             if @field.field_value || @field.concrete_field_type == :list_box
@@ -362,6 +360,7 @@ module HexaPDF
         def draw_single_line_text(canvas, width, height, style, padding)
           value, text_color = apply_javascript_formatting(@field.field_value)
           style.fill_color = text_color if text_color
+          calculate_and_apply_font_size(value, style, width, height, padding)
           fragment = HexaPDF::Layout::TextFragment.create(value, style)
 
           if @field.concrete_field_type == :comb_text_field
@@ -431,6 +430,11 @@ module HexaPDF
 
         # Draws the visible option items of the list box in the widget's rectangle.
         def draw_list_box(canvas, width, height, style, padding)
+          if style.font_size == 0
+            style.font_size = 12 # Seems to be Adobe's default
+            style.clear_cache
+          end
+
           option_items = @field.option_items
           top_index = @field.list_box_top_index
           items = [Layout::TextFragment.create(option_items[top_index..-1].join("\n"), style)]
@@ -475,24 +479,20 @@ module HexaPDF
           [font, font_size, font_color]
         end
 
-        # Calculates the font size for text fields based on the font and font size of the default
-        # appearance string, the annotation rectangle's height and the border style.
-        def calculate_font_size(font, font_size, height, border_style)
-          if font_size == 0
-            case @field.concrete_field_type
-            when :multiline_text_field
-              0 # Handled by multiline drawing code
-            when :list_box
-              12 # Seems to be Adobe's default
-            else
-              unit_font_size = (font.wrapped_font.bounding_box[3] - font.wrapped_font.bounding_box[1]) *
-                font.scaling_factor / 1000.0
-              # The constant factor was found empirically by checking what Adobe Reader etc. do
-              (height - 2 * border_style.width) / unit_font_size * 0.83
-            end
-          else
-            font_size
-          end
+        # Calculates the font size for single line text fields using auto-sizing, based on the font
+        # and font size of the default appearance string, the annotation rectangle's height and
+        # width and the given padding. The font size is then applied to the provided style object.
+        def calculate_and_apply_font_size(value, style, width, height, padding)
+          return if style.font_size != 0
+
+          font = style.font
+          unit_font_size = (font.wrapped_font.bounding_box[3] - font.wrapped_font.bounding_box[1]) *
+            font.scaling_factor / 1000.0
+          # The constant factor was found empirically by checking what Adobe Reader etc. do
+          style.font_size = (height - 2 * padding) / unit_font_size * 0.85
+          fragment = HexaPDF::Layout::TextFragment.create(value, style)
+          style.font_size = [style.font_size, style.font_size * (width - 4 * padding) / fragment.width].min
+          style.clear_cache
         end
 
         # Handles Javascript formatting routines for single-line text fields.

data/lib/hexapdf/type/acro_form/button_field.rb

@@ -81,7 +81,7 @@ module HexaPDF
       # :radios_in_unison:: A group of radio buttons with the same value for the on state will turn
       #                     on or off in unison.
       #
-      # See: PDF1.7 s12.7.4.2
+      # See: PDF2.0 s12.7.4.2
       class ButtonField < Field
 
         define_type :XXAcroFormField

data/lib/hexapdf/type/acro_form/choice_field.rb

@@ -66,7 +66,7 @@ module HexaPDF
       # :commit_on_sel_change:: If set, a new value should be commited as soon as a selection is
       #                         made.
       #
-      # See: PDF1.7 s12.7.4.4
+      # See: PDF2.0 s12.7.5.4
       class ChoiceField < VariableTextField
 
         define_type :XXAcroFormField