jekyll-latex-pdf 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5696d522098b6d7102e6a018725a5bdbd66fac63
-  data.tar.gz: 2140c6d7fa8468fb02c1fa16c405ac89c7584298
+  metadata.gz: f526659d863b97cdab1bf626123d0916539ddada
+  data.tar.gz: cd78206e81ad94e8054f6bc6c6262da3ef55d7f5
 SHA512:
-  metadata.gz: abf1490bb38c2f34cda5679dd76309a313dd0636226dcee8a435f81e4d69745df0c10e4bcb648b67605ab24b193a9c4b82e5027818f739fb2d3493a9ae5a7498
-  data.tar.gz: 21ed7ba16de27881ef3bc2a9db5de399f69faf35d3a34bf10577dd703a4bc13c59b67d28f5cfa02087eb640bfa900e7978c280d84c6fd6136015c4d7dab54714
+  metadata.gz: e60dd71ecb453764881ea014a8d9aa032812e3db9d5d6ae142bc2c654197192223f5c6728772311956f05e40de609cf72aebfd2f44782d2e01271672b7c17bea
+  data.tar.gz: 2f43ce1f3c4055281974f7c44a4aca4f6639159b94a5b893b38957df449418cb36cdfd9e9e33a64324a978138d6c9d2fc0bbf893d70a1cbb86c718764341e91d

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## 0.4.1
+- Bugfix: works again with filters on date in jekyll templates.
+- Bugfix: works again without jekyll-scholar.
+- Bugfix: wrong extname in some cases.
+- Bugfix: if permalink is set

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-latex-pdf (0.4.0)
+    jekyll-latex-pdf (0.4.1)
       jekyll (~> 3.8.5)
       kramdown (~> 1.17)
 
@@ -11,9 +11,20 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
+    bibtex-ruby (4.4.7)
+      latex-decode (~> 0.0)
+    citeproc (1.0.9)
+      namae (~> 1.0)
+    citeproc-ruby (1.1.10)
+      citeproc (~> 1.0, >= 1.0.9)
+      csl (~> 1.5)
     coderay (1.1.2)
     colorator (1.1.0)
     concurrent-ruby (1.1.5)
+    csl (1.5.0)
+      namae (~> 1.0)
+    csl-styles (1.0.1.9)
+      csl (~> 1.0)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -39,9 +50,15 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
+    jekyll-scholar (5.14.1)
+      bibtex-ruby (~> 4.0, >= 4.0.13)
+      citeproc-ruby (~> 1.0)
+      csl-styles (~> 1.0)
+      jekyll (~> 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (1.17.0)
+    latex-decode (0.3.1)
     liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -49,6 +66,7 @@ GEM
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
     method_source (0.8.2)
+    namae (1.0.1)
     parallel (1.17.0)
     parser (2.6.2.1)
       ast (~> 2.4.0)
@@ -79,7 +97,7 @@ GEM
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.5)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -93,6 +111,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   jekyll-latex-pdf!
+  jekyll-scholar
   method_source (~> 0.8.2)
   pry
   pry-doc (~> 0.6.0)

data/README.md

@@ -2,6 +2,21 @@
 
 This gem uses kramdown and latex to generate pdf files.
 
+## Introduction
+
+I'm using latex for about 20 years now and jekyll for about 4.  I like latex and
+the results we get for text processing.  And I like jekyll for its easy process
+to generate great websites.
+
+In this project I'll combine the best of both.  The kramdown converter which
+will be used by the most jekyll projects (as far as I know) supports latex.
+Thats great! But we can get much more out of latex with a view tricks.
+
+The project grows about the features I use.  For example I wrote the optional
+depencency to [jekyll-scholar](https://github.com/inukshuk/jekyll-scholar).  So
+if it's enabled in your project, we use the latex way of generating bibliography
+citations.  I didn't find any other package which will do so.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/bin/console

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'bundler/setup'
-require 'jekyll'
-require 'jekyll/latex/pdf'
+require "bundler/setup"
+require "jekyll"
+require "jekyll-scholar"
+require "jekyll/latex/pdf"
 
 # 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.
@@ -11,5 +13,5 @@ require 'jekyll/latex/pdf'
 require "pry"
 Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/data/kramdown/jekyll-latex-pdf.latex

@@ -26,7 +26,7 @@ enclang = {
 'sv' => 'swedish'
 }
 %>
-\documentclass{scrartcl}
+\documentclass{article}
 <% if RUBY_VERSION >= '1.9' %>
 \usepackage[<%= encmap[@body.encoding.name] %>]{inputenc}
 <% else %>
@@ -70,11 +70,11 @@ enclang = {
 <% if data[:author] %>
 \author{<%= data[:author] %>}
 <% end %>
-<% if data[:date] %>
+<% if data[:date_str] %>
 <%   if data[:lang] %>
-\date{\printdate{<%= data[:date] %>}}
+\date{\printdate{<%= data[:date_str] %>}}
 <%   else %>
-\date{<%= data[:date] %>}
+\date{<%= data[:date_str] %>}
 <%   end %>
 <% end %>
 

data/jekyll-latex-pdf.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-doc", "~> 0.6.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rubocop", "~> 0.67"
+  spec.add_development_dependency "jekyll-scholar"
 
   spec.add_runtime_dependency "jekyll", "~> 3.8.5"
   spec.add_runtime_dependency "kramdown", "~> 1.17"

data/lib/jekyll/latex/pdf.rb

@@ -5,7 +5,10 @@ require "jekyll/latex/pdf/utilities"
 require "jekyll/latex/pdf/liquid"
 
 # having jekyll-scholar installed?
-require "jekyll/latex/pdf/scholar" if Jekyll.configuration({})["plugins"].include? "jekyll-scholar"
+if Jekyll.configuration({})["plugins"].include? "jekyll-scholar"
+  require "jekyll/scholar"
+  require "jekyll/latex/pdf/scholar"
+end
 
 require "jekyll/latex/pdf/latex"
 require "jekyll/latex/pdf/document"

data/lib/jekyll/latex/pdf/document.rb

@@ -10,16 +10,6 @@ module Jekyll
       class Document < Jekyll::Page
         attr_accessor :source
 
-        def initialize_data(page)
-          self.data = page.data.clone
-          self.content = page.content.clone
-          self.source = page.content.dup
-          page.data["pdf_url"] = url
-          data["html_url"] = page.url
-          data["date"] = data["date"].strftime("%Y-%m-%d")
-          Options.add_data data
-        end
-
         def initialize(site, page)
           @site = site
           @base = site.source
@@ -29,16 +19,41 @@ module Jekyll
           @settings = site.config.key?("pdf") ? site.config["pdf"].clone : {}
 
           process(@name)
-          Options.add_options @settings
 
-          initialize_data(page)
+          self.data = page.data.clone
+          self.content = page.content.clone
+          self.source = page.content.dup
+          page.data["pdf_url"] = url
+          # data["layout"] = layout
+          data["html_url"] = page.url
+          data["date_str"] = data["date"].strftime("%Y-%m-%d")
+          @options = Options.new @settings
+          @options.add_data data
+
+          check_scholar
+        end
+
+        def check_scholar
+          if Jekyll.configuration({})["plugins"].include? "jekyll-scholar"
+            (class <<self; include Jekyll::Scholar::Utilities; end)
+            # getting bibtex files
+            @config = Jekyll::Scholar.defaults.dup
+            @options.add_data(:bibtex_files => bibtex_files.map { |bibfile| File.join(config["source"], bibfile) })
+          end
+        end
+
+        def permalink
+          data.key? "permalink" ? nil : (data["permalink"] + ext)
         end
 
         def write(dest)
           path = File.join(dest, CGI.unescape(url))
 
-          latex = Latex.new(source, @site)
-          FileUtils.cp(latex.pdf_file, path) if latex.compile == 0
+          latex = Latex.new(source, @site, @options)
+          if latex.compile == 0
+            FileUtils.cp(latex.pdf_file, path)
+            puts "cp", latex.pdf_file, path
+          end
         end
       end
     end

data/lib/jekyll/latex/pdf/generator.rb

@@ -4,6 +4,9 @@ module Jekyll
   module Latex
     module Pdf
       class Generator < Jekyll::Generator
+        safe true
+        priority :lowest
+
         def generate(site)
           site.posts.docs.each do |post|
             site.pages << Document.new(site, post) if post.data["pdf"]

data/lib/jekyll/latex/pdf/latex.rb

@@ -11,9 +11,10 @@ module Jekyll
       class Latex
         attr_accessor :source, :latex
         attr_reader :pdf_file
-        def initialize(source, site)
-          @engine = Options.options[:pdf_engine]
-          @bibengine = Options.options[:bib_engine]
+        def initialize(source, site, options)
+          @options = options
+          @engine = @options.options[:pdf_engine]
+          @bibengine = @options.options[:bib_engine]
           @site = site
 
           self.source = source
@@ -31,7 +32,7 @@ module Jekyll
               Jekyll.logger.warn("Liquid render errors", liquid_parsed.errors.join(", "))
             end
             @latex = Kramdown::Document
-              .new(prep_latex, Options.options)
+              .new(prep_latex, @options.options)
               .to_latex
           end
         end
@@ -51,8 +52,8 @@ module Jekyll
         end
 
         def add_bibliography
-          if Options.data.key? :bibtex_files
-            Options.data[:bibtex_files].each do |bibfile|
+          if @options.data.key? :bibtex_files
+            @options.data[:bibtex_files].each do |bibfile|
               bibpath = File.join(@tempdir, File.dirname(bibfile))
               FileUtils.mkdir_p bibpath unless File.directory? bibpath
               FileUtils.cp(bibfile, bibpath)
@@ -61,17 +62,18 @@ module Jekyll
         end
 
         def prepare_cmds
-          cmds = [[Options.options[:pdf_engine],
+          cmds = [[@options.options[:pdf_engine],
                    # "--output-directory=#{@tempdir}",
                    "--output-format=pdf",
                    "--interaction=batchmode",
                    @latexfile,]]
           # biber if bibfiles given
-          if Options.data.key? :bibtex_files
-            cmds << [Options.options[:bib_engine],
+          if @options.data.key? :bibtex_files
+            cmds << [@options.options[:bib_engine],
                      File.basename(@latexfile, File.extname(@latexfile)),]
             cmds << cmds[0]
           end
+          cmds
         end
 
         def compile
@@ -96,7 +98,7 @@ module Jekyll
             # puts stdout_str
             Jekyll.logger.debug "jekyll-latex-pdf", "status: #{status}"
             Jekyll.logger.debug "jekyll-latex-pdf", "output: #{out}"
-            Jekyll.logger.debug "jekyll-latex-pdf", "Error when trying to run #{Options.options[:pdf_engine]}."
+            Jekyll.logger.debug "jekyll-latex-pdf", "Error when trying to run #{@options.options[:pdf_engine]}."
             Jekyll.logger.debug "jekyll-latex-pdf", "See #{@tempdir}/texput.log"
           end
           status

data/lib/jekyll/latex/pdf/liquid.rb

@@ -23,8 +23,12 @@ module Jekyll
           end
         end
 
+        def tmp_keys
+          @tmp_keys ||= []
+        end
+
         def restore_liquid_tags
-          @tmp_keys.each do |k|
+          tmp_keys.each do |k|
             if @saved_liquid_tags[k]
               Liquid::Template.register_tag(k, @saved_liquid_tags[k])
             else

data/lib/jekyll/latex/pdf/options.rb

@@ -4,58 +4,55 @@ module Jekyll
   module Latex
     module Pdf
       class Options
-        # setting default
-
         @@liquid_tags = {}
-        @@options = { :pdf_engine => "lualatex",
-                      :bib_engine => "biber",
-                      :template   => File.expand_path(
-                        File.join(File.dirname(__FILE__), "..", "..", "..", "..",
-                                  "data", "kramdown", "jekyll-latex-pdf.latex")
-                      ), }
-
-        @@data = {}
-        @@allowed_keys = @@options.keys
-
-        class << self
-          def hash_args(*args)
-            hashed_args = args.detect { |f| f.class == Hash }
-            hashed_args.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v; }
-          end
+        def initialize(*args)
+          @options = { :pdf_engine => "lualatex",
+                       :bib_engine => "biber",
+                       :template   => File.expand_path(
+                         File.join(File.dirname(__FILE__), "..", "..", "..", "..",
+                                   "data", "kramdown", "jekyll-latex-pdf.latex")
+                       ), }
+
+          @data = {}
+          @allowed_keys = @options.keys
+
+          add_options(*args)
+        end
 
-          def add_options(*args)
-            hashed_args = hash_args(*args)
-            if hashed_args[:template]
-              hashed_args[:template] = File.expand_path(File.join("_latex", hashed_args[:template]))
-              hashed_args[:template].concat(".latex") unless hashed_args[:template].end_with?(".latex")
-            end
+        def hash_args(*args)
+          hashed_args = args.detect { |f| f.class == Hash }
+          hashed_args.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v; }
+        end
 
-            allowed_args = hashed_args.select { |key, _| @@allowed_keys.include? key }
-            @@options.merge! allowed_args
-            add_data(hashed_args.reject { |key, _| @@allowed_keys.include? key })
+        def add_options(*args)
+          hashed_args = hash_args(*args)
+          if hashed_args[:template]
+            hashed_args[:template] = File.expand_path(File.join("_latex", hashed_args[:template]))
+            hashed_args[:template].concat(".latex") unless hashed_args[:template].end_with?(".latex")
           end
 
-          def options
-            @@options[:data] = @@data
-            @@options
-          end
+          allowed_args = hashed_args.select { |key, _| @allowed_keys.include? key }
+          @options.merge! allowed_args
+          add_data(hashed_args.reject { |key, _| @allowed_keys.include? key })
+        end
 
-          def add_data(*args)
-            @@data.merge! hash_args(*args)
-            puts "@@data is now:", @@data
-          end
+        def options
+          @options[:data] = @data
+          @options
+        end
 
-          def data
-            @@data
-          end
+        def add_data(*args)
+          @data.merge! hash_args(*args)
+        end
 
-          def tags
-            @@liquid_tags
-          end
+        attr_reader :data
 
-          def register_tag(name, klass)
-            @@liquid_tags[name.to_s] = klass
+        def self.tags
+          @@liquid_tags
           end
+
+        def self.register_tag(name, klass)
+          @@liquid_tags[name.to_s] = klass
         end
       end
     end

data/lib/jekyll/latex/pdf/scholar/bibliography.rb

@@ -7,15 +7,9 @@ module Jekyll
       module Scholar
         class Bibliography < Liquid::Tag
           include Utilities
-          include Jekyll::Scholar::Utilities
+
           def initialize(tag_name, arguments, tokens)
             super
-
-            # getting bibtex files
-            @config = Jekyll::Scholar.defaults.dup
-            puts "bibtex files", bibtex_files.class
-            Options.add_data(:bibtex_files => bibtex_files.map { |bibfile| File.join(@config["source"], bibfile) })
-
             @keys = arguments
           end
 

data/lib/jekyll/latex/pdf/version.rb

@@ -3,7 +3,7 @@
 module Jekyll
   module Latex
     module Pdf
-      VERSION = "0.4.0"
+      VERSION = "0.4.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-latex-pdf
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Martin Kaffanke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.67'
+- !ruby/object:Gem::Dependency
+  name: jekyll-scholar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock