jekyll-spaceship 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8805ddd2b533ed9cff3add639bf6256a4763d2d20ce2d28653815f9001fe1e
-  data.tar.gz: 12c392bd9f805b26d9d37a6b5803b50cb2cdfb2709db965dbf3cc53d79480feb
+  metadata.gz: 917f5191110c86af367498a90d9ad362185254fdfc30f54eeb48705159b72db7
+  data.tar.gz: 23e627f48d83363b2b473d2c080c98d327ddc51d982290209e218ff755a8920e
 SHA512:
-  metadata.gz: 9c9c0b3600ae2654a40e133aef2d7e1a88be7b2bd2c83f86202e2e90f59b52642730346d8fefaed8580dad6412f20f2ff8dfe8d12787e964171b48ef5141c8cf
-  data.tar.gz: 979ab9e4f574cba0f7efa8ec86125ffbe992760ce99a766014f98243d2a0c82eebedb69c56106d22016b29776c978bc4af6a63140d746a2eb2857cc69e0433a1
+  metadata.gz: daf20ba10a46e6f8538a02b84153bb19f3371e4ea58b689f4c520a04eb7041e76f172ac5886fca2e8a6e9140515fc7afdb30afec97bdda38d99ed43df6ecb3e7
+  data.tar.gz: '089e665d0359d9c0bfe0e37c1e91dfb63c6bc1dacc2c7f928e617c9d3cd1d8af959005a9cc70fca63f05a3ab5c662a24ac2ebaed113073483bc71676146bb12f'

data/README.md

@@ -177,8 +177,15 @@ jekyll-spaceship:
         inlineMath:
           - ['$','$']
           - ['\(','\)']
+        displayMath:
+          - ['$$','$$']
+          - ['\[','\]']
       svg:
         fontCache: 'global'
+    optimize: # optimization on building stage to check and add mathjax scripts
+      enabled: true # value `false` for adding to all pages
+      include: []   # include patterns for math expressions checking (regexp)
+      exclude: []   # exclude patterns for math expressions checking (regexp)
   plantuml-processor:
     mode: default  # mode value 'pre-fetch' for fetching image at building stage
     css:

data/lib/jekyll-spaceship/cores/config.rb

@@ -5,6 +5,7 @@ module Jekyll::Spaceship
     CONFIG_NAME = 'jekyll-spaceship'
     DEFAULT_CONFIG = {
       'processors' => [
+        'cache-processor',
         'table-processor',
         'mathjax-processor',
         'plantuml-processor',
@@ -31,6 +32,16 @@ module Jekyll::Spaceship
       first.merge(second.to_h, &merger)
     end
 
+    def self.deep_dig(obj, key)
+      if obj.respond_to?(:key?) && obj.key?(key)
+        obj[key]
+      elsif obj.respond_to?(:each)
+        result = nil
+        obj.find { |*a| result = self.deep_dig(a.last, key) }
+        result
+      end
+    end
+
     def self.store(section, default)
       return @@store[section] if default.nil?
       @@store[section] = deep_merge(default, @@store[section])
@@ -54,7 +65,10 @@ module Jekyll::Spaceship
     def self.load_config
       # post load site config for `group :jekyll_plugin`
       Jekyll::Hooks.register :site, :after_init do |site|
+        # load config
         self.load(site.config)
+        # dispatch site after_init event
+        Manager.dispatch(site, :site, :after_init)
       end
     end
   end

data/lib/jekyll-spaceship/cores/manager.rb

@@ -14,6 +14,7 @@ module Jekyll::Spaceship
         container = _register.first
         events = _register.last.uniq
         events = events.select do |event|
+          next true if event.match(/^after/)
           next true if event.match(/^post/)
           next events.index(event.to_s.gsub(/^pre/, 'post').to_sym).nil?
         end
@@ -59,21 +60,25 @@ module Jekyll::Spaceship
     def self.dispatch(page, container, event)
       @@_processors.each do |processor|
         processor.dispatch page, container, event
+        break unless processor.next?
       end
       if event.to_s.start_with?('post') and Type.html? output_ext(page)
         self.dispatch_html_block(page)
       end
       @@_processors.each do |processor|
         processor.on_handled if processor.handled
+        break unless processor.next?
       end
     end
 
     def self.ext(page)
+      return unless page.respond_to? :path
       ext = page.path.match(/\.[^.]+$/)
       ext.to_s.rstrip
     end
 
     def self.output_ext(page)
+      return unless page.respond_to? :url_placeholders
       page.url_placeholders[:output_ext]
     end
 

data/lib/jekyll-spaceship/cores/processor.rb

@@ -25,7 +25,11 @@ module Jekyll::Spaceship
     attr_accessor :handled
 
     def name
-      self.class.name.split('::').last
+      self.class.class_name
+    end
+
+    def self.class_name
+      self.name.split('::').last
     end
 
     def filename
@@ -86,6 +90,10 @@ module Jekyll::Spaceship
     def self.config
     end
 
+    def next?
+      true
+    end
+
     def process?
       Type.html?(output_ext) or Type.markdown?(ext)
     end
@@ -190,6 +198,20 @@ module Jekyll::Spaceship
       content
     end
 
+    def get_exclusion(id)
+      result = nil
+      match_data = id.match /<!JEKYLL@(.+)@(.+)>/
+      unless match_data.nil?
+        id = match_data[2].to_i
+        result = {
+          :id => id,
+          :marker => match_data[0],
+          :content => @exclusion_store[id]
+        }
+      end
+      result
+    end
+
     def self.escape_html(content)
       # escape link
       content.scan(/((https?:)?\/\/\S+\?[a-zA-Z0-9%\-_=\.&;]+)/) do |result|
@@ -212,6 +234,7 @@ module Jekyll::Spaceship
           'body' => content_body
         }
       rescue StandardError => msg
+        logger = Logger.new(self.class_name)
         logger.log msg
       end
     end
@@ -232,5 +255,31 @@ module Jekyll::Spaceship
         "<img class=\"#{css_class}\" src=\"#{body}\">"
       end
     end
+
+    def self.handle_bang_link(
+      content,
+      url = '(https?:)?\\/\\/.*',
+      title = '("(.*)".*){0,1}',
+      &block
+    )
+      # pre-handle reference-style links
+      regex = /(\[(.*)\]:\s*(#{url}\s*#{title}))/
+      content.scan regex do |match_data|
+        match = match_data[0]
+        ref_name = match_data[1]
+        ref_value = match_data[2]
+        content = content.gsub(match, '')
+          .gsub(/\!\[(.*)\]\s*\[#{ref_name}\]/,
+            "![\1](#{ref_value})")
+      end
+
+      # handle inline-style links
+      regex = /(\!\[(.*)\]\(.*#{url}\s*#{title}\))/
+      content.scan regex do |match_data|
+        url = match_data[2]
+        title = match_data[6]
+        block.call(url, title)
+      end
+    end
   end
 end

data/lib/jekyll-spaceship/processors/mathjax-processor.rb

@@ -11,14 +11,42 @@ module Jekyll::Spaceship
           'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js',
         ],
         'config' => {
-          'tex' => { 'inlineMath' => [['$','$'], ['\\(','\\)']] },
+          'tex' => {
+            'inlineMath' => [['$','$'], ['\\(','\\)']],
+            'displayMath' => [['$$','$$'], ['\\[','\\]']]
+          },
           'svg': { 'fontCache': 'global' }
+        },
+        'optimize' => {
+          'enabled' => true,
+          'include' => [],
+          'exclude' => []
         }
       }
     end
 
     def process?
-      return true if Type.html?(output_ext)
+      return true if Type.html?(output_ext) or Type.markdown?(output_ext)
+    end
+
+    def on_handle_markdown(content)
+      # pre-handle mathjax expressions in markdown
+      patterns = get_math_patterns()
+      patterns['include'].each do |pattern|
+        content.scan(pattern) do |result|
+          expr = result[0]
+          is_excluded = false
+          patterns['exclude'].each do |pe|
+            break is_excluded = true if expr.match(/#{pe}/)
+          end
+          next if is_excluded
+          escaped_expr = expr
+            .gsub(/(?<!^)\\(?!\S$)/, '\\\\\\\\')
+            .gsub(/\\ /, '\\\\\\ ')
+          content = content.gsub(expr, escaped_expr)
+        end
+      end
+      content
     end
 
     def on_handle_html(content)
@@ -45,22 +73,60 @@ module Jekyll::Spaceship
     end
 
     def has_mathjax_expression?(doc)
-      doc.css('*').each do |node|
-        if node.content.match(/(?<!\\)\$.+(?<!\\)\$/)
-          return true
-        end
-        if node.content.match(/(?<!\\)\\\(.+(?<!\\)\\\)/)
-          return true
+      return true unless config['optimize']['enabled'] == true
+      scan_mathjax_expression(doc) do
+        return true
+      end
+      false
+    end
+
+    def get_math_patterns()
+      patterns = []
+      math_patterns = []
+      ['tex', 'tex2jax'].each do |t|
+        ['inlineMath', 'displayMath'].each do |m|
+          r = config.dig('config', t, m)
+          r&.each do |i|
+            btag = Regexp.escape(i[0])
+            etag = Regexp.escape(i[1])
+            patterns <<= /((?<!\\\\)#{btag}.+?(?<!\\\\)#{etag})/
+          end
         end
       end
+      config['optimize']['include'].each do |pattern|
+        patterns <<= /(#{pattern})/
+      end
+      {
+        'include' => patterns,
+        'exclude' => config['optimize']['exclude']
+      }
+    end
 
-      doc.css('script').each do |node|
-        type = node['type']
-        if type and type.match(/math\/tex/)
-          return true
+    def scan_mathjax_expression(doc, &block)
+      patterns = get_math_patterns()
+      doc.css('*').each do |node|
+        next if ['code', 'pre', 'figure'].include? node.name
+        next if node.ancestors('code, pre, figure').size > 0
+        next if node.children.size > 1
+        patterns['include'].each do |pattern|
+          # check scripting mathjax expression
+          if node.name == 'script'
+            type = node['type']
+            next unless type
+            next unless type.match(/math\/tex/)
+          end
+          # check normal mathjax expression
+          node.content.scan(pattern) do |result|
+            expr = result[0]
+            is_excluded = false
+            patterns['exclude'].each do |pe|
+              break is_excluded = true if expr.match(/#{pe}/)
+            end
+            next if is_excluded
+            block.call(node, expr)
+          end
         end
       end
-      false
     end
   end
 end

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - jeffreytse
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -114,7 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - jeffreytse.mail@gmail.com
 executables: []
@@ -155,7 +155,7 @@ homepage: https://github.com/jeffreytse/jekyll-spaceship
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Jekyll plugin to provide powerful supports for table, mathjax, plantuml,
   mermaid, emoji, video, audio, youtube, vimeo, dailymotion, spotify, soundcloud,