prawn-html 0.4.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dec0bd9a3746705bdaca34d49c8a8eff5700fd8a5feebc3b3452001cd239b0b
-  data.tar.gz: 74b5e31d3056560435ea939f50f713f11c44ad4c1f584873203b910754e1f782
+  metadata.gz: 105884df1bf42d6aa44ff0a102a025960740c0d5a771c27e75949113cd7b9b70
+  data.tar.gz: abe3998f3f65cd2b421280d99151f18e321ac650dd8abed26260062e6f8e455a
 SHA512:
-  metadata.gz: 814c481a5fce1da43dcb04254ed97f76f234fbdcaa6826070b00594f80cd3b4396c190a2972c0f6f72e00d35e5fd1b534cf22c9ef932b8ee308562de7c6bc854
-  data.tar.gz: f99ce1543d1b28689b19ceddd8e86a73fae8e204bc98270e6a422dd93e44d89ff50366969b67e0fb2a9a4e91d03367981ab5c0f9481b91378df57e2304358f40
+  metadata.gz: 0dc20b1ee2c6bd1321b4359e31e217cea923c68f5f3af242b097d56d9492f198e1df6af263cadcf75978c83700a90cad3cfbae08d25e9b0ebb39ddea6ad2c059
+  data.tar.gz: 88180bff0e1aac88d566911fafac9c6b6ae799eee6c1f77948f0bc811825f03c2e7ca2c8b1bf8962dc60e27ba355904d77289e3870e1c3faecd8c362e6536237

data/README.md

@@ -35,30 +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
-- **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
-- **s**: strike-through
-- **small**: smaller text
-- **span**: inline element
-- **strong**: bold
-- **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):
 
@@ -86,6 +90,8 @@ CSS attributes (dimensional units are ignored and considered in pixel):
 - **top**: see *position (absolute)*
 - **width**: for *img* tag, support also percentage, ex. `<img src="image.jpg" style="width: 50%; height: 200px"/>`
 
+The above attributes supports the `initial` value to reset them to their original value.
+
 For colors, the supported formats are:
 - 3 hex digits, ex. `color: #FB1`;
 - 6 hex digits, ex. `color: #abcdef`;

data/lib/prawn-html.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module PrawnHtml
-  PX = 0.66 # conversion constant for pixel sixes
+  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 = {
     'aliceblue' => 'f0f8ff',

data/lib/prawn_html/attributes.rb

@@ -1,31 +1,33 @@
 # frozen_string_literal: true
 
 require 'ostruct'
+require 'set'
 
 module PrawnHtml
   class Attributes < OpenStruct
-    attr_reader :styles
+    attr_reader :initial, :styles
 
     STYLES_APPLY = {
-      block: %i[align leading left margin_left padding_left position top],
+      block: %i[align bottom leading left margin_left padding_left position right top],
       tag_close: %i[margin_bottom padding_bottom break_after],
       tag_open: %i[margin_top padding_top break_before],
-      text_node: %i[background callback character_spacing color font link list_style_type size styles]
+      text_node: %i[callback character_spacing color font link list_style_type size styles white_space]
     }.freeze
 
     STYLES_LIST = {
       # text node styles
-      'background' => { key: :background, set: :convert_color },
-      'callback' => { key: :callback, set: :copy_value },
+      'background' => { key: :callback, set: :callback_background },
       'color' => { key: :color, set: :convert_color },
       'font-family' => { key: :font, set: :unquote },
       'font-size' => { key: :size, set: :convert_size },
-      'font-style' => { key: :styles, set: :append_styles },
-      'font-weight' => { key: :styles, set: :append_styles },
+      'font-style' => { key: :styles, set: :append_styles, values: %i[italic] },
+      'font-weight' => { key: :styles, set: :append_styles, values: %i[bold] },
       'href' => { key: :link, set: :copy_value },
       'letter-spacing' => { key: :character_spacing, set: :convert_float },
       'list-style-type' => { key: :list_style_type, set: :unquote },
-      'text-decoration' => { key: :styles, set: :append_styles },
+      'text-decoration' => { key: :styles, set: :append_styles, values: %i[underline] },
+      'vertical-align' => { key: :styles, set: :append_styles, values: %i[subscript superscript] },
+      'white-space' => { key: :white_space, set: :convert_symbol },
       # tag opening styles
       'break-before' => { key: :break_before, set: :convert_symbol },
       'margin-top' => { key: :margin_top, set: :convert_size },
@@ -35,13 +37,17 @@ module PrawnHtml
       'margin-bottom' => { key: :margin_bottom, set: :convert_size },
       'padding-bottom' => { key: :padding_bottom, set: :convert_size },
       # block styles
-      'left' => { key: :left, set: :convert_size },
+      'bottom' => { key: :bottom, set: :convert_size, options: :height },
+      'left' => { key: :left, set: :convert_size, options: :width },
       'line-height' => { key: :leading, set: :convert_size },
       'margin-left' => { key: :margin_left, set: :convert_size },
       'padding-left' => { key: :padding_left, set: :convert_size },
       'position' => { key: :position, set: :convert_symbol },
+      'right' => { key: :right, set: :convert_size, options: :width },
       'text-align' => { key: :align, set: :convert_symbol },
-      'top' => { key: :top, set: :convert_size }
+      'top' => { key: :top, set: :convert_size, options: :height },
+      # special styles
+      'text-decoration-line-through' => { key: :callback, set: :callback_strike_through }
     }.freeze
 
     STYLES_MERGE = %i[margin_left padding_left].freeze
@@ -50,6 +56,7 @@ module PrawnHtml
     def initialize(attributes = {})
       super
       @styles = {} # result styles
+      @initial = Set.new
     end
 
     # Processes the data attributes
@@ -65,9 +72,37 @@ module PrawnHtml
     # Merge text styles
     #
     # @param text_styles [String] styles to parse and process
-    def merge_text_styles!(text_styles)
+    # @param options [Hash] options (container width/height/etc.)
+    def merge_text_styles!(text_styles, options: {})
       hash_styles = Attributes.parse_styles(text_styles)
-      process_styles(hash_styles) unless hash_styles.empty?
+      process_styles(hash_styles, options: options) unless hash_styles.empty?
+    end
+
+    # Remove an attribute value from the context styles
+    #
+    # @param context_styles [Hash] hash of the context styles that will be updated
+    # @param rule [Hash] rule from the STYLES_LIST to lookup in the context style for value removal
+    def remove_value(context_styles, rule)
+      if rule[:set] == :append_styles
+        context_styles[rule[:key]] -= rule[:values] if context_styles[:styles]
+      else
+        default = Context::DEFAULT_STYLES[rule[:key]]
+        default ? (context_styles[rule[:key]] = default) : context_styles.delete(rule[:key])
+      end
+    end
+
+    # Update context styles applying the initial rules (if set)
+    #
+    # @param context_styles [Hash] hash of the context styles that will be updated
+    #
+    # @return [Hash] the update context styles
+    def update_styles(context_styles)
+      initial.each do |rule|
+        next unless rule
+
+        remove_value(context_styles, rule)
+      end
+      context_styles
     end
 
     class << self
@@ -98,21 +133,34 @@ module PrawnHtml
 
     private
 
-    def apply_rule!(result, rule, value)
-      return unless rule
+    def process_styles(hash_styles, options:)
+      hash_styles.each do |key, value|
+        rule = evaluate_rule(key, value)
+        next unless rule
 
-      if rule[:set] == :append_styles
-        (result[rule[:key]] ||= []) << Utils.normalize_style(value)
-      else
-        result[rule[:key]] = Utils.send(rule[:set], value)
+        apply_rule!(merged_styles: @styles, rule: rule, value: value, options: options)
       end
+      @styles
     end
 
-    def process_styles(hash_styles)
-      hash_styles.each do |key, value|
-        apply_rule!(@styles, STYLES_LIST[key], value)
+    def evaluate_rule(rule_key, attr_value)
+      key = nil
+      key = 'text-decoration-line-through' if rule_key == 'text-decoration' && attr_value == 'line-through'
+      key ||= rule_key
+      STYLES_LIST[key]
+    end
+
+    def apply_rule!(merged_styles:, rule:, value:, options:)
+      return (@initial << rule) if value == 'initial'
+
+      if rule[:set] == :append_styles
+        val = Utils.normalize_style(value, rule[:values])
+        (merged_styles[rule[:key]] ||= []) << val if val
+      else
+        opts = rule[:options] ? options[rule[:options]] : nil
+        val = Utils.send(rule[:set], value, options: opts)
+        merged_styles[rule[:key]] = val if val
       end
-      @styles
     end
   end
 end

data/lib/prawn_html/callbacks/{highlight.rb → background.rb}

@@ -2,12 +2,12 @@
 
 module PrawnHtml
   module Callbacks
-    class Highlight
+    class Background
       DEF_HIGHLIGHT = 'ffff00'
 
-      def initialize(pdf, item)
+      def initialize(pdf, color = nil)
         @pdf = pdf
-        @color = item.delete(:background) || DEF_HIGHLIGHT
+        @color = color || DEF_HIGHLIGHT
       end
 
       def render_behind(fragment)

data/lib/prawn_html/context.rb

@@ -2,15 +2,19 @@
 
 module PrawnHtml
   class Context < Array
-    DEF_FONT_SIZE = 10.3
+    DEFAULT_STYLES = {
+      size: 16 * PX
+    }.freeze
 
-    attr_accessor :last_margin, :last_text_node
+    attr_reader :previous_tag
+    attr_accessor :last_text_node
 
     # Init the Context
     def initialize(*_args)
       super
-      @last_margin = 0
       @last_text_node = false
+      @merged_styles = nil
+      @previous_tag = nil
     end
 
     # Add an element to the context
@@ -25,6 +29,7 @@ module PrawnHtml
       element.parent = last
       push(element)
       element.on_context_add(self) if element.respond_to?(:on_context_add)
+      @merged_styles = nil
       self
     end
 
@@ -49,21 +54,32 @@ module PrawnHtml
     # Merge the context styles for text nodes
     #
     # @return [Hash] the hash of merged styles
-    def text_node_styles
-      each_with_object(base_styles) do |element, res|
-        evaluate_element_styles(element, res)
-        element.update_styles(res) if element.respond_to?(:update_styles)
-      end
+    def merged_styles
+      @merged_styles ||=
+        each_with_object(DEFAULT_STYLES.dup) do |element, res|
+          evaluate_element_styles(element, res)
+          element.update_styles(res)
+        end
     end
 
-    private
+    # Remove the last element from the context
+    def remove_last
+      last.on_context_remove(self) if last.respond_to?(:on_context_remove)
+      @merged_styles = nil
+      @last_text_node = false
+      @previous_tag = last
+      pop
+    end
 
-    def base_styles
-      {
-        size: DEF_FONT_SIZE
-      }
+    # 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)
       styles = element.styles.slice(*Attributes::STYLES_APPLY[:text_node])
       styles.each do |key, val|

data/lib/prawn_html/document_renderer.rb

@@ -11,6 +11,9 @@ module PrawnHtml
     def initialize(pdf)
       @buffer = []
       @context = Context.new
+      @last_margin = 0
+      @last_text = ''
+      @last_tag_open = false
       @pdf = pdf
     end
 
@@ -20,8 +23,9 @@ module PrawnHtml
     def on_tag_close(element)
       render_if_needed(element)
       apply_tag_close_styles(element)
-      context.last_text_node = false
-      context.pop
+      context.remove_last
+      @last_tag_open = false
+      @last_text = ''
     end
 
     # On tag open callback
@@ -35,8 +39,10 @@ module PrawnHtml
       tag_class = Tag.class_for(tag_name)
       return unless tag_class
 
-      tag_class.new(tag_name, attributes: attributes, element_styles: element_styles).tap do |element|
-        setup_element(element)
+      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
 
@@ -46,11 +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/)
 
-      text = ::Oga::HTML::Entities.decode(context.before_content)
-      text += content.gsub(/\A\s*\n\s*|\s*\n\s*\Z/, '').delete("\n").squeeze(' ')
-      buffer << context.text_node_styles.merge(text: text)
+      text = prepare_text(content)
+      buffer << context.merged_styles.merge(text: text) unless text.empty?
       context.last_text_node = true
       nil
     end
@@ -61,26 +66,23 @@ module PrawnHtml
 
       output_content(buffer.dup, context.block_styles)
       buffer.clear
-      context.last_margin = 0
+      @last_margin = 0
     end
 
     alias_method :flush, :render
 
     private
 
-    attr_reader :buffer, :context, :pdf
+    attr_reader :buffer, :context, :last_margin, :pdf
 
-    def setup_element(element)
-      add_space_if_needed unless render_if_needed(element)
-      apply_tag_open_styles(element)
+    def setup_element(element, element_styles:)
+      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
@@ -91,39 +93,68 @@ module PrawnHtml
 
     def apply_tag_close_styles(element)
       tag_styles = element.tag_close_styles
-      context.last_margin = tag_styles[:margin_bottom].to_f
-      pdf.advance_cursor(context.last_margin + tag_styles[:padding_bottom].to_f)
+      @last_margin = tag_styles[:margin_bottom].to_f
+      pdf.advance_cursor(last_margin + tag_styles[:padding_bottom].to_f)
       pdf.start_new_page if tag_styles[:break_after]
     end
 
     def apply_tag_open_styles(element)
       tag_styles = element.tag_open_styles
-      move_down = (tag_styles[:margin_top].to_f - context.last_margin) + tag_styles[:padding_top].to_f
+      move_down = (tag_styles[:margin_top].to_f - last_margin) + tag_styles[:padding_top].to_f
       pdf.advance_cursor(move_down) if move_down > 0
       pdf.start_new_page if tag_styles[:break_before]
     end
 
+    def prepare_text(content)
+      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)
       apply_callbacks(buffer)
       left_indent = block_styles[:margin_left].to_f + block_styles[:padding_left].to_f
-      options = block_styles.slice(:align, :leading, :mode, :padding_left)
-      options[:indent_paragraphs] = left_indent if left_indent > 0
-      pdf.puts(buffer, options, bounding_box: bounds(block_styles))
+      options = block_styles.slice(:align, :indent_paragraphs, :leading, :mode, :padding_left)
+      options[:leading] = adjust_leading(buffer, options[:leading])
+      pdf.puts(buffer, options, bounding_box: bounds(buffer, options, block_styles), left_indent: left_indent)
     end
 
     def apply_callbacks(buffer)
       buffer.select { |item| item[:callback] }.each do |item|
-        callback = Tag::CALLBACKS[item[:callback]]
-        item[:callback] = callback.new(pdf, item)
+        callback, arg = item[:callback]
+        callback_class = Tag::CALLBACKS[callback]
+        item[:callback] = callback_class.new(pdf, arg)
+      end
+    end
+
+    def adjust_leading(buffer, leading)
+      return leading if leading
+
+      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(block_styles)
+    def bounds(buffer, options, block_styles)
       return unless block_styles[:position] == :absolute
 
-      y = pdf.bounds.height - (block_styles[:top] || 0)
-      w = pdf.bounds.width - (block_styles[:left] || 0)
-      [[block_styles[:left] || 0, y], { width: w }]
+      x = if block_styles.include?(:right)
+            x1 = pdf.calc_buffer_width(buffer) + block_styles[:right]
+            x1 < pdf.page_width ? (pdf.page_width - x1) : 0
+          else
+            block_styles[:left] || 0
+          end
+      y = if block_styles.include?(:bottom)
+            pdf.calc_buffer_height(buffer, options) + block_styles[:bottom]
+          else
+            pdf.page_height - (block_styles[:top] || 0)
+          end
+
+      [[x, y], { width: pdf.page_width - x }]
     end
   end
 end

data/lib/prawn_html/pdf_wrapper.rb

@@ -6,7 +6,7 @@ module PrawnHtml
   class PdfWrapper
     extend Forwardable
 
-    def_delegators :@pdf, :bounds, :start_new_page
+    def_delegators :@pdf, :start_new_page
 
     # Wrapper for Prawn PDF Document
     #
@@ -24,6 +24,46 @@ module PrawnHtml
       pdf.move_down(move_down)
     end
 
+    # Calculate the height of a buffer of items
+    #
+    # @param buffer [Array] Buffer of items
+    # @param options [Hash] Output options
+    #
+    # @return [Float] calculated height
+    def calc_buffer_height(buffer, options)
+      pdf.height_of_formatted(buffer, options)
+    end
+
+    # Calculate the width of a buffer of items
+    #
+    # @param buffer [Array] Buffer of items
+    #
+    # @return [Float] calculated width
+    def calc_buffer_width(buffer)
+      width = 0
+      buffer.each do |item|
+        font_family = item[:font] || pdf.font.name
+        pdf.font(font_family, size: item[:size] || pdf.font_size) do
+          width += pdf.width_of(item[:text], inline_format: true)
+        end
+      end
+      width
+    end
+
+    # Height of the page
+    #
+    # @return [Float] height
+    def page_height
+      pdf.bounds.height
+    end
+
+    # Width of the page
+    #
+    # @return [Float] width
+    def page_width
+      pdf.bounds.width
+    end
+
     # Draw a rectangle
     #
     # @param x [Float] left position of the rectangle
@@ -66,12 +106,12 @@ module PrawnHtml
     # @param buffer [Array] array of text items
     # @param options [Hash] hash of options
     # @param bounding_box [Array] bounding box arguments, if bounded
-    def puts(buffer, options, bounding_box: nil)
-      return pdf.formatted_text(buffer, options) unless bounding_box
+    def puts(buffer, options, bounding_box: nil, left_indent: 0)
+      return output_buffer(buffer, options, left_indent: left_indent) unless bounding_box
 
       current_y = pdf.cursor
       pdf.bounding_box(*bounding_box) do
-        pdf.formatted_text(buffer, options)
+        output_buffer(buffer, options, left_indent: left_indent)
       end
       pdf.move_cursor_to(current_y)
     end
@@ -90,5 +130,12 @@ module PrawnHtml
     private
 
     attr_reader :pdf
+
+    def output_buffer(buffer, options, left_indent:)
+      formatted_text = proc { pdf.formatted_text(buffer, options) }
+      return formatted_text.call if left_indent == 0
+
+      pdf.indent(left_indent, 0, &formatted_text)
+    end
   end
 end

data/lib/prawn_html/tag.rb

@@ -2,11 +2,16 @@
 
 module PrawnHtml
   class Tag
+    extend Forwardable
+
     CALLBACKS = {
-      'Highlight' => Callbacks::Highlight,
+      'Background' => Callbacks::Background,
       'StrikeThrough' => Callbacks::StrikeThrough
     }.freeze
-    TAG_CLASSES = %w[A B Blockquote Body Br Del Div H Hr I Img Li Mark Ol P Small Span U Ul].freeze
+
+    TAG_CLASSES = %w[A B Blockquote Body Br Code Del Div H Hr I Img Li Mark Ol P Pre Small Span Sub Sup U Ul].freeze
+
+    def_delegators :@attrs, :styles, :update_styles
 
     attr_accessor :parent
     attr_reader :attrs, :tag
@@ -15,11 +20,11 @@ module PrawnHtml
     #
     # @param tag [Symbol] tag name
     # @param attributes [Hash] hash of element attributes
-    # @param element_styles [String] document styles tp apply to the element
-    def initialize(tag, attributes: {}, element_styles: '')
+    # @param options [Hash] options (container width/height/etc.)
+    def initialize(tag, attributes: {}, options: {})
       @tag = tag
+      @options = options
       @attrs = Attributes.new(attributes)
-      process_styles(element_styles, attributes['style'])
     end
 
     # Is a block tag?
@@ -38,6 +43,16 @@ module PrawnHtml
       block_styles
     end
 
+    # Process tag styles
+    #
+    # @param element_styles [String] extra styles to apply to the element
+    def process_styles(element_styles: nil)
+      attrs.merge_text_styles!(tag_styles, options: options) if respond_to?(:tag_styles)
+      attrs.merge_text_styles!(element_styles, options: options) if element_styles
+      attrs.merge_text_styles!(attrs.style, options: options)
+      attrs.merge_text_styles!(extra_styles, options: options) if respond_to?(:extra_styles)
+    end
+
     # Styles to apply on tag closing
     #
     # @return [Hash] hash of styles to apply
@@ -45,13 +60,6 @@ module PrawnHtml
       styles.slice(*Attributes::STYLES_APPLY[:tag_close])
     end
 
-    # Styles hash
-    #
-    # @return [Hash] hash of styles
-    def styles
-      attrs.styles
-    end
-
     # Styles to apply on tag opening
     #
     # @return [Hash] hash of styles to apply
@@ -77,10 +85,6 @@ module PrawnHtml
 
     private
 
-    def process_styles(element_styles, inline_styles)
-      attrs.merge_text_styles!(tag_styles) if respond_to?(:tag_styles)
-      attrs.merge_text_styles!(element_styles)
-      attrs.merge_text_styles!(inline_styles)
-    end
+    attr_reader :options
   end
 end

data/lib/prawn_html/tags/a.rb

@@ -5,8 +5,15 @@ module PrawnHtml
     class A < Tag
       ELEMENTS = [:a].freeze
 
+      def extra_styles
+        attrs.href ? "href: #{attrs.href}" : nil
+      end
+
       def tag_styles
-        "href: #{attrs.href}" if attrs.href
+        <<~STYLES
+          color: #00E;
+          text-decoration: underline;
+        STYLES
       end
     end
   end

data/lib/prawn_html/tags/blockquote.rb

@@ -5,9 +5,9 @@ module PrawnHtml
     class Blockquote < Tag
       ELEMENTS = [:blockquote].freeze
 
-      MARGIN_BOTTOM = 10
-      MARGIN_LEFT = 25
-      MARGIN_TOP = 10
+      MARGIN_BOTTOM = 12.7
+      MARGIN_LEFT = 40.4
+      MARGIN_TOP = 12.7
 
       def block?
         true

data/lib/prawn_html/tags/body.rb

@@ -4,6 +4,10 @@ module PrawnHtml
   module Tags
     class Body < Tag
       ELEMENTS = [:body].freeze
+
+      def block?
+        true
+      end
     end
   end
 end

data/lib/prawn_html/tags/br.rb

@@ -5,14 +5,14 @@ module PrawnHtml
     class Br < Tag
       ELEMENTS = [:br].freeze
 
-      BR_SPACING = Utils.convert_size('12')
+      BR_SPACING = Utils.convert_size('17')
 
       def block?
         true
       end
 
       def custom_render(pdf, context)
-        return if context.last_text_node
+        return if context.last_text_node || !context.previous_tag.is_a?(Br)
 
         pdf.advance_cursor(BR_SPACING)
       end

data/lib/prawn_html/tags/code.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Code < Tag
+      ELEMENTS = [:code].freeze
+
+      def tag_styles
+        'font-family: Courier'
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/del.rb

@@ -6,7 +6,7 @@ module PrawnHtml
       ELEMENTS = [:del, :s].freeze
 
       def tag_styles
-        'callback: StrikeThrough'
+        'text-decoration: line-through'
       end
     end
   end

data/lib/prawn_html/tags/h.rb

@@ -6,30 +6,30 @@ module PrawnHtml
       ELEMENTS = [:h1, :h2, :h3, :h4, :h5, :h6].freeze
 
       MARGINS_TOP = {
-        h1: 25.5,
+        h1: 25,
         h2: 20.5,
-        h3: 19,
-        h4: 20,
+        h3: 18,
+        h4: 21.2,
         h5: 21.2,
-        h6: 23.5
+        h6: 22.8
       }.freeze
 
       MARGINS_BOTTOM = {
-        h1: 18.2,
-        h2: 17.5,
-        h3: 17.5,
-        h4: 22,
-        h5: 22,
-        h6: 26.5
+        h1: 15.8,
+        h2: 15.8,
+        h3: 15.8,
+        h4: 20,
+        h5: 21.4,
+        h6: 24.8
       }.freeze
 
       SIZES = {
-        h1: 31,
-        h2: 23.5,
-        h3: 18.2,
-        h4: 16,
+        h1: 31.5,
+        h2: 24,
+        h3: 18.7,
+        h4: 15.7,
         h5: 13,
-        h6: 10.5
+        h6: 10.8
       }.freeze
 
       def block?

data/lib/prawn_html/tags/img.rb

@@ -12,16 +12,17 @@ module PrawnHtml
       def custom_render(pdf, context)
         parsed_styles = Attributes.parse_styles(attrs.style)
         block_styles = context.block_styles
-        evaluated_styles = evaluate_styles(pdf, block_styles.merge(parsed_styles))
+        evaluated_styles = adjust_styles(pdf, block_styles.merge(parsed_styles))
         pdf.image(@attrs.src, evaluated_styles)
       end
 
       private
 
-      def evaluate_styles(pdf, img_styles)
+      def adjust_styles(pdf, img_styles)
         {}.tap do |result|
-          result[:width] = Utils.convert_size(img_styles['width'], pdf.bounds.width) if img_styles.include?('width')
-          result[:height] = Utils.convert_size(img_styles['height'], pdf.bounds.height) if img_styles.include?('height')
+          w, h = img_styles['width'], img_styles['height']
+          result[:width] = Utils.convert_size(w, options: pdf.page_width) if w
+          result[:height] = Utils.convert_size(h, options: pdf.page_height) if h
           result[:position] = img_styles[:align] if %i[left center right].include?(img_styles[:align])
         end
       end

data/lib/prawn_html/tags/li.rb

@@ -5,6 +5,9 @@ module PrawnHtml
     class Li < Tag
       ELEMENTS = [:li].freeze
 
+      INDENT_OL = -12
+      INDENT_UL = -6
+
       def block?
         true
       end
@@ -13,9 +16,21 @@ module PrawnHtml
         @counter ? "#{@counter}. " : "#{@symbol} "
       end
 
+      def block_styles
+        super.tap do |bs|
+          bs[:indent_paragraphs] = @indent
+        end
+      end
+
       def on_context_add(_context)
-        @counter = (parent.counter += 1) if parent.is_a? Ol
-        @symbol = parent.styles[:list_style_type] || '&bullet;' if parent.is_a? Ul
+        case parent.class.to_s
+        when 'PrawnHtml::Tags::Ol'
+          @indent = INDENT_OL
+          @counter = (parent.counter += 1)
+        when 'PrawnHtml::Tags::Ul'
+          @indent = INDENT_UL
+          @symbol = parent.styles[:list_style_type] || '&bullet;'
+        end
       end
     end
   end

data/lib/prawn_html/tags/mark.rb

@@ -6,7 +6,7 @@ module PrawnHtml
       ELEMENTS = [:mark].freeze
 
       def tag_styles
-        'callback: Highlight'
+        'background: #ff0'
       end
     end
   end

data/lib/prawn_html/tags/ol.rb

@@ -5,21 +5,38 @@ module PrawnHtml
     class Ol < Tag
       ELEMENTS = [:ol].freeze
 
-      MARGIN_LEFT = 25
+      MARGIN_TOP = 15
+      MARGIN_LEFT = 40
+      MARGIN_BOTTOM = 15
 
       attr_accessor :counter
 
-      def initialize(tag, attributes: {}, element_styles: '')
+      def initialize(tag, attributes: {}, options: {})
         super
         @counter = 0
+        @first_level = false
       end
 
       def block?
         true
       end
 
+      def on_context_add(context)
+        return if context.map(&:tag).count { |el| el == :ol } > 1
+
+        @first_level = true
+      end
+
       def tag_styles
-        "margin-left: #{MARGIN_LEFT}px"
+        if @first_level
+          <<~STYLES
+            margin-top: #{MARGIN_TOP}px;
+            margin-left: #{MARGIN_LEFT}px;
+            margin-bottom: #{MARGIN_BOTTOM}px;
+          STYLES
+        else
+          "margin-left: #{MARGIN_LEFT}px"
+        end
       end
     end
   end

data/lib/prawn_html/tags/p.rb

@@ -5,8 +5,8 @@ module PrawnHtml
     class P < Tag
       ELEMENTS = [:p].freeze
 
-      MARGIN_BOTTOM = 6
-      MARGIN_TOP = 6
+      MARGIN_BOTTOM = 12.5
+      MARGIN_TOP = 12.5
 
       def block?
         true

data/lib/prawn_html/tags/pre.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Pre < Tag
+      ELEMENTS = [:pre].freeze
+
+      MARGIN_BOTTOM = 14
+      MARGIN_TOP = 14
+
+      def block?
+        true
+      end
+
+      def tag_styles
+        <<~STYLES
+          font-family: Courier;
+          margin-bottom: #{MARGIN_BOTTOM}px;
+          margin-top: #{MARGIN_TOP}px;
+          white-space: pre;
+        STYLES
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/small.rb

@@ -5,10 +5,10 @@ module PrawnHtml
     class Small < Tag
       ELEMENTS = [:small].freeze
 
-      def update_styles(styles)
-        size = (styles[:size] || Context::DEF_FONT_SIZE) * 0.85
-        styles[:size] = size
-        styles
+      def update_styles(context_styles)
+        size = (context_styles[:size] || Context::DEFAULT_STYLES[:size]) * 0.85
+        context_styles[:size] = size
+        super(context_styles)
       end
     end
   end

data/lib/prawn_html/tags/sub.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Sub < Tag
+      ELEMENTS = [:sub].freeze
+
+      def tag_styles
+        'vertical-align: sub'
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/sup.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Sup < Tag
+      ELEMENTS = [:sup].freeze
+
+      def tag_styles
+        'vertical-align: super'
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/ul.rb

@@ -5,14 +5,35 @@ module PrawnHtml
     class Ul < Tag
       ELEMENTS = [:ul].freeze
 
-      MARGIN_LEFT = 25
+      MARGIN_TOP = 15
+      MARGIN_LEFT = 40
+      MARGIN_BOTTOM = 15
+
+      def initialize(tag, attributes: {}, options: {})
+        super
+        @first_level = false
+      end
 
       def block?
         true
       end
 
+      def on_context_add(context)
+        return if context.map(&:tag).count { |el| el == :ul } > 1
+
+        @first_level = true
+      end
+
       def tag_styles
-        "margin-left: #{MARGIN_LEFT}px"
+        if @first_level
+          <<~STYLES
+            margin-top: #{MARGIN_TOP}px;
+            margin-left: #{MARGIN_LEFT}px;
+            margin-bottom: #{MARGIN_BOTTOM}px;
+          STYLES
+        else
+          "margin-left: #{MARGIN_LEFT}px"
+        end
       end
     end
   end

data/lib/prawn_html/utils.rb

@@ -5,9 +5,29 @@ module PrawnHtml
     NORMALIZE_STYLES = {
       'bold' => :bold,
       'italic' => :italic,
+      'sub' => :subscript,
+      'super' => :superscript,
       'underline' => :underline
     }.freeze
 
+    # Setup a background callback
+    #
+    # @param value [String] HTML string color
+    #
+    # @return [Array] callback name and argument value
+    def callback_background(value, options: nil)
+      ['Background', convert_color(value, options: options)]
+    end
+
+    # Setup a strike through callback
+    #
+    # @param value [String] unused
+    #
+    # @return [Array] callback name and argument value
+    def callback_strike_through(value, options: nil)
+      ['StrikeThrough', nil]
+    end
+
     # Converts a color string
     #
     # Supported formats:
@@ -19,7 +39,7 @@ module PrawnHtml
     # @param value [String] HTML string color
     #
     # @return [String] adjusted string color or nil if value is invalid
-    def convert_color(value)
+    def convert_color(value, options: nil)
       val = value.to_s.strip.downcase
       return Regexp.last_match[1] if val.match /\A#([a-f0-9]{6})\Z/ # rubocop:disable Performance/RedundantMatch
 
@@ -40,7 +60,7 @@ module PrawnHtml
     # @param value [String] string decimal
     #
     # @return [Float] converted and rounded float number
-    def convert_float(value)
+    def convert_float(value, options: nil)
       val = value&.gsub(/[^0-9.]/, '') || ''
       val.to_f.round(4)
     end
@@ -48,14 +68,14 @@ module PrawnHtml
     # Converts a size string
     #
     # @param value [String] size string
-    # @param container_size [Numeric] container size
+    # @param options [Numeric] container size
     #
     # @return [Float] converted and rounded size
-    def convert_size(value, container_size = nil)
+    def convert_size(value, options: nil)
       val = value&.gsub(/[^0-9.]/, '') || ''
       val =
-        if container_size && value.include?('%')
-          val.to_f * container_size * 0.01
+        if options && value&.include?('%')
+          val.to_f * options * 0.01
         else
           val.to_f * PrawnHtml::PX
         end
@@ -67,7 +87,7 @@ module PrawnHtml
     # @param value [String] string
     #
     # @return [Symbol] symbol
-    def convert_symbol(value)
+    def convert_symbol(value, options: nil)
       value.to_sym if value && !value.match?(/\A\s*\Z/)
     end
 
@@ -76,18 +96,20 @@ module PrawnHtml
     # @param value
     #
     # @return value
-    def copy_value(value)
+    def copy_value(value, options: nil)
       value
     end
 
     # 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
@@ -95,13 +117,13 @@ module PrawnHtml
     # @param value [String] string
     #
     # @return [String] string without quotes at the beginning/ending
-    def unquote(value)
+    def unquote(value, options: nil)
       (value&.strip || +'').tap do |val|
         val.gsub!(/\A['"]|["']\Z/, '')
       end
     end
 
-    module_function :convert_color, :convert_float, :convert_size, :convert_symbol, :copy_value, :normalize_style,
-                    :unquote
+    module_function :callback_background, :callback_strike_through, :convert_color, :convert_float, :convert_size,
+                    :convert_symbol, :copy_value, :normalize_style, :unquote
   end
 end

data/lib/prawn_html/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrawnHtml # :nodoc:
-  VERSION = '0.4.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.4.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -48,7 +48,7 @@ files:
 - README.md
 - lib/prawn-html.rb
 - lib/prawn_html/attributes.rb
-- lib/prawn_html/callbacks/highlight.rb
+- lib/prawn_html/callbacks/background.rb
 - lib/prawn_html/callbacks/strike_through.rb
 - lib/prawn_html/context.rb
 - lib/prawn_html/document_renderer.rb
@@ -60,6 +60,7 @@ files:
 - lib/prawn_html/tags/blockquote.rb
 - lib/prawn_html/tags/body.rb
 - lib/prawn_html/tags/br.rb
+- lib/prawn_html/tags/code.rb
 - lib/prawn_html/tags/del.rb
 - lib/prawn_html/tags/div.rb
 - lib/prawn_html/tags/h.rb
@@ -70,8 +71,11 @@ files:
 - lib/prawn_html/tags/mark.rb
 - lib/prawn_html/tags/ol.rb
 - lib/prawn_html/tags/p.rb
+- lib/prawn_html/tags/pre.rb
 - lib/prawn_html/tags/small.rb
 - lib/prawn_html/tags/span.rb
+- lib/prawn_html/tags/sub.rb
+- lib/prawn_html/tags/sup.rb
 - lib/prawn_html/tags/u.rb
 - lib/prawn_html/tags/ul.rb
 - lib/prawn_html/utils.rb