prawn-markup 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5217761bc64b6cf5ae6697d326934a9b87d3e54a3a65428f9c7025d3a03f043
-  data.tar.gz: c3274d3dfd6ab699f4d9fe17db8148305c9b4c4c7da8cd3b2a8b834735380583
+  metadata.gz: c3e26315f0588069e152aea5344bb9e79523b71aed0a574875036802ccb3a3d0
+  data.tar.gz: 1c9f31e0e3d19c4bc0c9811d1c0043512a11fa5ca9b15e864919c3ab4d633402
 SHA512:
-  metadata.gz: 728da10a3ce7d80aca95a3b9d54d9122c9c791567ab150188c6f459bb0de15863524322d091ed01900e844661aa0e5337542fd191f03eb97d080e27b905cc394
-  data.tar.gz: c701c14bcc7fd0baa8cb17179f5096caef7a8f8ce829f8d548d9667d5ce78f2ec2248a1848eca32e01cb0e52e94befb0a845a9d6da0f14c851fb195420e9c90f
+  metadata.gz: 4251fb1e5ea67b00c9e8281712f3bfe6a866c5ec2054c972de9be13d56939c3342e3cebc23a0cbe3164aa93b2fd6a59fa85de83487a8690413ebaad747b16ff1
+  data.tar.gz: b9900e07d2636efe47842bf2ca9b8a6445cdfe3cee1d9fb92149f9c7e6c80956081cf4bebce79be9245a7c7968892abbe6563af8df5b5ff762bfdb4fb680d4d4

data/README.md

@@ -38,13 +38,13 @@ doc.markup('<p>Hello World</p><hr/><p>KTHXBYE</p>')
 This gem parses the given HTML and layouts the following elements in a vertical order:
 
 * Text blocks: `p`, `div`, `ol`, `ul`, `li`, `hr`, `br`
-* Text semantics: `a`, `b`, `strong`, `i`, `em`, `u`, `s`, `del`, `sub`, `sup`
+* Text semantics: `a`, `b`, `strong`, `i`, `em`, `u`, `s`, `del`, `sub`, `sup`, `color`
 * Headings: `h1`, `h2`, `h3`, `h4`, `h5`, `h6`
 * Tables: `table`, `tr`, `td`, `th`
 * Media: `img`, `iframe`
 * Inputs: `type=checkbox`, `type=radio`
 
-All other elements are ignored, their content is added to the parent element. With a few exceptions, no CSS is processed. One exception is the `width` property of `img`, `td` and `th`, which may contain values in `cm`, `mm`, `px`, `pt`, `%` or `auto`.
+All other elements are ignored, their content is added to the parent element. With a few exceptions, no CSS is processed. One exception is the `width` property of `img`, `td` and `th`, which may contain values in `cm`, `mm`, `px`, `pt`, `%` or `auto`. Another exception is the `rgb` or `cmyk` properties of the Prawn-specific `color` tag.
 
 If no explicit loader is given (see above), images are loaded from `http(s)` addresses or may be contained in the `src` attribute as base64 encoded data URIs. Prawn only supports `PNG` and `JPG`.
 

data/lib/prawn/markup/builders/list_builder.rb

@@ -98,7 +98,7 @@ module Prawn
         end
 
         def content_width
-          column_widths.last && column_widths.last - content_margin
+          column_widths.last && (column_widths.last - content_margin)
         end
 
         def compute_column_widths

data/lib/prawn/markup/builders/table_builder.rb

@@ -131,7 +131,7 @@ module Prawn
 
         def normalize_cell_hash(node, width, style_options)
           if width.nil? && total_width
-            width = total_width - column_width_sum - (columns_without_width - 1) * MIN_COL_WIDTH
+            width = total_width - column_width_sum - ((columns_without_width - 1) * MIN_COL_WIDTH)
           end
           super(node, width, style_options)
         end
@@ -190,13 +190,13 @@ module Prawn
 
         def increase_widths(sum)
           diff = total_width - sum
-          column_widths.map! { |w| w + w / sum * diff }
+          column_widths.map! { |w| w + (w / sum * diff) }
         end
 
         def decrease_widths(sum)
           sum += columns_without_width * MIN_COL_WIDTH
           diff = sum - total_width
-          column_widths.map! { |w| w ? [w - w / sum * diff, 0].max : nil }
+          column_widths.map! { |w| w ? [w - (w / sum * diff), 0].max : nil }
         end
 
         def failover_on_error
@@ -210,7 +210,7 @@ module Prawn
 
         def horizontal_padding
           @horizontal_padding ||= begin
-            padding = table_options[:cell][:padding] || [DEFAULT_CELL_PADDING] * 4
+            padding = table_options[:cell][:padding] || ([DEFAULT_CELL_PADDING] * 4)
             padding.is_a?(Array) ? padding[1] + padding[3] : padding
           end
         end

data/lib/prawn/markup/processor/headings.rb

@@ -57,7 +57,7 @@ module Prawn
       def default_options_with_size(level)
         default = text_options.dup
         default[:size] ||= pdf.font_size
-        default[:size] *= 2.5 - level * 0.25
+        default[:size] *= 2.5 - (level * 0.25)
         HashMerger.deep(default, options[:"heading#{level}"] || {})
       end
 

data/lib/prawn/markup/processor/tables.rb

@@ -90,9 +90,12 @@ module Prawn
       end
 
       def add_cell_image(cell)
+        src = current_attrs['src']
+        return if src.to_s.strip.empty?
+
         add_cell_text_node(cell)
-        img = image_properties(current_attrs['src'])
-        cell.nodes << img || invalid_image_placeholder
+        img = image_properties(src)
+        (cell.nodes << img) || invalid_image_placeholder
       end
 
       def add_table(cells)

data/lib/prawn/markup/processor/text.rb

@@ -6,7 +6,7 @@ module Prawn
       def self.prepended(base)
         base.known_elements.push(
           'a', 'b', 'strong', 'i', 'em', 'u', 'strikethrough', 'strike', 's', 'del',
-          'sub', 'sup'
+          'sub', 'sup', 'color'
         )
       end
 
@@ -78,6 +78,19 @@ module Prawn
         append_text('</sup>')
       end
 
+      def start_color
+        rgb, c, m, y, k = current_attrs.values_at('rgb', 'c', 'm', 'y', 'k')
+
+        if [c, m, y, k].all?
+          append_text("<color c=\"#{c}\" m=\"#{m}\" y=\"#{y}\" k=\"#{k}\">")
+        else
+          append_text("<color rgb=\"#{rgb}\">")
+        end
+      end
+
+      def end_color
+        append_text('</color>')
+      end
     end
   end
 end

data/lib/prawn/markup/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Markup
-    VERSION = '0.3.4'
+    VERSION = '0.3.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-markup
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri