Merge pull request #27 from blocknotes/fix-some-elements-rendering

Improve elements rendering

Author: blocknotes

.rubocop.yml

@@ -29,7 +29,7 @@ Naming/MethodParameterName:
 
 RSpec/ExampleLength:
   # default: 5
-  Max: 10
+  Max: 15
 
 RSpec/MultipleMemoizedHelpers:
   # default: 5

examples/headings.pdf

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module PrawnHtml
-  PX = 0.66 # conversion constant for pixel sixes
+  PX = 0.6 # conversion constant for pixel sixes
 
   COLORS = {
     'aliceblue' => 'f0f8ff',

examples/misc_elements.pdf

@@ -2,15 +2,17 @@
 
 module PrawnHtml
   class Context < Array
-    DEF_FONT_SIZE = 10.3
+    DEF_FONT_SIZE = 16 * PX
 
+    attr_reader :previous_tag
     attr_accessor :last_text_node
 
     # Init the Context
     def initialize(*_args)
       super
       @last_text_node = false
       @merged_styles = nil
+      @previous_tag = nil
     end
 
     # Add an element to the context
@@ -60,8 +62,10 @@ def merged_styles
 
     # 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.tag
       pop
     end
 

examples/random_content.pdf

@@ -113,9 +113,9 @@ def prepare_text(content)
     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(buffer, options, 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)
@@ -126,6 +126,12 @@ def apply_callbacks(buffer)
       end
     end
 
+    def adjust_leading(buffer, leading)
+      return leading if leading
+
+      (buffer.map { |item| item[:size] || Context::DEF_FONT_SIZE }.max * 0.055).round(4)
+    end
+
     def bounds(buffer, options, block_styles)
       return unless block_styles[:position] == :absolute
 

examples/styles.pdf

@@ -106,12 +106,12 @@ def image(src, options = {})
     # @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
@@ -130,5 +130,12 @@ def underline(x1:, x2:, y:)
     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

lib/prawn-html.rb

@@ -6,7 +6,13 @@ class A < Tag
       ELEMENTS = [:a].freeze
 
       def tag_styles
-        "href: #{attrs.href}" if attrs.href
+        return unless attrs.href
+
+        <<~STYLES
+          color: #00E;
+          href: #{attrs.href};
+          text-decoration: underline;
+        STYLES
       end
     end
   end