hexapdf 0.46.0 → 1.6.0

data/lib/hexapdf/type/annotations/widget.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -48,6 +48,8 @@ module HexaPDF
       # See: PDF2.0 s12.5.6.19, HexaPDF::Type::Annotation
       class Widget < Annotation
 
+        include BorderStyling
+
         # The dictionary used by the /MK key of the widget annotation.
         class AppearanceCharacteristics < Dictionary
 
@@ -122,111 +124,21 @@ module HexaPDF
           end
         end
 
-        # Describes the border of an annotation.
-        #
-        # The +color+ property is either +nil+ if the border is transparent or else a device color
-        # object - see HexaPDF::Content::ColorSpace.
-        #
-        # The +style+ property can be one of the following:
-        #
-        # :solid::      Solid line.
-        # :beveled::    Embossed rectangle seemingly raised above the surface of the page.
-        # :inset::      Engraved rectangle receeding into the page.
-        # :underlined:: Underlined, i.e. only the bottom border is draw.
-        # Array:        Dash array describing how to dash the line.
-        BorderStyle = Struct.new(:width, :color, :style, :horizontal_corner_radius,
-                                 :vertical_corner_radius)
-
-        # :call-seq:
-        #   widget.border_style                                      => border_style
-        #   widget.border_style(color: 0, width: 1, style: :solid)   => widget
-        #
-        # Returns a BorderStyle instance representing the border style of the widget when no
-        # argument is given. Otherwise sets the border style of the widget and returns self.
-        #
-        # When setting a border style, arguments that are not provided will use the default: a
-        # border with a solid, black, 1pt wide line. This also means that multiple invocations will
-        # reset *all* prior values.
-        #
-        # +color+:: The color of the border. See
-        #           HexaPDF::Content::ColorSpace.device_color_from_specification for information on
-        #           the allowed arguments.
-        #
-        #           If the special value +:transparent+ is used when setting the color, a
-        #           transparent is used. A transparent border will return a +nil+ value when getting
-        #           the border color.
-        #
-        # +width+:: The width of the border. If set to 0, no border is shown.
-        #
-        # +style+:: Defines how the border is drawn. can be one of the following:
-        #
-        #           +:solid+::      Draws a solid border.
-        #           +:beveled+::    Draws a beveled border.
-        #           +:inset+::      Draws an inset border.
-        #           +:underlined+:: Draws only the bottom border.
-        #           Array::         An array specifying a line dash pattern (see
-        #                           HexaPDF::Content::LineDashPattern)
-        def border_style(color: nil, width: nil, style: nil)
-          if color || width || style
-            color = if color == :transparent
-                      []
-                    else
-                      Content::ColorSpace.device_color_from_specification(color || 0).components
-                    end
-            width ||= 1
-            style ||= :solid
-
-            (self[:MK] ||= {})[:BC] = color
-            bs = self[:BS] = {W: width}
-            case style
-            when :solid then bs[:S] = :S
-            when :beveled then bs[:S] = :B
-            when :inset then bs[:S] = :I
-            when :underlined then bs[:S] = :U
-            when Array
-              bs[:S] = :D
-              bs[:D] = style
-            else
-              raise ArgumentError, "Unknown value #{style} for style argument"
-            end
-            self
-          else
-            result = BorderStyle.new(1, nil, :solid, 0, 0)
-            if (ac = self[:MK]) && (bc = ac[:BC]) && !bc.empty?
-              result.color = Content::ColorSpace.prenormalized_device_color(bc.value)
-            end
-
-            if (bs = self[:BS])
-              result.width = bs[:W] if bs.key?(:W)
-              result.style = case bs[:S]
-                             when :S then :solid
-                             when :B then :beveled
-                             when :I then :inset
-                             when :U then :underlined
-                             when :D then bs[:D].value
-                             else :solid
-                             end
-            elsif key?(:Border)
-              border = self[:Border]
-              result.horizontal_corner_radius = border[0]
-              result.vertical_corner_radius = border[1]
-              result.width = border[2]
-              result.style = border[3] if border[3]
-            end
-
-            result
-          end
-        end
-
-        # Describes the marker style of a check box or radio button widget.
+        # Describes the marker style of a check box, radio button or push button widget.
         class MarkerStyle
 
-          # The kind of marker that is shown inside the widget. Can either be one of the symbols
-          # +:check+, +:circle+, +:cross+, +:diamond+, +:square+ or +:star+, or a one character
-          # string. The latter is interpreted using the ZapfDingbats font.
+          # The kind of marker that is shown inside the widget.
           #
-          # If an empty string is set, it is treated as if +nil+ was set, i.e. it shows the default
-          # marker for the field type.
+          # Radion buttons and check boxes::
+          #     Can either be one of the symbols +:check+, +:circle+, +:cross+, +:diamond+,
+          #     +:square+ or +:star+, or a one character string. The latter is interpreted using the
+          #     ZapfDingbats font.
+          #
+          #     If an empty string is set, it is treated as if +nil+ was set, i.e. it shows the
+          #     default marker for the field type.
+          #
+          # Push buttons:
+          #     The caption string.
           attr_reader :style
 
           # The size of the marker in PDF points that is shown inside the widget. The special value
@@ -237,41 +149,59 @@ module HexaPDF
           # HexaPDF::Content::ColorSpace.
           attr_reader :color
 
+          # The resource name of the font that should be used for the caption.
+          #
+          # This is only used for push button widgets.
+          attr_reader :font_name
+
           # Creates a new instance with the given values.
-          def initialize(style, size, color)
+          def initialize(style, size, color, font_name)
             @style = style
             @size = size
             @color = color
+            @font_name = font_name
           end
 
         end
 
         # :call-seq:
-        #   widget.marker_style                                     => marker_style
-        #   widget.marker_style(style: nil, size: nil, color: nil)   => widget
+        #   widget.marker_style                                                      => marker_style
+        #   widget.marker_style(style: nil, size: nil, color: nil, font_name: nil)   => widget
         #
         # Returns a MarkerStyle instance representing the marker style of the widget when no
         # argument is given. Otherwise sets the button marker style of the widget and returns self.
         #
-        # This method returns valid information only for check boxes and radio buttons!
+        # This method returns valid information only for check boxes, radio buttons and push buttons!
         #
-        # When setting a marker style, arguments that are not provided will use the default: a black
-        # auto-sized checkmark (i.e. :check for for check boxes) or circle (:circle for radio
-        # buttons). This also means that multiple invocations will reset *all* prior values.
+        # When setting a marker style, arguments that are not provided will use the default:
         #
-        # Note: The marker is called "normal caption" in the PDF 1.7 spec and the /CA entry of the
+        # * For check boxes a black auto-sized checkmark (i.e. :check)
+        # * For radio buttons a black auto-sized circle (i.e. :circle)
+        # * For push buttons a black 9pt empty text using Helvetica
+        #
+        # This also means that multiple invocations will reset *all* prior values.
+        #
+        # Note that the +font_name+ argument must be a valid HexaPDF font name (this is in contrast
+        # to MarkerStyle#font_name which returns the resource name of the font).
+        #
+        # Note: The marker is called "normal caption" in the PDF 2.0 spec and the /CA entry of the
         # associated appearance characteristics dictionary. The marker size and color are set using
         # the /DA key on the widget (although /DA is not defined for widget, this is how Acrobat
         # does it).
         #
         # See: PDF2.0 s12.5.6.19 and s12.7.4.3
-        def marker_style(style: nil, size: nil, color: nil)
+        def marker_style(style: nil, size: nil, color: nil, font_name: nil)
           field = form_field
-          if style || size || color
-            style ||= (field.check_box? ? :check : :cicrle)
-            size ||= 0
+          if style || size || color || font_name
+            style ||= case field.concrete_field_type
+                      when :check_box then :check
+                      when :radio_button then :circle
+                      when :push_button then ''
+                      end
+            size ||= (field.push_button? ? 9 : 0)
             color = Content::ColorSpace.device_color_from_specification(color || 0)
             serialized_color = Content::ColorSpace.serialize_device_color(color)
+            font_name ||= 'Helvetica'
 
             self[:MK] ||= {}
             self[:MK][:CA] = case style
@@ -285,7 +215,13 @@ module HexaPDF
                              else
                                raise ArgumentError, "Unknown value #{style} for argument 'style'"
                              end
-            self[:DA] = "/ZaDb #{size} Tf #{serialized_color}".strip
+            self[:DA] = if field.push_button?
+                          name = document.acro_form(create: true).default_resources.
+                            add_font(document.fonts.add(font_name).pdf_object)
+                          "/#{name} #{size} Tf #{serialized_color}".strip
+                        else
+                          "/ZaDb #{size} Tf #{serialized_color}".strip
+                        end
           else
             style = case self[:MK]&.[](:CA)
                     when '4' then :check
@@ -305,10 +241,12 @@ module HexaPDF
             size = 0
             color = HexaPDF::Content::ColorSpace.prenormalized_device_color([0])
             if (da = self[:DA] || field[:DA])
-              _, size, color = HexaPDF::Type::AcroForm::VariableTextField.parse_appearance_string(da)
+              font_name, da_size, da_color = AcroForm::VariableTextField.parse_appearance_string(da)
+              size = da_size || size
+              color = da_color || color
             end
 
-            MarkerStyle.new(style, size, color)
+            MarkerStyle.new(style, size, color, font_name)
           end
         end
 

data/lib/hexapdf/type/annotations.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -48,6 +48,18 @@ module HexaPDF
       autoload(:Text, 'hexapdf/type/annotations/text')
       autoload(:Link, 'hexapdf/type/annotations/link')
       autoload(:Widget, 'hexapdf/type/annotations/widget')
+      autoload(:BorderStyling, 'hexapdf/type/annotations/border_styling')
+      autoload(:Line, 'hexapdf/type/annotations/line')
+      autoload(:AppearanceGenerator, 'hexapdf/type/annotations/appearance_generator')
+      autoload(:BorderEffect, 'hexapdf/type/annotations/border_effect')
+      autoload(:InteriorColor, 'hexapdf/type/annotations/interior_color')
+      autoload(:SquareCircle, 'hexapdf/type/annotations/square_circle')
+      autoload(:Square, 'hexapdf/type/annotations/square')
+      autoload(:Circle, 'hexapdf/type/annotations/circle')
+      autoload(:LineEndingStyling, 'hexapdf/type/annotations/line_ending_styling')
+      autoload(:PolygonPolyline, 'hexapdf/type/annotations/polygon_polyline')
+      autoload(:Polygon, 'hexapdf/type/annotations/polygon')
+      autoload(:Polyline, 'hexapdf/type/annotations/polyline')
 
     end
 

data/lib/hexapdf/type/catalog.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -72,7 +72,7 @@ module HexaPDF
       define_field :URI,               type: Dictionary, version: '1.1'
       define_field :AcroForm,          type: :XXAcroForm, version: '1.2'
       define_field :Metadata,          type: :Metadata,  indirect: true, version: '1.4'
-      define_field :StructTreeRoot,    type: Dictionary, version: '1.3'
+      define_field :StructTreeRoot,    type: :StructTreeRoot, version: '1.3'
       define_field :MarkInfo,          type: :XXMarkInformation, version: '1.4'
       define_field :Lang,              type: String,     version: '1.4'
       define_field :SpiderInfo,        type: Dictionary, version: '1.3'
@@ -84,6 +84,9 @@ module HexaPDF
       define_field :Requirements,      type: PDFArray,   version: '1.7'
       define_field :Collection,        type: Dictionary, version: '1.7'
       define_field :NeedsRendering,    type: Boolean,    version: '1.7'
+      define_field :DSS,               type: Dictionary, version: '2.0'
+      define_field :AF,                type: PDFArray,   version: '2.0'
+      define_field :DPartRoot,         type: Dictionary, version: '2.0'
 
       # Returns +true+ since catalog objects must always be indirect.
       def must_be_indirect?

data/lib/hexapdf/type/cid_font.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -61,13 +61,16 @@ module HexaPDF
 
       DEFAULT_WIDTH = 1000 # :nodoc:
 
+      define_field :Subtype,         type: Symbol, required: true,
+                   allowed_values: [:CIDFontType0, :CIDFontType2]
       define_field :BaseFont,        type: Symbol, required: true
       define_field :CIDSystemInfo,   type: :XXCIDSystemInfo, required: true
-      define_field :FontDescriptor,  type: :FontDescriptor, indirect: true, required: true
-      define_field :DW,              type: Integer, default: DEFAULT_WIDTH
+      define_field :FontDescriptor,  type: :FontDescriptor, required: true
+      define_field :DW,              type: Numeric, default: DEFAULT_WIDTH
       define_field :W,               type: PDFArray
       define_field :DW2,             type: PDFArray, default: [880, -1100]
       define_field :W2,              type: PDFArray
+      define_field :CIDToGIDMap,     type: [Stream, Symbol]
 
       # Returns the unscaled width of the given CID in glyph units, or 0 if the width for the CID is
       # missing.

data/lib/hexapdf/type/cmap.rb

@@ -0,0 +1,58 @@
+# -*- encoding: utf-8; frozen_string_literal: true -*-
+#
+#--
+# This file is part of HexaPDF.
+#
+# HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
+# Copyright (C) 2014-2025 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
+# published by the Free Software Foundation with the addition of the
+# following permission added to Section 15 as permitted in Section 7(a):
+# FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+# THOMAS LEITNER, THOMAS LEITNER DISCLAIMS THE WARRANTY OF NON
+# INFRINGEMENT OF THIRD PARTY RIGHTS.
+#
+# HexaPDF is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with HexaPDF. If not, see <http://www.gnu.org/licenses/>.
+#
+# The interactive user interfaces in modified source and object code
+# versions of HexaPDF must display Appropriate Legal Notices, as required
+# under Section 5 of the GNU Affero General Public License version 3.
+#
+# In accordance with Section 7(b) of the GNU Affero General Public
+# License, a covered work must retain the producer line in every PDF that
+# is created or manipulated using HexaPDF.
+#
+# If the GNU Affero General Public License doesn't fit your need,
+# commercial licenses are available at <https://gettalong.at/hexapdf/>.
+#++
+
+require 'hexapdf/stream'
+
+module HexaPDF
+  module Type
+
+    # Represents an embedded CMap file.
+    #
+    # See: PDF2.0 s9.7.5.3
+    class CMap < Stream
+
+      define_type :CMap
+
+      define_field :Type, type: Symbol, required: true, default: type
+      define_field :CMapName, type: Symbol, required: true
+      define_field :CIDSystemInfo, type: :XXCIDSystemInfo, required: true
+      define_field :WMode, type: Integer
+      define_field :UseCMap, type: [Stream, Symbol]
+
+    end
+
+  end
+end

data/lib/hexapdf/type/embedded_file.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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/type/file_specification.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -78,19 +78,22 @@ module HexaPDF
 
       define_type :Filespec
 
-      define_field :Type, type: Symbol, default: type, required: true
-      define_field :FS,   type: Symbol
-      define_field :F,    type: PDFByteString
-      define_field :UF,   type: String, version: '1.7'
-      define_field :DOS,  type: PDFByteString
-      define_field :Mac,  type: PDFByteString
-      define_field :Unix, type: PDFByteString
-      define_field :ID,   type: PDFArray
-      define_field :V,    type: Boolean, version: '1.2'
-      define_field :EF,   type: :XXFilespecEFDictionary, version: '1.7'
-      define_field :RF,   type: Dictionary, version: '1.3'
-      define_field :Desc, type: String, version: '1.6'
-      define_field :CI,   type: Dictionary, version: '1.7'
+      define_field :Type,  type: Symbol, default: type, required: true
+      define_field :FS,    type: Symbol
+      define_field :F,     type: PDFByteString
+      define_field :UF,    type: String, version: '1.7'
+      define_field :DOS,   type: PDFByteString
+      define_field :Mac,   type: PDFByteString
+      define_field :Unix,  type: PDFByteString
+      define_field :ID,    type: PDFArray
+      define_field :V,     type: Boolean, version: '1.2'
+      define_field :EF,    type: :XXFilespecEFDictionary, version: '1.7'
+      define_field :RF,    type: Dictionary, version: '1.3'
+      define_field :Desc,  type: String, version: '1.6'
+      define_field :CI,    type: Dictionary, version: '1.7'
+      define_field :Thumb, type: Stream, version: '2.0'
+      define_field :EP,    type: Dictionary, version: '2.0'
+      define_field :AF,    type: Symbol, version: '2.0', default: :Unspecified
 
       # Returns +true+ if this file specification references an URL and not a file.
       def url?
@@ -114,7 +117,7 @@ module HexaPDF
 
       # Sets the file specification string to the given filename.
       #
-      # Since the /Unix, /Mac and /DOS fields are obsolescent, only the /F and /UF fields are set.
+      # Since the /Unix, /Mac and /DOS fields are deprecated, only the /F and /UF fields are set.
       def path=(filename)
         self[:UF] = filename
         self[:F] = filename.b

data/lib/hexapdf/type/font.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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/type/font_descriptor.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -57,7 +57,7 @@ module HexaPDF
       define_field :FontStretch,  type: Symbol, version: '1.5',
         allowed_values: [:UltraCondensed, :ExtraCondensed, :Condensed, :SemiCondensed,
                          :Normal, :SemiExpanded, :Expanded, :ExtraExpanded, :UltraExpanded]
-      define_field :FontWeight,   type: Numeric, version: '1.5'
+      define_field :FontWeight,   type: Integer, version: '1.5' # also see validation
       define_field :Flags,        type: Integer, required: true
       define_field :FontBBox,     type: Rectangle
       define_field :ItalicAngle,  type: Numeric, required: true
@@ -76,6 +76,7 @@ module HexaPDF
       define_field :FontFile3,    type: Stream, version: '1.2'
       define_field :CharSet,      type: [PDFByteString, String], version: '1.1'
 
+      # From PDF2.0 s9.8.3.1
       define_field :Style,        type: Dictionary
       define_field :Lang,         type: Symbol, version: '1.5'
       define_field :FD,           type: Dictionary
@@ -98,13 +99,13 @@ module HexaPDF
 
         font_weight = self[:FontWeight]
         if font_weight && !ALLOWED_FONT_WEIGHTS.include?(font_weight)
-          yield("Field FontWeight does not contain an allowed value", true)
+          yield("Field FontWeight contains the disallowed value #{font_weight}", true)
           delete(:FontWeight)
         end
 
         descent = self[:Descent]
         if descent && descent > 0
-          yield("The /Descent value needs to be a negative number", true)
+          yield("The /Descent value needs to be zero or negative", true)
           self[:Descent] = -descent
         end
       end

data/lib/hexapdf/type/font_simple.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -47,10 +47,12 @@ module HexaPDF
     # See: PDF2.0 s9.6
     class FontSimple < Font
 
+      # Only the common fields are defined here, the rest in FontType1, FontType3, FontTrueType
+      define_field :Name, type: Symbol
       define_field :FirstChar, type: Integer
       define_field :LastChar, type: Integer
       define_field :Widths, type: PDFArray
-      define_field :FontDescriptor, type: :FontDescriptor, indirect: true
+      define_field :FontDescriptor, type: :FontDescriptor
       define_field :Encoding, type: [Dictionary, Symbol]
 
       # Returns the font descriptor. May be +nil+ for a standard 14 font.

data/lib/hexapdf/type/font_true_type.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -41,6 +41,8 @@ module HexaPDF
   module Type
 
     # Represents a TrueType font.
+    #
+    # See: PDF2.0 s9.6.3
     class FontTrueType < FontSimple
 
       define_field :Subtype, type: Symbol, required: true, default: :TrueType

data/lib/hexapdf/type/font_type0.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -48,7 +48,7 @@ module HexaPDF
     # Composite fonts also allow for vertical writing mode and support TrueType as well as OpenType
     # fonts.
     #
-    # See: PDF2.0 s9.7
+    # See: PDF2.0 s9.7, s9.7.6.1
     class FontType0 < Font
 
       define_field :Subtype, type: Symbol, required: true, default: :Type0

data/lib/hexapdf/type/font_type1.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -170,6 +170,8 @@ module HexaPDF
         end
       end
 
+      PREDEFINED_ENCODING = [:MacRomanEncoding, :MacExpertEncoding, :WinAnsiEncoding] #:nodoc:
+
       # Validates the Type1 font dictionary.
       def perform_validation
         std_font = StandardFonts.standard_font?(self[:BaseFont])
@@ -178,6 +180,22 @@ module HexaPDF
         if !std_font && self[:FontDescriptor].nil?
           yield("Required field FontDescriptor is not set", false)
         end
+
+        encoding = self[:Encoding]
+        if encoding.kind_of?(Symbol) && !PREDEFINED_ENCODING.include?(encoding)
+          correctable = (self[:BaseFont] == :Symbol && encoding == :SymbolEncoding) ||
+                        (!symbolic? && encoding == :StandardEncoding)
+          yield("The /Encoding value '#{encoding}' is invalid", correctable)
+          if correctable
+            if encoding == :SymbolEncoding
+              delete(:Encoding)
+            else
+              diffs = HexaPDF::Font::Encoding.for_name(:StandardEncoding).
+                to_compact_array(base_encoding: HexaPDF::Font::Encoding.for_name(:WinAnsiEncoding))
+              self[:Encoding] = {BaseEncoding: :WinAnsiEncoding, Differences: diffs}
+            end
+          end
+        end
       end
 
     end

data/lib/hexapdf/type/font_type3.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2024 Thomas Leitner
+# Copyright (C) 2014-2025 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
@@ -49,7 +49,6 @@ module HexaPDF
     class FontType3 < FontSimple
 
       define_field :Subtype,    type: Symbol, required: true, default: :Type3
-      define_field :Name,       type: Symbol
       define_field :FontBBox,   type: Rectangle, required: true
       define_field :FontMatrix, type: PDFArray, required: true
       define_field :CharProcs,  type: Dictionary, required: true