jekyll-antex 0.6.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d7e55a185748b2e917234281bb7f2242ddc40a4d36a81da3c82c63e394fa1f5
-  data.tar.gz: e5f4058b0c13c5a0397fb181a9c1fc6c266b9ea1957d3265a35dbbdb6592cee5
+  metadata.gz: 2b5addd8c7dd7101a0e9c741f1841a84c7073c742c7b4f2edbb0817b5a38d76b
+  data.tar.gz: bc9649c9722b99f7785a69ca95555be020876ab488c71778b33d15469c2fb3f2
 SHA512:
-  metadata.gz: f7d87025ca79d0f2bd6aa8e2f0f66d8c7fb1f2d5683bc24f01c5fbace55b6bc069b07e15f93cb78fdd41b9abc8f4809f7b48d4f96f9f404c8eb23d7aa99882ee
-  data.tar.gz: babab2523a37de3b562008177980c36f37e7c8588c2de46888d9b428683e3c608e8fe012cefc3aba0891b9fc411dc79bac2f6dec4e50fdd9ae4b2de6e0888ad6
+  metadata.gz: e9c47f9570936bffe9f87f6fb26c6944b84f9c8edacecc8e8a43b431fc4f42620f318c188c279cb5eace24d71a65a34f302b54bc2ae14d508ce737b2112570ac
+  data.tar.gz: 4718eae474054f548305faa64f60f47b7df9e7b5bff3eaa3097a5f666df6680ee512b5e3acf690a4104cbc75009279e3fd468be3d99344dfc1e475b909a5bb81

data/lib/jekyll/antex/block.rb

@@ -14,6 +14,8 @@ module Jekyll
     end
 
     class Block < Liquid::Block
+      HASH_ATTR_NAME = 'data-antex-job-hash'
+
       def initialize(tag, markup, tokens)
         @markup = markup
         super
@@ -28,23 +30,73 @@ module Jekyll
       end
 
       def self.render_html(job)
-        img_tag = render_img_tag job
+        placeholder_tag = render_placeholder_tag job
         classes = job.options['classes'].join(' ')
-        "<span class='#{classes}'>#{img_tag}</span>"
+        "<span class='#{classes}'>#{placeholder_tag}</span>"
+      end
+
+      def self.replace_placeholders(content)
+        doc = Nokogiri::HTML.parse(content)
+        placeholders = doc.xpath("//object[@#{HASH_ATTR_NAME}]")
+        placeholders.each(&method(:replace_placeholder))
+        doc.to_s
+      end
+
+      def self.replace_placeholder(placeholder)
+        job = Jekyll::Antex.jobs[placeholder[HASH_ATTR_NAME]]
+        if job.options['inlining']
+          replace_placeholder_with_svg(placeholder)
+        else
+          replace_placeholder_with_img(placeholder)
+        end
+      end
+
+      def self.replace_placeholder_with_img(placeholder)
+        job = Jekyll::Antex.jobs[placeholder[HASH_ATTR_NAME]]
+        style = render_style_attribute_value(job.set_box)
+        img = Nokogiri::XML::Node.new('img', placeholder.document)
+        src = Jekyll::Antex::Block.img_url(job)
+        img.set_attribute('src', src)
+        img.set_attribute('style', style)
+        placeholder.add_next_sibling(img)
+        placeholder.remove()
+      end
+
+      def self.replace_placeholder_with_svg(placeholder)
+        job = Jekyll::Antex.jobs[placeholder[HASH_ATTR_NAME]]
+        style = render_style_attribute_value(job.set_box)
+        path = File.read(job.files['svg'])
+        svg = Nokogiri::XML(path).at_css('svg')
+        prefix_svg_symbols_ids(svg, placeholder[HASH_ATTR_NAME])
+        svg.remove_attribute('width')
+        svg.remove_attribute('height')
+        svg.set_attribute('style', style)
+        placeholder.add_next_sibling(svg)
+        placeholder.remove()
+      end
+
+      def self.prefix_svg_symbols_ids(doc, pfx)
+        # NOTE: in theory String#insert is destructive but node attribute getter/setters must be doing something weird...
+        doc.css("defs > [id]").each do |node|
+          node[:id] = node[:id].insert(0, pfx + "-")
+        end
+        doc.css("use").each do |node|
+          node[:"xlink:href"] = node[:"xlink:href"].insert(1, pfx + "-")
+        end
       end
 
-      def self.render_img_tag(job)
-        "<img data-antex='#{job.hash}' src='#{img_url(job)}' />"
+      def self.render_placeholder_tag(job)
+        "<object #{HASH_ATTR_NAME}='#{job.hash}'></object>"
       end
 
-      def self.render_style_attribute(job_set_box, precision: 3)
+      def self.render_style_attribute_value(job_set_box, precision: 3)
         <<~IMG_TAG.gsub(/(\s\s+)/m, ' ').strip!
-          style='margin: #{job_set_box.mt.round(precision)}ex
-                         #{job_set_box.mr.round(precision)}ex
-                         #{job_set_box.mb.round(precision)}ex
-                         #{job_set_box.ml.round(precision)}ex;
-                 height: #{job_set_box.th.round(precision)}ex;
-                 width:  #{job_set_box.wd.round(precision)}ex;'
+          margin: #{job_set_box.mt.round(precision)}ex
+                  #{job_set_box.mr.round(precision)}ex
+                  #{job_set_box.mb.round(precision)}ex
+                  #{job_set_box.ml.round(precision)}ex;
+          height: #{job_set_box.th.round(precision)}ex;
+          width:  #{job_set_box.wd.round(precision)}ex;
         IMG_TAG
       end
 
@@ -67,6 +119,7 @@ module Jekyll
       private
 
       def add_static_file(site, job)
+        return if job.options['inlining']
         site.static_files << Jekyll::StaticFile.new(
           site, *self.class.static_file_paths(job)
         )

data/lib/jekyll/antex/defaults.yml

@@ -142,3 +142,4 @@ aliases:
       /(?<code>\\[A-z]+)/x
     options:
       classes: [antex, inline]
+inlining: false

data/lib/jekyll/antex/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Antex
-    VERSION = '0.6.1'
+    VERSION = '0.8.1'
   end
 end

data/lib/jekyll/antex.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'antex'
+require 'nokogiri'
 
 require 'jekyll/antex/version'
 require 'jekyll/antex/dealiaser'
@@ -8,6 +9,17 @@ require 'jekyll/antex/block'
 
 module Jekyll
   module Antex
+    def self.gather_resources(site)
+      pages = site.pages
+      documents = site.collections.values.flat_map(&:docs)
+      [*pages, *documents].filter(&method(:allowed_resource?))
+    end
+
+    def self.allowed_resource?(resource)
+      # TODO: perhaps this should be configurable
+      File.fnmatch('*.{html,md}', resource.relative_path, File::FNM_EXTGLOB)
+    end
+
     def self.run_jobs
       jekyll_antex_jobs = Jekyll::Antex.jobs
       jobs_count = jekyll_antex_jobs.count
@@ -25,35 +37,26 @@ module Jekyll
       job.run!
       jekyll_logger_writer << ("\b" * progress.length)
     end
-
-    def self.inject_style_attributes(output)
-      output.gsub(/data-antex="(?<hash>.*?)"/) do
-        job = Jekyll::Antex.jobs[Regexp.last_match[:hash]]
-        Jekyll::Antex::Block.render_style_attribute(job.set_box)
-      end
-    end
   end
 end
 
 # NOTE: I'm conflicted, but regexp flags in yaml must be easy to use.
 SafeYAML::OPTIONS[:whitelisted_tags].push('!ruby/regexp')
 
-Jekyll::Hooks.register :site, :pre_render do
+Jekyll::Hooks.register :site, :pre_render do |site|
   Jekyll::Antex.jobs = {}
-end
-
-# NOTE: we're not registering :posts since they are included in :documents.
-Jekyll::Hooks.register [:documents, :pages], :pre_render do |resource|
+  Jekyll::Antex.gather_resources(site).each do |resource|
   resource.content = Jekyll::Antex::Dealiaser.run(resource)
+  end
 end
 
 Liquid::Template.register_tag('antex', Jekyll::Antex::Block)
 
 Jekyll::Hooks.register :site, :post_render do |site|
   Jekyll::Antex.run_jobs
-  [*site.pages, *site.documents].each do |resource|
+  Jekyll::Antex.gather_resources(site).each do |resource|
     # NOTE: skip unrendered resources e.g. when using --incremental
     next if resource.output.nil?
-    resource.output = Jekyll::Antex.inject_style_attributes(resource.output)
+    resource.output = Jekyll::Antex::Block.replace_placeholders(resource.output)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-antex
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Paolo Brasolin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antex
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +206,7 @@ homepage: https://github.com/paolobrasolin/antex
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -207,8 +221,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: Universal TeX integration for Jekyll
 test_files: []