bookify 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c1c8b6ba5756c03591227c7a7569704c4ba6942a4cf3a394ece903d5ca30f69
-  data.tar.gz: b9e842cf16c742c759eeb7985dfd6ca5ebfecdfc375ede57c81439d55f6b2b5a
+  metadata.gz: 8e07bd5f6f7148fa8711de2c1cf860236e3e3da1dd4fd411246c11b15958ac49
+  data.tar.gz: 2995c7ec5a3fef4fee1d8a837d77d253b99998d7bfb2e6a2465e067b142e9da1
 SHA512:
-  metadata.gz: 00e4d342c7e3cc17d2c671390f6592686f9f2be819956fc7194b840286fd74d37c829911f672dc63602ee1f884806ca26b48063a74ffd452b1ce190e1f0d0cf5
-  data.tar.gz: 1b0a40c88f60ecaf25d44ee1e0acd382de65b3930055d9cbec9c20d804b733386e8e8f9ce425f527fe8d4b6c9d58b14a4089c068a66e94c288a1ff164fa6ce6b
+  metadata.gz: 44b913b44ff68a55071a0fbe5f88f7d8195872b6bc0deb39382d9b095b3a767d8c0b4cc183b80a9e32e001845bb421f5004b63a7189380981a8244ce8b07debe
+  data.tar.gz: ecb58a77471a62ad08a749bef069ae9642b9b318bcd2bb0c232326ec352d33bec34a952abfba672304fc712f0c6a41c27c506caa6cc40e898440892d086c7f81

data/lib/bookify.rb

@@ -6,11 +6,14 @@ require "prawn/table"
 require "redcarpet"
 require "htmlentities"
 
+require_relative "prawn_ext/font_metric_cache"
+
 module Bookify
 end
 
 Dir["#{File.dirname(__FILE__)}/bookify/node/*.rb"].each { |f| require f }
 
+require_relative "bookify/markdown"
 require_relative "bookify/node"
-require_relative "bookify/sections"
 require_relative "bookify/renderer"
+require_relative "bookify/sections"

data/lib/bookify/markdown.rb

@@ -0,0 +1,44 @@
+class Bookify::Markdown < Redcarpet::Render::HTML
+  @@preprocessors = []
+  @@postprocessors = []
+
+  def preprocess(string)
+    Bookify::Markdown.preprocessors.each do |preproc|
+      string = preproc.call(string)
+    end
+
+    string
+  end
+
+  def postprocess(string)
+    Bookify::Markdown.postprocessors.each do |postproc|
+      string = postproc.call(string)
+    end
+
+    string
+  end
+
+  def self.add_preprocessor(preprocessor)
+    @@preprocessors << preprocessor
+  end
+
+  def self.reset_preprocessors
+    @@preprocessors = []
+  end
+
+  def self.preprocessors
+    @@preprocessors
+  end
+
+  def self.add_postprocessor(postprocessor)
+    @@postprocessors << postprocessor
+  end
+
+  def self.reset_postprocessors
+    @@postprocessors = []
+  end
+
+  def self.postprocessors
+    @@postprocessors
+  end
+end

data/lib/bookify/node/base.rb

@@ -3,10 +3,10 @@ module Bookify::Node
     attr_accessor :node, :pdf
 
     FONTS = {
-      h1:      ["Book Antiqua", size: 16, style: :bold],
-      h2:      ["Book Antiqua", size: 12, style: :bold],
-      h3:      ["Book Antiqua", size: 11, style: :bold],
-      h4:      ["Book Antiqua", size: 10, style: :bold],
+      h1: ["Book Antiqua", size: 16, style: :bold],
+      h2: ["Book Antiqua", size: 12, style: :bold],
+      h3: ["Book Antiqua", size: 11, style: :bold],
+      h4: ["Book Antiqua", size: 10, style: :bold],
       primary: ["Book Antiqua", size: 10]
     }
 
@@ -27,12 +27,12 @@ module Bookify::Node
       (element.attr(:class) || "").split(" ")
     end
 
-    def font(name)
-      pdf.font *FONTS[name]
+    def font(name, &block)
+      pdf.font(*FONTS[name], &block)
     end
 
     def clean_html(html)
-      html.gsub(/\n/, "").gsub(/\s+/, " ")
+      html.delete("\n").gsub(/\s+/, " ")
     end
 
     def decode_html(html)

data/lib/bookify/node/h1.rb

@@ -12,8 +12,9 @@ module Bookify::Node
       Bookify::Sections.add(:h1, html, dest)
       add_dest(html, dest)
 
-      font :h1
-      text html, align: :center
+      font :h1 do
+        text html, align: :center
+      end
 
       move_down 10
     end

data/lib/bookify/node/paragraph.rb

@@ -13,9 +13,12 @@ module Bookify::Node
           align: html_classes.include?("center") ? :center : :left
         }
 
-        html = clean_html(node.inner_html.gsub("\n", " "))
-        font :primary
-        text html, options
+        html = clean_html(node.inner_html.tr("\n", " "))
+
+        font :primary do
+          text html, options
+        end
+
         move_down 10
       end
     end

data/lib/bookify/renderer.rb

@@ -1,6 +1,4 @@
 class Bookify::Renderer
-  MARKDOWN_CONVERTER = Redcarpet::Markdown.new(Redcarpet::Render::HTML, tables: true)
-
   attr_accessor :input_file, :output_file, :layout, :columns, :input_text, :column_spacer, :margin, :page_size
 
   def self.from_args(args)
@@ -74,6 +72,10 @@ class Bookify::Renderer
   end
 
   def html
-    @html ||= MARKDOWN_CONVERTER.render(markdown)
+    @html ||= markdown_converter.render(markdown)
+  end
+
+  def markdown_converter
+    Redcarpet::Markdown.new(Bookify::Markdown, tables: true)
   end
 end

data/lib/prawn_ext/font_metric_cache.rb

@@ -0,0 +1,29 @@
+# https://github.com/prawnpdf/prawn/issues/1140
+
+module Prawn
+  class FontMetricCache
+    def width_of(string, options)
+      f = if options[:style]
+        # override style with :style => :bold
+        @document.find_font(@document.font.family, style: options[:style])
+      else
+        @document.font
+      end
+
+      encoded_string = f.normalize_encoding(string)
+
+      key = CacheEntry.new(f.hash, options, encoded_string)
+
+      @cache[key] ||= f.compute_width_of(encoded_string, options)
+
+      length = @cache[key]
+
+      character_count = @document.font.character_count(encoded_string)
+      if character_count.positive?
+        length += @document.character_spacing * (character_count - 1)
+      end
+
+      length
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookify
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Joey Schoblaska
@@ -107,6 +107,7 @@ files:
 - fonts/BookAntiqua-Italic.ttf
 - fonts/BookAntiqua.ttf
 - lib/bookify.rb
+- lib/bookify/markdown.rb
 - lib/bookify/node.rb
 - lib/bookify/node/base.rb
 - lib/bookify/node/blockquote.rb
@@ -122,6 +123,7 @@ files:
 - lib/bookify/node/table.rb
 - lib/bookify/renderer.rb
 - lib/bookify/sections.rb
+- lib/prawn_ext/font_metric_cache.rb
 homepage: https://github.com/joeyschoblaska/bookify
 licenses:
 - MIT