prawn-html 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b659b809526c4c961782f613e6946613232dd836ac056ca48d3dabebdbf9a02
-  data.tar.gz: 2549b8b8b872b44f3d6f424236249e7795f97afeadf95299bf06836fb979a13a
+  metadata.gz: 105884df1bf42d6aa44ff0a102a025960740c0d5a771c27e75949113cd7b9b70
+  data.tar.gz: abe3998f3f65cd2b421280d99151f18e321ac650dd8abed26260062e6f8e455a
 SHA512:
-  metadata.gz: b58a21e4424c89db5ff388ab2507ec502ea283ba9e6234d46f3688e477ba21944ee72f813cc9ddb4454426f5e4cc7397531ffa34c74eeb7795a0bbbeaa8d34ed
-  data.tar.gz: 0e3cfad427968577135c8c8791f698b3c5d6e95463b9364d0630d9caf87407f378c3fb725bfe11349cad210d1d0c3bba1a90555ebb9219c620e674fff0413ff8
+  metadata.gz: 0dc20b1ee2c6bd1321b4359e31e217cea923c68f5f3af242b097d56d9492f198e1df6af263cadcf75978c83700a90cad3cfbae08d25e9b0ebb39ddea6ad2c059
+  data.tar.gz: 88180bff0e1aac88d566911fafac9c6b6ae799eee6c1f77948f0bc811825f03c2e7ca2c8b1bf8962dc60e27ba355904d77289e3870e1c3faecd8c362e6536237

data/README.md

@@ -35,34 +35,34 @@ To check some examples with the PDF output see [examples](examples/) folder.
 
 ## Supported tags & attributes
 
-HTML tags:
-
-- **a**: link
-- **b**: bold
-- **blockquote**: block quotation element
-- **br**: new line
-- **code**: inline code element
-- **del**: strike-through
-- **div**: block element
-- **em**: italic
-- **h1** - **h6**: headings
-- **hr**: horizontal line
-- **i**: italic
-- **ins**: underline
-- **img**: image
-- **li**: list item
-- **mark**: highlight
-- **ol**: ordered list
-- **p**: block element
-- **pre**: preformatted text element
-- **s**: strike-through
-- **small**: smaller text
-- **span**: inline element
-- **strong**: bold
-- **sub**: subscript element
-- **sup**: superscript element
-- **u**: underline
-- **ul**: unordered list
+HTML tags (using MDN definitions):
+
+- **a**: the Anchor element
+- **b**: the Bring Attention To element
+- **blockquote**: the Block Quotation element
+- **br**: the Line Break element
+- **code**: the Inline Code element
+- **del**: the Deleted Text element
+- **div**: the Content Division element
+- **em**: the Emphasis element
+- **h1** - **h6**: the HTML Section Heading elements
+- **hr**: the Thematic Break (Horizontal Rule) element
+- **i**: the Idiomatic Text element
+- **ins**: the added text element
+- **img**: the Image Embed element
+- **li**: the list item element
+- **mark**: the Mark Text element
+- **ol**: the Ordered List element
+- **p**: the Paragraph element
+- **pre**: the Preformatted Text element
+- **s**: the strike-through text element
+- **small**: the side comment element
+- **span**: the generic inline element
+- **strong**: the Strong Importance element
+- **sub**: the Subscript element
+- **sup**: the Superscript element
+- **u**: the Unarticulated Annotation (Underline) element
+- **ul**: the Unordered List element
 
 CSS attributes (dimensional units are ignored and considered in pixel):
 

data/lib/prawn-html.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module PrawnHtml
+  ADJUST_LEADING = { nil => 0.18, 'Courier' => -0.07, 'Helvetica' => -0.17, 'Times-Roman' => 0.03 }.freeze
   PX = 0.6 # conversion constant for pixel sixes
 
   COLORS = {

data/lib/prawn_html/attributes.rb

@@ -154,7 +154,7 @@ module PrawnHtml
       return (@initial << rule) if value == 'initial'
 
       if rule[:set] == :append_styles
-        val = Utils.normalize_style(value)
+        val = Utils.normalize_style(value, rule[:values])
         (merged_styles[rule[:key]] ||= []) << val if val
       else
         opts = rule[:options] ? options[rule[:options]] : nil

data/lib/prawn_html/context.rb

@@ -67,10 +67,17 @@ module PrawnHtml
       last.on_context_remove(self) if last.respond_to?(:on_context_remove)
       @merged_styles = nil
       @last_text_node = false
-      @previous_tag = last.tag
+      @previous_tag = last
       pop
     end
 
+    # White space is equal to 'pre'?
+    #
+    # @return [boolean] white space property of the last element is equal to 'pre'
+    def white_space_pre?
+      last && last.styles[:white_space] == :pre
+    end
+
     private
 
     def evaluate_element_styles(element, res)

data/lib/prawn_html/document_renderer.rb

@@ -12,6 +12,8 @@ module PrawnHtml
       @buffer = []
       @context = Context.new
       @last_margin = 0
+      @last_text = ''
+      @last_tag_open = false
       @pdf = pdf
     end
 
@@ -22,6 +24,8 @@ module PrawnHtml
       render_if_needed(element)
       apply_tag_close_styles(element)
       context.remove_last
+      @last_tag_open = false
+      @last_text = ''
     end
 
     # On tag open callback
@@ -38,6 +42,7 @@ module PrawnHtml
       options = { width: pdf.page_width, height: pdf.page_height }
       tag_class.new(tag_name, attributes: attributes, options: options).tap do |element|
         setup_element(element, element_styles: element_styles)
+        @last_tag_open = true
       end
     end
 
@@ -47,9 +52,10 @@ module PrawnHtml
     #
     # @return [NilClass] nil value (=> no element)
     def on_text_node(content)
-      return if content.match?(/\A\s*\Z/)
+      return if context.previous_tag&.block? && content.match?(/\A\s*\Z/)
 
-      buffer << context.merged_styles.merge(text: prepare_text(content))
+      text = prepare_text(content)
+      buffer << context.merged_styles.merge(text: text) unless text.empty?
       context.last_text_node = true
       nil
     end
@@ -70,17 +76,13 @@ module PrawnHtml
     attr_reader :buffer, :context, :last_margin, :pdf
 
     def setup_element(element, element_styles:)
-      add_space_if_needed unless render_if_needed(element)
+      render_if_needed(element)
       context.add(element)
       element.process_styles(element_styles: element_styles)
       apply_tag_open_styles(element)
       element.custom_render(pdf, context) if element.respond_to?(:custom_render)
     end
 
-    def add_space_if_needed
-      buffer << SPACE if buffer.any? && !context.last_text_node && ![NEW_LINE, SPACE].include?(buffer.last)
-    end
-
     def render_if_needed(element)
       render_needed = element&.block? && buffer.any? && buffer.last != NEW_LINE
       return false unless render_needed
@@ -104,10 +106,12 @@ module PrawnHtml
     end
 
     def prepare_text(content)
-      white_space_pre = context.last && context.last.styles[:white_space] == :pre
-      text = ::Oga::HTML::Entities.decode(context.before_content)
-      text += white_space_pre ? content : content.gsub(/\A\s*\n\s*|\s*\n\s*\Z/, '').delete("\n").squeeze(' ')
-      text
+      text = context.before_content ? ::Oga::HTML::Entities.decode(context.before_content) : ''
+      return (@last_text = text + content) if context.white_space_pre?
+
+      content = content.lstrip if @last_text[-1] == ' ' || @last_tag_open
+      text += content.tr("\n", ' ').squeeze(' ')
+      @last_text = text
     end
 
     def output_content(buffer, block_styles)
@@ -129,7 +133,10 @@ module PrawnHtml
     def adjust_leading(buffer, leading)
       return leading if leading
 
-      (buffer.map { |item| item[:size] || Context::DEFAULT_STYLES[:size] }.max * 0.055).round(4)
+      leadings = buffer.map do |item|
+        (item[:size] || Context::DEFAULT_STYLES[:size]) * (ADJUST_LEADING[item[:font]] || ADJUST_LEADING[nil])
+      end
+      leadings.max.round(4)
     end
 
     def bounds(buffer, options, block_styles)

data/lib/prawn_html/tags/br.rb

@@ -12,7 +12,7 @@ module PrawnHtml
       end
 
       def custom_render(pdf, context)
-        return if context.last_text_node || context.previous_tag != :br
+        return if context.last_text_node || !context.previous_tag.is_a?(Br)
 
         pdf.advance_cursor(BR_SPACING)
       end

data/lib/prawn_html/utils.rb

@@ -103,11 +103,13 @@ module PrawnHtml
     # Normalize a style value
     #
     # @param value [String] string value
+    # @param accepted_values [Array] allowlist of valid values (symbols)
     #
     # @return [Symbol] style value or nil
-    def normalize_style(value)
+    def normalize_style(value, accepted_values)
       val = value&.strip&.downcase
-      NORMALIZE_STYLES[val]
+      ret = NORMALIZE_STYLES[val]
+      accepted_values.include?(ret) ? ret : nil
     end
 
     # Unquotes a string

data/lib/prawn_html/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrawnHtml # :nodoc:
-  VERSION = '0.6.0'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-html
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga