prawn-markup 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bf5359f2a3cd6a08af1cb55a8f698a0ff16105d27a8de7c1e747f9f2ea521a1
-  data.tar.gz: 3bd829e28c2bc4bc079834a9b0a21eb7d93ce57cfd3d511f2e511f2c8bd0cd4a
+  metadata.gz: 7d7d7fba33e7e87da6a9b6828a8dfdd0ea40be83eaf4564744f4b20e766a85b2
+  data.tar.gz: 2e7fdf53d140797d993f651320728ff42755371294c5fd501f2716f52111b443
 SHA512:
-  metadata.gz: b0e6c543856fb3fdd86e9d873b093faec9ac91049489512dc16cbc23fee6f77a33b7eff48d152fda4f0d4dd4d12374de05efed01a4e295cf1adccc42a7699280
-  data.tar.gz: b5a02c1fa07ad2b2326e981f41b551d7f57b033ac196e94798f9d3250ed9ba76dd889709b77838c0eb8feebb5d7034309a03548ce5b0773d8c04d4c61103d335
+  metadata.gz: a9f6ec2986e5e6fda0ad851689cdf6fa34d24a1b0a11656778613bd57e0937cab3dc082bd8bdc4c0e9f3713f5197010f84d5aa9ce6654cbfa6e5d7425d6c46cf
+  data.tar.gz: 76ae5a9dd1f544ab2164e4e4e56d805c71114b4772585dae07c532edbff92493c54e41a0a48fedc033112027e80516ba7322e2fe0e9e2a9182e3d015abf546cc

data/README.md

@@ -69,7 +69,7 @@ doc.markup('<p>Hello World</p><hr/><p>KTHXBYE</p>', text: { align: :center })
 
 Options may be set for `text`, `heading[1-6]`, `table` (subkeys `cell` and `header`) and `list` (subkeys `content` and `bullet`).
 
-Text and heading options include all keys from Prawns [#text](http://prawnpdf.org/api-docs/2.0/Prawn/Text.html#text-instance_method) method: `font`, `size`, `color`, `style`, `align`, `valign`, `leading`,`direction`, `character_spacing`, `indent_paragraphs`, `kerning`, `mode`.
+Text and heading options include all keys from Prawns [#text](https://prawnpdf.org/docs/prawn/2.5.0/Prawn/Text.html#text-instance_method) method: `font`, `size`, `color`, `style`, `align`, `valign`, `leading`,`direction`, `character_spacing`, `indent_paragraphs`, `kerning`, `mode`.
 
 Tables and lists are rendered with [prawn-table](https://github.com/prawnpdf/prawn-table) and have the following additional options: `padding`, `borders`, `border_width`, `border_color`, `background_color`, `border_lines`, `rotate`, `overflow`, `min_font_size`. Options from `text` may be overridden.
 
@@ -78,6 +78,7 @@ Beside these options handled by Prawn / prawn-table, the following values may be
 - `:text`
   - `:preprocessor`: A proc/callable that is called each time before a chunk of text is rendered.
   - `:margin_bottom`: Margin after each `<p>`, `<ol>`, `<ul>` or `<table>`. Defaults to about half a line.
+  - `:treat_empty_paragraph_as_new_line`: Boolean flag to set a new line if paragraph is empty.
 - `:heading1-6`
   - `:margin_top`: Margin before a heading. Default is 0.
   - `:margin_bottom`: Margin after a heading. Default is 0.
@@ -109,6 +110,9 @@ Beside these options handled by Prawn / prawn-table, the following values may be
   - `:radio`
     - `:checked`: The char to print for a checked radio. Default is '◉'.
     - `:unchecked`: The char to print for an unchecked radio. Default is '○'.
+- `:link`
+  - `:color`: The link color, which can be specified in either RGB hex format or 4-value CMYK.
+  - `:underline`: Specifies whether the link should be underlined. Default is false.
 
 ## Development
 

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

@@ -27,7 +27,7 @@ module Prawn
         end
 
         def text_options
-          (options[:text] || {})
+          options[:text] || {}
         end
 
         def compute_image_width(hash, max_width)

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

@@ -133,7 +133,7 @@ module Prawn
           if width.nil? && total_width
             width = total_width - column_width_sum - ((columns_without_width - 1) * MIN_COL_WIDTH)
           end
-          super(node, width, style_options)
+          super
         end
 
         def compute_column_widths

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

@@ -63,11 +63,11 @@ module Prawn
       def add_paragraph
         text = dump_text
         text.gsub!(/[^\n]/, '') if text.strip.empty?
-        unless text.empty?
-          add_bottom_margin
-          add_formatted_text(text, text_options)
-          put_bottom_margin(text_margin_bottom)
-        end
+        return if text.empty? && !treat_empty_paragraph_as_new_line?
+
+        add_bottom_margin
+        add_formatted_text(text.empty? ? "\n" : text, text_options)
+        put_bottom_margin(text_margin_bottom)
       end
 
       def add_current_text(options = text_options)
@@ -151,6 +151,10 @@ module Prawn
           inline_format: true
         }
       end
+
+      def treat_empty_paragraph_as_new_line?
+        text_options[:treat_empty_paragraph_as_new_line] || false
+      end
     end
   end
 end

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

@@ -86,6 +86,10 @@ module Prawn
       def add_cell_text_node(cell, options = {})
         return unless buffered_text?
 
+        # only allow on supported options of prawn-table; See https://github.com/prawnpdf/prawn-table/blob/master/manual/table/cell_text.rb
+        options = options.slice(*%i[font font_style inline_format kerning leading min_font_size size
+                                    overflow rotate rotate_around single_line text_color valign])
+
         cell.nodes << options.merge(content: dump_text.strip)
       end
 

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

@@ -11,15 +11,30 @@ module Prawn
       end
 
       def start_a
+        start_u                                if link_options[:underline]
+        append_color_tag(link_options[:color]) if link_options[:color]
         append_text("<link href=\"#{current_attrs['href']}\">")
       end
       alias start_link start_a
 
       def end_a
         append_text('</link>')
+        end_color if link_options[:color]
+        end_u     if link_options[:underline]
       end
       alias end_link end_a
 
+      def link_options
+        @link_options ||= HashMerger.deep(default_link_options, options[:link] || {})
+      end
+
+      def default_link_options
+        {
+          color: nil,
+          underline: false
+        }
+      end
+
       def start_b
         append_text('<b>')
       end
@@ -82,9 +97,9 @@ module Prawn
         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}\">")
+          append_color_tag([c, m, y, k])
         else
-          append_text("<color rgb=\"#{rgb}\">")
+          append_color_tag(rgb)
         end
       end
 
@@ -103,6 +118,15 @@ module Prawn
       def end_font
         append_text('</font>')
       end
+
+      def append_color_tag(color)
+        if color.is_a?(Array)
+          c, m, y, k = color
+          append_text("<color c=\"#{c}\" m=\"#{m}\" y=\"#{y}\" k=\"#{k}\">")
+        else
+          append_text("<color rgb=\"#{color}\">")
+        end
+      end
     end
   end
 end

data/lib/prawn/markup/processor.rb

@@ -49,7 +49,9 @@ module Prawn
 
         reset
         html = Prawn::Markup::Normalizer.new(html).normalize
-        Nokogiri::HTML::SAX::Parser.new(self).parse(html) { |ctx| ctx.recovery = true }
+        Nokogiri::HTML::SAX::Parser.new(self, html.encoding&.to_s).parse(html) do |ctx|
+          ctx.recovery = true
+        end
       end
 
       def start_element(name, attrs = [])

data/lib/prawn/markup/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Markup
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-markup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Parse simple HTML markup to include in Prawn PDFs