hexapdf 0.15.8 → 0.17.1

data/lib/hexapdf/content/color_space.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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,6 +96,170 @@ module HexaPDF
     # See: PDF1.7 s8.6
     module ColorSpace
 
+      # Mapping of CSS Color Module Level 3 names to RGB values.
+      #
+      # Visual listing of all colors:
+      #
+      #   #>pdf-big
+      #   canvas.font("Helvetica", size: 8)
+      #   map = HexaPDF::Content::ColorSpace::CSS_COLOR_NAMES
+      #   map.each_slice(38).each_with_index do |slice, col|
+      #     x = 10 + col * 100
+      #     slice.each_with_index do |(name, rgb), row|
+      #       canvas.fill_color(rgb).rectangle(x, 380 - row * 10, 10, 10).fill
+      #       canvas.fill_color("black").text(name, at: [x + 15, 380 - row * 10 + 2])
+      #     end
+      #   end
+      CSS_COLOR_NAMES = {
+        "aliceblue" => [240, 248, 255],
+        "antiquewhite" => [250, 235, 215],
+        "aqua" => [0, 255, 255],
+        "aquamarine" => [127, 255, 212],
+        "azure" => [240, 255, 255],
+        "beige" => [245, 245, 220],
+        "bisque" => [255, 228, 196],
+        "black" => [0, 0, 0],
+        "blanchedalmond" => [255, 235, 205],
+        "blue" => [0, 0, 255],
+        "blueviolet" => [138, 43, 226],
+        "brown" => [165, 42, 42],
+        "burlywood" => [222, 184, 135],
+        "cadetblue" => [95, 158, 160],
+        "chartreuse" => [127, 255, 0],
+        "chocolate" => [210, 105, 30],
+        "coral" => [255, 127, 80],
+        "cornflowerblue" => [100, 149, 237],
+        "cornsilk" => [255, 248, 220],
+        "crimson" => [220, 20, 60],
+        "cyan" => [0, 255, 255],
+        "darkblue" => [0, 0, 139],
+        "darkcyan" => [0, 139, 139],
+        "darkgoldenrod" => [184, 134, 11],
+        "darkgray" => [169, 169, 169],
+        "darkgreen" => [0, 100, 0],
+        "darkgrey" => [169, 169, 169],
+        "darkkhaki" => [189, 183, 107],
+        "darkmagenta" => [139, 0, 139],
+        "darkolivegreen" => [85, 107, 47],
+        "darkorange" => [255, 140, 0],
+        "darkorchid" => [153, 50, 204],
+        "darkred" => [139, 0, 0],
+        "darksalmon" => [233, 150, 122],
+        "darkseagreen" => [143, 188, 143],
+        "darkslateblue" => [72, 61, 139],
+        "darkslategray" => [47, 79, 79],
+        "darkslategrey" => [47, 79, 79],
+        "darkturquoise" => [0, 206, 209],
+        "darkviolet" => [148, 0, 211],
+        "deeppink" => [255, 20, 147],
+        "deepskyblue" => [0, 191, 255],
+        "dimgray" => [105, 105, 105],
+        "dimgrey" => [105, 105, 105],
+        "dodgerblue" => [30, 144, 255],
+        "firebrick" => [178, 34, 34],
+        "floralwhite" => [255, 250, 240],
+        "forestgreen" => [34, 139, 34],
+        "fuchsia" => [255, 0, 255],
+        "gainsboro" => [220, 220, 220],
+        "ghostwhite" => [248, 248, 255],
+        "gold" => [255, 215, 0],
+        "goldenrod" => [218, 165, 32],
+        "gray" => [128, 128, 128],
+        "green" => [0, 128, 0],
+        "greenyellow" => [173, 255, 47],
+        "grey" => [128, 128, 128],
+        "honeydew" => [240, 255, 240],
+        "hotpink" => [255, 105, 180],
+        "indianred" => [205, 92, 92],
+        "indigo" => [75, 0, 130],
+        "ivory" => [255, 255, 240],
+        "khaki" => [240, 230, 140],
+        "lavender" => [230, 230, 250],
+        "lavenderblush" => [255, 240, 245],
+        "lawngreen" => [124, 252, 0],
+        "lemonchiffon" => [255, 250, 205],
+        "lightblue" => [173, 216, 230],
+        "lightcoral" => [240, 128, 128],
+        "lightcyan" => [224, 255, 255],
+        "lightgoldenrodyellow" => [250, 250, 210],
+        "lightgray" => [211, 211, 211],
+        "lightgreen" => [144, 238, 144],
+        "lightgrey" => [211, 211, 211],
+        "lightpink" => [255, 182, 193],
+        "lightsalmon" => [255, 160, 122],
+        "lightseagreen" => [32, 178, 170],
+        "lightskyblue" => [135, 206, 250],
+        "lightslategray" => [119, 136, 153],
+        "lightslategrey" => [119, 136, 153],
+        "lightsteelblue" => [176, 196, 222],
+        "lightyellow" => [255, 255, 224],
+        "lime" => [0, 255, 0],
+        "limegreen" => [50, 205, 50],
+        "linen" => [250, 240, 230],
+        "magenta" => [255, 0, 255],
+        "maroon" => [128, 0, 0],
+        "mediumaquamarine" => [102, 205, 170],
+        "mediumblue" => [0, 0, 205],
+        "mediumorchid" => [186, 85, 211],
+        "mediumpurple" => [147, 112, 219],
+        "mediumseagreen" => [60, 179, 113],
+        "mediumslateblue" => [123, 104, 238],
+        "mediumspringgreen" => [0, 250, 154],
+        "mediumturquoise" => [72, 209, 204],
+        "mediumvioletred" => [199, 21, 133],
+        "midnightblue" => [25, 25, 112],
+        "mintcream" => [245, 255, 250],
+        "mistyrose" => [255, 228, 225],
+        "moccasin" => [255, 228, 181],
+        "navajowhite" => [255, 222, 173],
+        "navy" => [0, 0, 128],
+        "oldlace" => [253, 245, 230],
+        "olive" => [128, 128, 0],
+        "olivedrab" => [107, 142, 35],
+        "orange" => [255, 165, 0],
+        "orangered" => [255, 69, 0],
+        "orchid" => [218, 112, 214],
+        "palegoldenrod" => [238, 232, 170],
+        "palegreen" => [152, 251, 152],
+        "paleturquoise" => [175, 238, 238],
+        "palevioletred" => [219, 112, 147],
+        "papayawhip" => [255, 239, 213],
+        "peachpuff" => [255, 218, 185],
+        "peru" => [205, 133, 63],
+        "pink" => [255, 192, 203],
+        "plum" => [221, 160, 221],
+        "powderblue" => [176, 224, 230],
+        "purple" => [128, 0, 128],
+        "red" => [255, 0, 0],
+        "rosybrown" => [188, 143, 143],
+        "royalblue" => [65, 105, 225],
+        "saddlebrown" => [139, 69, 19],
+        "salmon" => [250, 128, 114],
+        "sandybrown" => [244, 164, 96],
+        "seagreen" => [46, 139, 87],
+        "seashell" => [255, 245, 238],
+        "sienna" => [160, 82, 45],
+        "silver" => [192, 192, 192],
+        "skyblue" => [135, 206, 235],
+        "slateblue" => [106, 90, 205],
+        "slategray" => [112, 128, 144],
+        "slategrey" => [112, 128, 144],
+        "snow" => [255, 250, 250],
+        "springgreen" => [0, 255, 127],
+        "steelblue" => [70, 130, 180],
+        "tan" => [210, 180, 140],
+        "teal" => [0, 128, 128],
+        "thistle" => [216, 191, 216],
+        "tomato" => [255, 99, 71],
+        "turquoise" => [64, 224, 208],
+        "violet" => [238, 130, 238],
+        "wheat" => [245, 222, 179],
+        "white" => [255, 255, 255],
+        "whitesmoke" => [245, 245, 245],
+        "yellow" => [255, 255, 0],
+        "yellowgreen" => [154, 205, 50],
+      }.freeze
+
       # :call-seq:
       #   ColorSpace.device_color_from_specification(gray)           => color
       #   ColorSpace.device_color_from_specification(r, g, b)        => color
@@ -111,14 +275,32 @@ module HexaPDF
       # * Three numeric arguments specify an RGB color (see DeviceRGB::Color).
       # * A string in the format "RRGGBB" where "RR" is the hexadecimal number for the red, "GG"
       #   for the green and "BB" for the blue color value also specifies an RGB color.
+      # * As does a string in the format "RGB" where "RR", "GG" and "BB" would be used as the
+      #   hexadecimal numbers for the red, green and blue color values of an RGB color.
+      # * Any other string is treated as a CSS Color Module Level 3 color name, see
+      #   https://www.w3.org/TR/css-color-3/#svg-color.
       # * Four numeric arguments specify a CMYK color (see DeviceCMYK::Color).
       # * An array is treated as if its items were specified separately as arguments.
       #
       # Note that it makes a difference whether integer or float values are used because the given
-      # values are first normalized - see DeviceGray#color, DeviceRGB#color and DeviceCMYK#color.
+      # values are first normalized (expected range by the PDF specification is 0.0 - 1.0) - see
+      # DeviceGray#color, DeviceRGB#color and DeviceCMYK#color for details.
+      #
+      # For examples see HexaPDF::Content::Canvas#stroke_color.
       def self.device_color_from_specification(*spec)
         spec.flatten!
-        spec = spec[0].scan(/../).map!(&:hex) if spec.length == 1 && spec[0].kind_of?(String)
+        first_item = spec[0]
+        if spec.length == 1 && first_item.kind_of?(String)
+          spec = if first_item.match?(/\A\h{6}\z/)
+                   first_item.scan(/../).map!(&:hex)
+                 elsif first_item.match?(/\A\h{3}\z/)
+                   first_item.each_char.map {|x| (x*2).hex}
+                 elsif CSS_COLOR_NAMES.key?(first_item)
+                   CSS_COLOR_NAMES[first_item]
+                 else
+                   raise ArgumentError, "Given string is neither a hex color nor a color name"
+                 end
+        end
         GlobalConfiguration.constantize('color_space.map', for_components(spec)).new.color(*spec)
       end
 

data/lib/hexapdf/content/graphic_object/arc.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -40,11 +40,20 @@ module HexaPDF
   module Content
     module GraphicObject
 
-      # This class describes an elliptical in center parameterization arc that is approximated using
+      # This class describes an elliptical arc in center parameterization that is approximated using
       # Bezier curves. It can be used to draw circles, circular arcs, ellipses and elliptical arcs,
       # all either in clockwise or counterclockwise direction and optionally inclined in respect to
       # the x-axis.
       #
+      # This graphic object is registered under the :arc key for use with the
+      # HexaPDF::Content::Canvas class.
+      #
+      # Examples:
+      #
+      #   #>pdf-center
+      #   arc = canvas.graphic_object(:arc, a: 100, b: 50).stroke
+      #   arc.draw(canvas).stroke    # or: canvas.draw(arc).stroke
+      #
       # See: ELL - https://spaceroots.org/documents/ellipse/elliptical-arc.pdf
       class Arc
 
@@ -62,36 +71,111 @@ module HexaPDF
         # The higher the value the better the approximation will be but it will also take longer
         # to compute. The value should not be lower than 4. Default value is 6 which already
         # provides a good approximation.
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, cx: -50, a: 40, b: 40)
+        #   arc.max_curves = 2
+        #   canvas.draw(arc)
+        #   arc.max_curves = 10
+        #   canvas.draw(arc, cx: 50)
+        #   canvas.stroke
         attr_accessor :max_curves
 
         # x-coordinate of center point
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 30, b: 20)
+        #   canvas.draw(arc).stroke
+        #   canvas.stroke_color("red").draw(arc, cx: -50).stroke
         attr_reader :cx
 
         # y-coordinate of center point
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 30, b: 20)
+        #   canvas.draw(arc).stroke
+        #   canvas.stroke_color("red").draw(arc, cy: 50).stroke
         attr_reader :cy
 
-        # Length of semi-major axis
+        # Length of semi-major axis which (without altering the #inclination) is parallel to the
+        # x-axis
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 30, b: 30)
+        #   canvas.draw(arc).stroke
+        #   canvas.stroke_color("red").draw(arc, a: 60).stroke
         attr_reader :a
 
-        # Length of semi-minor axis
+        # Length of semi-minor axis which (without altering the #inclination) is parallel to the
+        # y-axis
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 30, b: 30)
+        #   canvas.draw(arc).stroke
+        #   canvas.stroke_color("red").draw(arc, b: 60).stroke
         attr_reader :b
 
-        # Start angle in degrees
+        # Start angle of the arc in degrees
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 30, b: 30)
+        #   canvas.draw(arc, start_angle: 45).stroke
         attr_reader :start_angle
 
-        # End angle in degrees
+        # End angle of the arc in degrees
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 30, b: 30)
+        #   canvas.draw(arc, end_angle: 160).stroke
         attr_reader :end_angle
 
-        # Inclination in degrees of semi-major axis in respect to x-axis
+        # Inclination in degrees of the semi-major axis with respect to the x-axis
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 60, b: 30)
+        #   canvas.draw(arc, inclination: 45).stroke
         attr_reader :inclination
 
         # Direction of arc - if +true+ in clockwise direction, else in counterclockwise direction
+        #
+        # This is needed when filling paths using the nonzero winding number rule to achieve
+        # different effects.
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 40, b: 40)
+        #   canvas.draw(arc, cx: -50).draw(arc, cx: 50).
+        #     draw(arc, cx: -50, b: 80).
+        #     draw(arc, cx: 50, b: 80, clockwise: true).
+        #     fill(:nonzero)
         attr_reader :clockwise
 
         # Creates an elliptical arc with default values (a counterclockwise unit circle at the
         # origin).
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   canvas.draw(:arc).stroke
         def initialize
-          @max_curves = 6
+          @max_curves = nil
           @cx = @cy = 0
           @a = @b = 1
           @start_angle = 0
@@ -135,11 +219,25 @@ module HexaPDF
         end
 
         # Returns the start point of the elliptical arc.
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 40, b: 30, start_angle: 60)
+        #   canvas.draw(arc).stroke
+        #   canvas.fill_color("red").circle(*arc.start_point, 2).fill
         def start_point
           evaluate(@start_eta)
         end
 
         # Returns the end point of the elliptical arc.
+        #
+        # Examples:
+        #
+        #   #>pdf-center
+        #   arc = canvas.graphic_object(:arc, a: 40, b: 30, end_angle: 245)
+        #   canvas.draw(arc).stroke
+        #   canvas.fill_color("red").circle(*arc.end_point, 2).fill
         def end_point
           evaluate(@end_eta)
         end
@@ -157,10 +255,10 @@ module HexaPDF
         # move the current point to the start point of the arc. Otherwise it is assumed that the
         # current point already coincides with the start point
         #
-        # The #max_curves value is set to the value of the configuration option
-        # 'graphic_object.arc.max_curves' before drawing.
+        # The #max_curves value, if not already changed, is set to the value of the configuration
+        # option 'graphic_object.arc.max_curves' before drawing.
         def draw(canvas, move_to_start: true)
-          @max_curves = canvas.context.document.config['graphic_object.arc.max_curves']
+          @max_curves ||= canvas.context.document.config['graphic_object.arc.max_curves']
           canvas.move_to(*start_point) if move_to_start
           curves.each {|x, y, hash| canvas.curve_to(x, y, **hash) }
         end
@@ -183,7 +281,8 @@ module HexaPDF
           result = []
 
           # Number of curves to use, maximal segment angle is 2*PI/max_curves
-          n = [@max_curves, ((@end_eta - @start_eta).abs / (2 * Math::PI / @max_curves)).ceil].min
+          max_curves = @max_curves || 6
+          n = [max_curves, ((@end_eta - @start_eta).abs / (2 * Math::PI / max_curves)).ceil].min
           d_eta = (@end_eta - @start_eta) / n
 
           alpha = Math.sin(d_eta) * (Math.sqrt(4 + 3 * Math.tan(d_eta / 2)**2) - 1) / 3

data/lib/hexapdf/content/graphic_object/endpoint_arc.rb

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -233,11 +233,16 @@ module HexaPDF
 
       # Converts the string into UTF-8 encoding, assuming it is a binary string. Otherwise +nil+ is
       # returned.
-      def self.convert(str, _type, _document)
+      def self.convert(str, _type, document)
         return unless str.kind_of?(String) && str.encoding == Encoding::BINARY
 
         if str.getbyte(0) == 254 && str.getbyte(1) == 255
-          str[2..-1].force_encoding(Encoding::UTF_16BE).encode(Encoding::UTF_8)
+          str = str[2..-1].force_encoding(Encoding::UTF_16BE)
+          if str.valid_encoding?
+            str.encode!(Encoding::UTF_8)
+          else
+            document.configuration['document.on_invalid_string'].call(str)
+          end
         else
           Utils::PDFDocEncoding.convert_to_utf8(str)
         end
@@ -349,9 +354,30 @@ module HexaPDF
 
     end
 
+    # Converter module for fields of type Integer.
+    module IntegerConverter
+
+      # This converter is usable if the +type+ is Integer.
+      def self.usable_for?(type)
+        type == Integer
+      end
+
+      # :nodoc:
+      def self.additional_types
+      end
+
+      # Converts a Float value into an Integer if the float is equal to its integer value. Otherwise
+      # returns +nil+
+      def self.convert(data, _type, _document)
+        return unless data.kind_of?(Float) && data == data.to_i
+        data.to_i
+      end
+
+    end
+
     Field.converters.replace([FileSpecificationConverter, DictionaryConverter, ArrayConverter,
                               StringConverter, PDFByteStringConverter, DateConverter,
-                              RectangleConverter])
+                              RectangleConverter, IntegerConverter])
 
   end
 

data/lib/hexapdf/document/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-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -116,9 +116,9 @@ module HexaPDF
           end
 
           @document.pages.each do |page|
-            page[:Annots]&.each do |annot|
+            page.each_annotation do |annot|
               next unless annot[:Subtype] == :FileAttachment
-              spec = @document.deref(annot[:FS])
+              spec = annot[:FS]
               yield(spec) unless seen.key?(spec)
               seen[spec] = true
             end

data/lib/hexapdf/document/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-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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/document/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-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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/document/pages.rb

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

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

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