From 8535e32d4ad063697026a3232ff81825cb79a7e1 Mon Sep 17 00:00:00 2001 From: Gleb Sinyavsky Date: Thu, 28 Sep 2017 14:57:38 -0700 Subject: [PATCH] fixes --- lib/jekyll/pdf/document.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/pdf/document.rb b/lib/jekyll/pdf/document.rb index edee2b7..3effda9 100644 --- a/lib/jekyll/pdf/document.rb +++ b/lib/jekyll/pdf/document.rb @@ -22,7 +22,7 @@ module Jekyll data['layout'] = layout # Get PDF settings from the layouts - Jekyll::Utils.deep_merge_hashes!(@settings, getConfig(data)) + Jekyll::Utils.deep_merge_hashes!(@settings, get_config(data)) PDFKit.configure do |config| config.verbose = site.config['verbose'] @@ -38,15 +38,10 @@ module Jekyll @partials.each do |partial| @settings[partial] = Jekyll::PDF::Partial.new(self, @settings[partial]) unless @settings[partial].nil? end - - data.default_proc = proc do |_, key| - site.frontmatter_defaults.find(File.join(dir, name), type, key) - end - Jekyll::Hooks.trigger :pages, :post_init, self end # Recursively merge settings from the page, layout, site config & jekyll-pdf defaults - def getConfig(data) + def get_config(data) settings = data['pdf'].is_a?(Hash) ? data['pdf'] : {} layout = @site.layouts[data['layout']].data.clone unless data['layout'].nil? @@ -57,7 +52,7 @@ module Jekyll layout['pdf'] ||= {} Jekyll::Utils.deep_merge_hashes!(layout['pdf'], settings) - getConfig(layout) + get_config(layout) end # Write the PDF file