prawn-markup 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 17db8afa6a062ac1cac8322276b7f013e2d9ba7c
-  data.tar.gz: 03a009820c6851a0d06ca2812487757e1a142056
+SHA256:
+  metadata.gz: fcd47aaef564239231b4546e4122f9f15625c15de5aa3d91bf0e3933e62d46ce
+  data.tar.gz: 77d0fa0b0b8261d6e3c0a8b7df75f797b31914c761c32dc229ba93edf269a587
 SHA512:
-  metadata.gz: b9d20fb86722b5ade3804c648116b84e3d423b39a3ffcdeadd2340b6b5d886e1ba80a98fa0a570bf1b448d2e0f1a88058781ccf5330cb6f9c218e7c8467da770
-  data.tar.gz: 8fdce13e68ce84ccbace42d051ffc5d66f3888ad9094af6aa79abc62a0251e386088ccc81e627dc0a3be67ef746c5d6e82575af4455f14121cf50ec3d89a54f6
+  metadata.gz: 395187b2fe33613d41bb9f4ac89f9b370cff0ac2a01212c96d5c88eea57e88a255e93a44e519f723b0955b468eb4896da06b7094ba3aa046302ab6733f3b8e6a
+  data.tar.gz: fd2c752f5eb61d1029371a4d2cd2476168476696d464853ba288ca263b6a8c903cb367a8f29dbc104f8e2d809b1f7cca02c779e863e9bd10385849be283d51db

data/README.md

@@ -33,6 +33,27 @@ doc = Prawn::Document.new
 doc.markup('<p>Hello World</p><hr/><p>KTHXBYE</p>')
 ```
 
+## Supported HTML
+
+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`
+* 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`.
+
+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`.
+
+## Example
+
+Have a look at [showcase.html](spec/fixtures/showcase.html), which is rendered by the corresponding [spec](spec/prawn/markup/showcase_spec.rb). Uncomment the `lookatit` call there to directly open the generated PDF when running the spec with `spec spec/prawn/markup/showcase_spec.rb`.
+
+## Formatting Options
+
 To customize element formatting, do:
 
 ```ruby
@@ -46,44 +67,48 @@ doc.markup_options = {
 doc.markup('<p>Hello World</p><hr/><p>KTHXBYE</p>', text: { align: :center })
 ```
 
-Options may be set for `text`, `table` (`cell` and `header`) and `list` (`content` and `bullet`).
+Options may be set for `text`, `heading[1-6]`, `table` (subkeys `cell` and `header`) and `list` (subkeys `content` and `bullet`).
 
-Text 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](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`.
 
 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.
 
 Beside these options handled by Prawn / prawn-table, the following values may be customized:
 
-* `[:text][:preprocessor]`: A proc/callable that is called each time before a chunk of text is rendered.
-* `[:text][:margin_bottom]`: Margin after each `<p>`, `<ol>`, `<ul>` or `<table>`. Defaults to about half a line.
-* `[:heading1-6][:margin_top]`: Margin before a heading. Default is 0.
-* `[:heading1-6][:margin_bottom]`: Margin after a heading. Default is 0.
-* `[:table][:placeholder][:too_large]`: If the table content does not fit into the current bounding box, this text/callable is rendered instead. Defaults to '[table content too large]'.
-* `[:table][:placeholder][:subtable_too_large]`: If the content of a subtable cannot be fitted into the table, this text is rendered instead. Defaults to '[nested tables with automatic width are not supported]'.
-* `[:list][:vertical_margin]`: Margin at the top and the bottom of a list. Default is 5.
-* `[:list][:bullet][:char]`: The text used as bullet in unordered lists. Default is '•'.
-* `[:list][:bullet][:margin]`: Margin before the bullet. Default is 10.
-* `[:list][:content][:margin]`: Margin between the bullet and the content. Default is 10.
-* `[:list][:placeholder][:too_large]`: If the list content does not fit into the current bounding box, this text/callable is rendered instead. Defaults to '[list content too large]'.
-* `[:image][:loader]`: A callable that accepts the `src` attribute as an argument an returns a value understood by Prawn's `image` method. Loads `http(s)` URLs and base64 encoded data URIs by default.
-* `[:image][:placeholder]`: If an image is not supported, this text/callable is rendered instead. Defaults to '[unsupported image]'.
-* `[:iframe][:placeholder]`: If the HTML contains IFrames, this text/callable is rendered instead.
-A callable gets the URL of the IFrame as an argument. Defaults to ignore iframes.
-
-## Supported HTML
-
-This gem parses the given HTML and layouts the following elements in a vertical order:
-
-* Text content: `p`, `div`, `ol`, `ul`, `li`, `hr`
-* Text semantics: `b`, `strong`, `i`, `em`, `u`, `a`, `br`
-* Headings: `h1`, `h2`, `h3`, `h4`, `h5`, `h6`
-* Tables: `table`, `tr`, `td`, `th`
-* Media: `img`, `iframe`
-
-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`.
-
-If no explicit loader is given (see above), images are loaded from `http(s)` addresses are may be contained in the `src` attribute as base64 encoded data URIs. Prawn only supports `PNG` and `JPG`.
-
+* `: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.
+* `:heading1-6`
+  * `:margin_top`: Margin before a heading. Default is 0.
+  * `:margin_bottom`: Margin after a heading. Default is 0.
+* `:table`
+  * `:placeholder`
+    * `:too_large`: If the table content does not fit into the current bounding box, this text/callable is rendered instead. Defaults to '[table content too large]'.
+    * `:subtable_too_large`: If the content of a subtable cannot be fitted into the table, this text is rendered instead. Defaults to '[nested tables with automatic width are not supported]'.
+* `:list`
+  * `:vertical_margin`: Margin at the top and the bottom of a list. Default is 5.
+  * `:bullet`
+    * `:char`: The text used as bullet in unordered lists. Default is '•'.
+    * `:margin`: Margin before the bullet. Default is 10.
+  * `:content`
+    * `:margin`: Margin between the bullet and the content. Default is 10.
+  * `:placeholder`
+    * `:too_large`: If the list content does not fit into the current bounding box, this text/callable is rendered instead. Defaults to '[list content too large]'.
+* `:image`
+  * `:loader`: A callable that accepts the `src` attribute as an argument an returns a value understood by Prawn's `image` method. Loads `http(s)` URLs and base64 encoded data URIs by default.
+  * `:placeholder`: If an image is not supported, this text/callable is rendered instead. Defaults to '[unsupported image]'.
+* `:iframe`
+  * `:placeholder`: If the HTML contains IFrames, this text/callable is rendered instead.
+  A callable gets the URL of the IFrame as an argument. Defaults to ignore iframes.
+* `:input`
+  * `:symbol_font`: A special font to print checkboxes and radios. Prawn's standard fonts do not support special unicode characters. Do not forget to update the document's `font_families`.
+  * `:symbol_font_size`: The size of the special font to print checkboxes and radios.
+  * `:checkbox`
+    * `:checked`: The char to print for a checked checkbox. Default is '☑'.
+    * `:unchecked`: The char to print for an unchecked checkbox. Default is '☐'.
+  * `:radio`
+    * `:checked`: The char to print for a checked radio. Default is '◉'.
+    * `:unchecked`: The char to print for an unchecked radio. Default is '○'.
 
 ## Development
 

data/lib/prawn/markup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'prawn'
 require 'prawn/measurement_extensions'
 require 'prawn/table'

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Builders
       class ListBuilder < NestableBuilder
-        BULLET_CHAR = '•'.freeze
+        BULLET_CHAR = '•'
         BULLET_MARGIN = 10
         CONTENT_MARGIN = 10
         VERTICAL_MARGIN = 5
@@ -22,7 +24,10 @@ module Prawn
         end
 
         def draw
-          make(true).draw
+          # fix https://github.com/prawnpdf/prawn-table/issues/120
+          pdf.font_size(column_cell_style(:content)[:size] || pdf.font_size) do
+            make(true).draw
+          end
         end
 
         private
@@ -65,7 +70,7 @@ module Prawn
           data = item.nodes.map { |n| [normalize_list_item_node(n)] }
           style = column_cell_style(:content)
                   .merge(borders: [], padding: [0, 0, padding_bottom, 0])
-          pdf.make_table(data, cell_style: style) do
+          pdf.make_table(data, cell_style: style, column_widths: [content_width]) do
             rows(-1).padding = [0, 0, 0, 0]
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Builders
@@ -47,10 +49,12 @@ module Prawn
         def extract_text_cell_style(hash)
           TEXT_STYLE_OPTIONS
             .each_with_object({}) { |key, h| h[key] = hash[key] }
-            .tap do |options|
-            options[:font_style] ||= options.delete(:style)
-            options[:text_color] ||= options.delete(:color)
-          end
+            .tap { |options| convert_style_options(options) }
+        end
+
+        def convert_style_options(hash)
+          hash[:font_style] ||= hash.delete(:style)
+          hash[:text_color] ||= hash.delete(:color)
         end
 
         def type_key(object)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Builders
@@ -20,7 +22,10 @@ module Prawn
         end
 
         def draw
-          make.draw
+          # fix https://github.com/prawnpdf/prawn-table/issues/120
+          pdf.font_size(table_options[:cell][:size] || pdf.font_size) do
+            make.draw
+          end
         rescue Prawn::Errors::CannotFit => e
           if failover_on_error
             draw
@@ -169,7 +174,8 @@ module Prawn
 
         def distribute_remaing_width(count)
           equal_width = (total_width - column_width_sum) / count.to_f
-          return if equal_width < 0
+          return if equal_width.negative?
+
           column_widths.map! { |width| width || equal_width }
         end
 
@@ -230,11 +236,6 @@ module Prawn
           convert_style_options(opts[:header])
         end
 
-        def convert_style_options(hash)
-          hash[:font_style] ||= hash.delete(:style)
-          hash[:text_color] ||= hash.delete(:color)
-        end
-
         def default_table_options
           {
             cell: {

data/lib/prawn/markup/elements/cell.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Elements

data/lib/prawn/markup/elements/item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Elements

data/lib/prawn/markup/elements/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Elements

data/lib/prawn/markup/interface.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Interface

data/lib/prawn/markup/processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     # Processes known HTML tags. Unknown tags are ignored.
@@ -21,34 +23,38 @@ module Prawn
       self.logger = defined?(Rails) ? Rails.logger : nil
 
       require 'prawn/markup/processor/text'
+      require 'prawn/markup/processor/blocks'
       require 'prawn/markup/processor/headings'
       require 'prawn/markup/processor/images'
+      require 'prawn/markup/processor/inputs'
       require 'prawn/markup/processor/tables'
       require 'prawn/markup/processor/lists'
 
       prepend Prawn::Markup::Processor::Text
+      prepend Prawn::Markup::Processor::Blocks
       prepend Prawn::Markup::Processor::Headings
       prepend Prawn::Markup::Processor::Images
+      prepend Prawn::Markup::Processor::Inputs
       prepend Prawn::Markup::Processor::Tables
       prepend Prawn::Markup::Processor::Lists
 
       def initialize(pdf, options = {})
+        super()
         @pdf = pdf
         @options = options
       end
 
       def parse(html)
         return if html.to_s.strip.empty?
+
         reset
         html = Prawn::Markup::Normalizer.new(html).normalize
         Nokogiri::HTML::SAX::Parser.new(self).parse(html) { |ctx| ctx.recovery = true }
       end
 
       def start_element(name, attrs = [])
-        stack.push(name: name, attrs: Hash[attrs])
-        if self.class.known_elements.include?(name)
-          send("start_#{name}") if respond_to?("start_#{name}", true)
-        end
+        stack.push(name: name, attrs: attrs.to_h)
+        send("start_#{name}") if known_element?(name) && respond_to?("start_#{name}", true)
       end
 
       def end_element(name)
@@ -62,11 +68,11 @@ module Prawn
       end
 
       def error(string)
-        logger.debug('SAX parsing error: ' + string) if logger
+        logger.info("SAX parsing error: #{string.strip}") if logger
       end
 
       def warning(string)
-        logger.warn(string) if logger
+        logger.info("SAX parsing warning: #{string.strip}") if logger
       end
 
       private
@@ -75,7 +81,11 @@ module Prawn
 
       def reset
         @stack = []
-        @text_buffer = ''
+        @text_buffer = +''
+      end
+
+      def known_element?(name)
+        self.class.known_elements.include?(name)
       end
 
       def append_text(string)
@@ -115,15 +125,14 @@ module Prawn
       def style_properties
         style = current_attrs['style']
         if style
-          tokens = style.split(';').map { |p| p.split(':', 2).map(&:strip) }
-          Hash[tokens]
+          style.split(';').map { |p| p.split(':', 2).map(&:strip) }.to_h
         else
           {}
         end
       end
 
       def placeholder_value(keys, *args)
-        placeholder = dig_options(keys)
+        placeholder = dig_options(*keys)
         return if placeholder.nil?
 
         if placeholder.respond_to?(:call)
@@ -133,7 +142,7 @@ module Prawn
         end
       end
 
-      def dig_options(keys)
+      def dig_options(*keys)
         keys.inject(options) { |opts, key| opts ? opts[key] : nil }
       end
 

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

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+module Prawn
+  module Markup
+    module Processor::Blocks
+      def self.prepended(base)
+        base.known_elements.push('p', 'br', 'div', 'hr')
+      end
+
+      def start_br
+        append_text("\n")
+      end
+
+      def start_p
+        handle_text_element
+      end
+
+      def end_p
+        if inside_container?
+          append_new_line
+          append_text("\n")
+        else
+          add_paragraph
+        end
+      end
+
+      def start_div
+        handle_text_element
+      end
+
+      def end_div
+        handle_text_element
+      end
+
+      def start_hr
+        return if inside_container?
+
+        put_bottom_margin(nil)
+        add_current_text
+        pdf.move_down(hr_vertical_margin_top)
+        pdf.stroke_horizontal_rule
+        pdf.move_down(hr_vertical_margin_bottom)
+      end
+
+      def end_document
+        add_current_text
+      end
+
+      private
+
+      def handle_text_element
+        if inside_container?
+          append_new_line
+        else
+          add_current_text
+        end
+      end
+
+      def append_new_line
+        append_text("\n") if buffered_text? && text_buffer[-1] != "\n"
+      end
+
+      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
+      end
+
+      def add_current_text(options = text_options)
+        add_bottom_margin
+        return unless buffered_text?
+
+        string = dump_text
+        string.strip!
+        add_formatted_text(string, options)
+      end
+
+      def add_bottom_margin
+        if @bottom_margin
+          pdf.move_down(@bottom_margin)
+          @bottom_margin = nil
+        end
+      end
+
+      def add_formatted_text(string, options = text_options)
+        with_font(options) do
+          pdf.text(string, options)
+        end
+      end
+
+      def with_font(options)
+        pdf.font(options[:font] || pdf.font.family,
+                 size: options[:size],
+                 style: options[:style]) do
+          return yield
+        end
+      end
+
+      def hr_vertical_margin_top
+        @hr_vertical_margin_top ||=
+          (text_options[:size] || pdf.font_size) / 2.0
+      end
+
+      def hr_vertical_margin_bottom
+        @hr_vertical_margin_bottom ||= with_font(text_options) do
+          hr_vertical_margin_top +
+            pdf.font.descender +
+            text_leading -
+            pdf.line_width
+        end
+      end
+
+      def reset
+        super
+        text_margin_bottom # pre-calculate
+      end
+
+      def text_margin_bottom
+        options[:text] ||= {}
+        options[:text][:margin_bottom] ||= default_text_margin_bottom
+      end
+
+      def default_text_margin_bottom
+        text_line_gap +
+          text_descender +
+          text_leading
+      end
+
+      def text_line_gap
+        @text_line_gap ||= with_font(text_options) { pdf.font.line_gap }
+      end
+
+      def text_descender
+        @text_descender ||= with_font(text_options) { pdf.font.descender }
+      end
+
+      def text_leading
+        text_options[:leading] || pdf.default_leading
+      end
+
+      def text_options
+        @text_options ||= HashMerger.deep(default_text_options, options[:text] || {})
+      end
+
+      def default_text_options
+        {
+          inline_format: true
+        }
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Processor::Headings

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 
 module Prawn

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Prawn
+  module Markup
+    module Processor::Inputs
+
+      DEFAULT_CHECKABLE_CHARS = {
+        checkbox: {
+          checked: '☑',
+          unchecked: '☐'
+        },
+        radio: {
+          checked: '◉',
+          unchecked: '○'
+        }
+      }.freeze
+
+      def self.prepended(base)
+        base.known_elements.push('input')
+      end
+
+      def start_input
+        type = current_attrs['type'].to_sym
+        if DEFAULT_CHECKABLE_CHARS.keys.include?(type)
+          append_checked_symbol(type)
+        end
+      end
+
+      private
+
+      def append_checked_symbol(type)
+        char = checkable_symbol(type)
+        append_text(build_font_tag(char))
+      end
+
+      def checkable_symbol(type)
+        state = current_attrs.key?('checked') ? :checked : :unchecked
+        dig_options(:input, type, state) || DEFAULT_CHECKABLE_CHARS[type][state]
+      end
+
+      def symbol_font_options
+        @symbol_font_options ||= {
+          name: dig_options(:input, :symbol_font),
+          size: dig_options(:input, :symbol_font_size)
+        }.compact
+      end
+
+      def build_font_tag(content)
+        return content if symbol_font_options.empty?
+
+        out = +'<font'
+        symbol_font_options.each do |key, value|
+          out << " #{key}=\"#{value}\""
+        end
+        out << '>'
+        out << content
+        out << '</font>'
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Processor::Lists
@@ -32,10 +34,14 @@ module Prawn
       alias end_ul end_list
 
       def start_li
+        return unless inside_container?
+
         current_list.items << Elements::Item.new
       end
 
       def end_li
+        return unless inside_container?
+
         add_cell_text_node(current_list_item)
       end
 
@@ -61,7 +67,9 @@ module Prawn
       end
 
       def current_list_item
-        current_list.items.last
+        items = current_list.items
+        items << Elements::Item.new if items.empty?
+        items.last
       end
 
       def inside_container?
@@ -81,12 +89,17 @@ module Prawn
       end
 
       def add_list(list)
-        Builders::ListBuilder.new(pdf, list, pdf.bounds.width, options).draw
-        put_bottom_margin(text_margin_bottom)
+        pdf.move_up(additional_cell_padding_top)
+        draw_list(list)
+        put_bottom_margin(text_margin_bottom + additional_cell_padding_top)
       rescue Prawn::Errors::CannotFit => e
         append_text(list_too_large_placeholder(e))
       end
 
+      def draw_list(list)
+        Builders::ListBuilder.new(pdf, list, pdf.bounds.width, options).draw
+      end
+
       def list_too_large_placeholder(error)
         placeholder_value(%i[list placeholder too_large], error) || '[list content too large]'
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Processor::Tables
@@ -26,19 +28,29 @@ module Prawn
       end
 
       def start_tr
+        return unless current_table
+
         current_table << []
       end
 
       def start_td
+        return unless current_table
+
         current_table.last << Elements::Cell.new(width: style_properties['width'])
       end
 
       def start_th
+        return unless current_table
+
         current_table.last << Elements::Cell.new(width: style_properties['width'], header: true)
       end
 
       def end_td
-        add_cell_text_node(current_cell)
+        if current_table
+          add_cell_text_node(current_cell)
+        else
+          add_current_text
+        end
       end
       alias end_th end_td
 
@@ -73,6 +85,7 @@ module Prawn
 
       def add_cell_text_node(cell, options = {})
         return unless buffered_text?
+
         cell.nodes << options.merge(content: dump_text.strip)
       end
 
@@ -83,15 +96,24 @@ module Prawn
       end
 
       def add_table(cells)
-        Builders::TableBuilder.new(pdf, cells, pdf.bounds.width, options).draw
-        put_bottom_margin(text_margin_bottom)
+        draw_table(cells)
+        put_bottom_margin(text_margin_bottom + additional_cell_padding_top + text_leading)
       rescue Prawn::Errors::CannotFit => e
         append_text(table_too_large_placeholder(e))
       end
 
+      def draw_table(cells)
+        Builders::TableBuilder.new(pdf, cells, pdf.bounds.width, options).draw
+      end
+
       def table_too_large_placeholder(error)
         placeholder_value(%i[table placeholder too_large], error) || '[table content too large]'
       end
+
+      def additional_cell_padding_top
+        # as used in Prawn::Table::Cell::Text#draw_content move_down
+        (text_line_gap + text_descender) / 2
+      end
     end
   end
 end

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

@@ -1,42 +1,24 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module Processor::Text
       def self.prepended(base)
-        base.known_elements.push('p', 'br', 'div', 'b', 'strong', 'i', 'em', 'u', 'a', 'hr')
-      end
-
-      def start_br
-        append_text("\n")
-      end
-
-      def start_p
-        handle_text_element
-      end
-
-      def end_p
-        if inside_container?
-          append_new_line
-          append_text("\n")
-        else
-          add_paragraph
-        end
-      end
-
-      def start_div
-        handle_text_element
-      end
-
-      def end_div
-        handle_text_element
+        base.known_elements.push(
+          'a', 'b', 'strong', 'i', 'em', 'u', 'strikethrough', 'strike', 's', 'del',
+          'sub', 'sup'
+        )
       end
 
       def start_a
         append_text("<link href=\"#{current_attrs['href']}\">")
       end
+      alias start_link start_a
 
       def end_a
         append_text('</link>')
       end
+      alias end_link end_a
 
       def start_b
         append_text('<b>')
@@ -58,119 +40,44 @@ module Prawn
       end
       alias end_em end_i
 
-      def start_hr
-        return if inside_container?
-
-        put_bottom_margin(nil)
-        add_current_text
-        pdf.move_down(hr_vertical_margin_top)
-        pdf.stroke_horizontal_rule
-        pdf.move_down(hr_vertical_margin_bottom)
+      def start_u
+        append_text('<u>')
       end
 
-      def end_document
-        add_current_text
+      def end_u
+        append_text('</u>')
       end
 
-      private
-
-      def handle_text_element
-        if inside_container?
-          append_new_line
-        else
-          add_current_text
-        end
-      end
-
-      def append_new_line
-        append_text("\n") if buffered_text? && text_buffer[-1] != "\n"
+      def start_strikethrough
+        append_text('<strikethrough>')
       end
+      alias start_s start_strikethrough
+      alias start_strike start_strikethrough
+      alias start_del start_strikethrough
 
-      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
+      def end_strikethrough
+        append_text('</strikethrough>')
       end
+      alias end_s end_strikethrough
+      alias end_strike end_strikethrough
+      alias end_del end_strikethrough
 
-      def add_current_text(options = text_options)
-        add_bottom_margin
-        return unless buffered_text?
-
-        string = dump_text
-        string.strip!
-        add_formatted_text(string, options)
+      def start_sub
+        append_text('<sub>')
       end
 
-      def add_bottom_margin
-        if @bottom_margin
-          pdf.move_down(@bottom_margin)
-          @bottom_margin = nil
-        end
+      def end_sub
+        append_text('</sub>')
       end
 
-      def add_formatted_text(string, options = text_options)
-        with_font(options) do
-          pdf.text(string, options)
-        end
+      def start_sup
+        append_text('<sup>')
       end
 
-      def with_font(options)
-        pdf.font(options[:font] || pdf.font.family,
-                 size: options[:size],
-                 style: options[:style]) do
-          return yield
-        end
+      def end_sup
+        append_text('</sup>')
       end
 
-      def hr_vertical_margin_top
-        @hr_vertical_margin_top ||=
-          (text_options[:size] || pdf.font_size) / 2.0
-      end
-
-      def hr_vertical_margin_bottom
-        @hr_vertical_margin_bottom ||= with_font(text_options) do
-          hr_vertical_margin_top +
-            pdf.font.descender +
-            text_leading -
-            pdf.line_width
-        end
-      end
-
-      def reset
-        super
-        text_margin_bottom # pre-calculate
-      end
-
-      def text_margin_bottom
-        options[:text] ||= {}
-        options[:text][:margin_bottom] ||= default_text_margin_bottom
-      end
-
-      def default_text_margin_bottom
-        with_font(text_options) do
-          pdf.font.line_gap +
-            pdf.font.descender +
-            text_leading
-        end
-      end
-
-      def text_leading
-        text_options[:leading] || pdf.default_leading
-      end
-
-      def text_options
-        @text_options ||= HashMerger.deep(default_text_options, options[:text] || {})
-      end
-
-      def default_text_options
-        {
-          inline_format: true
-        }
-      end
     end
   end
 end

data/lib/prawn/markup/support/hash_merger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     module HashMerger

data/lib/prawn/markup/support/normalizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     # Normalizes HTML markup:
@@ -22,7 +24,7 @@ module Prawn
         close_self_closing_elements
         normalize_spaces
         replace_html_entities
-        "<root>#{html}</root>"
+        "<body>#{html}</body>"
       end
 
       private
@@ -43,6 +45,7 @@ module Prawn
           html.gsub!(/&#{entity};/, string)
         end
       end
+
     end
   end
 end

data/lib/prawn/markup/support/size_converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
     class SizeConverter

data/lib/prawn/markup/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Prawn
   module Markup
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.3.1'
   end
 end

data/prawn-markup.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(((spec|bin)/)|\.|Gemfile|Rakefile)})
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-markup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Pascal Zumkehr
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -159,18 +159,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - lib/prawn/markup.rb
 - lib/prawn/markup/builders/list_builder.rb
 - lib/prawn/markup/builders/nestable_builder.rb
@@ -180,8 +171,10 @@ files:
 - lib/prawn/markup/elements/list.rb
 - lib/prawn/markup/interface.rb
 - lib/prawn/markup/processor.rb
+- lib/prawn/markup/processor/blocks.rb
 - lib/prawn/markup/processor/headings.rb
 - lib/prawn/markup/processor/images.rb
+- lib/prawn/markup/processor/inputs.rb
 - lib/prawn/markup/processor/lists.rb
 - lib/prawn/markup/processor/tables.rb
 - lib/prawn/markup/processor/text.rb
@@ -194,7 +187,7 @@ homepage: https://github.com/puzzle/prawn-markup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,9 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Parse simple HTML markup to include in Prawn PDFs
 test_files: []

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/spec/coverage/
-/tmp/
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,64 +0,0 @@
-AllCops:
-  DisplayCopNames: true
-  Exclude:
-    - '*.gemspec'
-    - spec/**/*
-    - vendor/**/*
-
-Metrics/AbcSize:
-  Severity: error
-
-Metrics/ClassLength:
-  Max: 250
-  Severity: error
-
-Metrics/CyclomaticComplexity:
-  Severity: error
-
-Metrics/LineLength:
-  Max: 100
-  Severity: error
-
-Metrics/MethodLength:
-  Max: 10
-  Severity: error
-
-Metrics/ModuleLength:
-  Max: 150
-  Severity: error
-
-Metrics/ParameterLists:
-  Max: 4
-  Severity: warning
-
-# Keep for now, easier with superclass definitions
-ClassAndModuleChildren:
-  Enabled: false
-
-# The ones we use must exist for the entire class hierarchy.
-ClassVars:
-  Enabled: false
-
-# Well, well, well
-Documentation:
-  Enabled: false
-
-# Keep single line bodys for if and unless
-IfUnlessModifier:
-  Enabled: false
-
-# We thinks that's fine for specs
-Layout/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-# We thinks that's fine
-Layout/EmptyLinesAroundClassBody:
-  Enabled: false
-
-# We thinks that's fine
-Layout/EmptyLinesAroundModuleBody:
-  Enabled: false
-
-# We think that's the developers choice
-Style/GuardClause:
-  Enabled: false

data/.travis.yml

@@ -1,25 +0,0 @@
-sudo: false
-
-language: ruby
-
-rvm:
-  - 2.5.1
-
-env:
-  global:
-    - CC_TEST_REPORTER_ID=d70fe39ffb8f2f7c5f837f0133d10a3a1c6784d0dd189153111577b60f74c603
-
-before_install: gem install bundler
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-script:
-  - bundle exec rake
-  - bundle exec rubocop
-
-after_script:
-  - ./cc-test-reporter format-coverage -t simplecov -o spec/coverage/codeclimate.json spec/coverage/.resultset.json
-  - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage -i spec/coverage/codeclimate.json; fi

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in prawn-markup.gemspec
-gemspec

data/Gemfile.lock

@@ -1,89 +0,0 @@
-PATH
-  remote: .
-  specs:
-    prawn-markup (0.1.0)
-      nokogiri
-      prawn
-      prawn-table
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    Ascii85 (1.0.3)
-    afm (0.2.2)
-    ast (2.4.0)
-    byebug (10.0.2)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    hashery (2.1.2)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
-    mini_portile2 (2.3.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    parallel (1.12.1)
-    parser (2.5.1.2)
-      ast (~> 2.4.0)
-    pdf-core (0.7.0)
-    pdf-inspector (1.3.0)
-      pdf-reader (>= 1.0, < 3.0.a)
-    pdf-reader (2.1.0)
-      Ascii85 (~> 1.0.0)
-      afm (~> 0.2.1)
-      hashery (~> 2.0)
-      ruby-rc4
-      ttfunk
-    powerpack (0.1.2)
-    prawn (2.2.2)
-      pdf-core (~> 0.7.0)
-      ttfunk (~> 1.5)
-    prawn-table (0.2.2)
-      prawn (>= 1.3.0, < 3.0.0)
-    rainbow (3.0.0)
-    rake (12.3.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.58.2)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
-    ruby-rc4 (0.1.5)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    ttfunk (1.5.1)
-    unicode-display_width (1.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  byebug
-  pdf-inspector
-  prawn-markup!
-  rake
-  rspec
-  rubocop
-  simplecov
-
-BUNDLED WITH
-   1.16.2

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'prawn/markup'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here