hexapdf 0.15.9 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d17dfd6c8dc9e3f7014e1ea769dede6f8cea81529bb201a8447f21873d3b25
-  data.tar.gz: 7165a2e11983731ba2597d2e4a824415abc96936d2b58f3fb737a4fed94dcf16
+  metadata.gz: 5b2303787fd50c2407bb99336c3315643c4a9401a84a508462715d18a378788c
+  data.tar.gz: 675bb953973762670c598f93ed15fcaa4387f962c0cbdc9d27060bd06de4f5ae
 SHA512:
-  metadata.gz: 244332a4f024c90cf6344b462ed422a5f73b32d3a4d04d0dcdadc6e7ede2cd0724f7a3329fa3aad68c99e47f49a9dff66806d9b8b152b9551eaecd7365c807d4
-  data.tar.gz: 06c4b9fd5ecd8f045a37e85ce4a6539f52b48bb16fb685290bcc2a0210b5f2e66bcfa9b7efb1115c45dd1618de9421c479d7a66d84556d1b9c37b19b1f8b6075
+  metadata.gz: 81715891b39fc35606baae317fc44a4be4d7710b2a1488f682425620771c2b563ecdfa8ba8ff0028a5226904d511c79b9507c1fed7170fdfd2c7a29aa4706127
+  data.tar.gz: f24fb2cdd07da0c2afde7511c40880e66fd65d87d2fd6035524202fbf8f1040d1e64576b3b080f6aa0d006d5938fc61c399c062d8687b33b3f3a5e9966b3917d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.16.0 - 2021-09-28
+
+## Added
+
+* Support for RGB color values of the form "RGB" in addition to "RRGGBB" and for
+  CSS color module level 3 color names
+* Conversion module for Integer fields to fix certain invalid PDF files
+
+
 ## 0.15.9 - 2021-09-04
 
 ### Fixed

data/lib/hexapdf/configuration.rb

@@ -245,7 +245,7 @@ module HexaPDF
   #    Defines a mapping from font names and variants to font files.
   #
   #    The value needs to be a hash of the form:
-  #      {"font_name": {variant: file_name, variant2: file_name2, ...}, ...}
+  #      {"font_name" => {variant: file_name, variant2: file_name2, ...}, ...}
   #
   #    Once a font is registered in this way, the font name together with a variant name can be used
   #    with the HexaPDF::Document::Fonts#add method to load the font.

data/lib/hexapdf/content/canvas.rb

@@ -675,6 +675,10 @@ module HexaPDF
       # * Three numeric arguments specify an RGB color (see Content::ColorSpace::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 Content::ColorSpace::DeviceCMYK::Color).
       # * A color object is used directly (normally used for color spaces other than DeviceRGB,
       #   DeviceCMYK and DeviceGray).
@@ -1852,7 +1856,7 @@ module HexaPDF
       # on the possible color specifications.
       def color_from_specification(spec)
         if spec.length == 1 && spec[0].kind_of?(String)
-          resources.color_space(:DeviceRGB).color(*spec[0].scan(/../).map!(&:hex))
+          ColorSpace.device_color_from_specification(spec)
         elsif spec.length == 1 && spec[0].respond_to?(:color_space)
           spec[0]
         else

data/lib/hexapdf/content/color_space.rb

@@ -96,6 +96,157 @@ module HexaPDF
     # See: PDF1.7 s8.6
     module ColorSpace
 
+      # Mapping of CSS Color Module Level 3 names to RGB values.
+      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,6 +262,10 @@ 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.
       #
@@ -118,7 +273,18 @@ module HexaPDF
       # values are first normalized - see DeviceGray#color, DeviceRGB#color and DeviceCMYK#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/dictionary_fields.rb

@@ -349,9 +349,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/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.15.9'
+  VERSION = '0.16.0'
 
 end

data/test/hexapdf/content/test_color_space.rb

@@ -73,10 +73,18 @@ describe HexaPDF::Content::ColorSpace do
       assert_equal([0.2, 1, 0], @class.device_color_from_specification(51, 255, 0).components)
     end
 
-    it "works for RGB values given as string" do
+    it "works for RGB values given as full hex string" do
       assert_equal([0.2, 1, 0], @class.device_color_from_specification("33FF00").components)
     end
 
+    it "works for RGB values given as half hex string" do
+      assert_equal([0.2, 1, 0], @class.device_color_from_specification("3F0").components)
+    end
+
+    it "works for RGB values given as color names" do
+      assert_equal([0, 0, 1], @class.device_color_from_specification("blue").components)
+    end
+
     it "works for CMYK values" do
       assert_equal([0.51, 0.9, 1, 0.5],
                    @class.device_color_from_specification(51, 90, 100, 50).components)
@@ -85,6 +93,10 @@ describe HexaPDF::Content::ColorSpace do
     it "works when an array is given" do
       assert_equal([0.2], @class.device_color_from_specification([51]).components)
     end
+
+    it "raises an error if an invalid color string is given" do
+      assert_raises(ArgumentError) { @class.device_color_from_specification("unknown") }
+    end
   end
 
   it "returns a device color object for prenormalized color values" do

data/test/hexapdf/test_dictionary_fields.rb

@@ -242,4 +242,19 @@ describe HexaPDF::DictionaryFields do
       doc.verify
     end
   end
+
+  describe "IntegerConverter" do
+    before do
+      @field = self.class::Field.new(Integer)
+    end
+
+    it "no additional field types allowed" do
+      assert_equal([Integer], @field.type)
+    end
+
+    it "allows conversion to an Integer from an equivalent Float value" do
+      refute_same(3, @field.convert(3.1, nil))
+      assert_same(3, @field.convert(3.0, nil))
+    end
+  end
 end

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.15.9)>>
+      <</Producer(HexaPDF version 0.16.0)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.15.9)>>
+      <</Producer(HexaPDF version 0.16.0)>>
       endobj
       2 0 obj
       <</Length 10>>stream

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.15.9
+  version: 0.16.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse