jekyll-antex 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 898feb47d4ab647c0cbf5263bf5ca7122c86235e3f5c9006f6cf2067699e52f9
-  data.tar.gz: b421d69f63ec5012b4ef84f5f568d6399135ffbab507375d2220cfc295992e3d
+  metadata.gz: 38cc80b080df5998a00550b7046fa6518e8842d4b225abe15ff21c39ced1290b
+  data.tar.gz: 064c607a0b8d825356b22fb6f6837526fd536ca64b13bfa0dc9cb054e9f945bb
 SHA512:
-  metadata.gz: c9a64cb0a982138da460170ee206898f1bba7ae37679ca258c26190c11f75a9514ed5e6612a01e123daf3b4cc28540bd21d1ea48629d912126e1c1b19796e6a9
-  data.tar.gz: d97e5b98db6dde250125e0a6f8b646eda517921b45743f3a1e5fe0ec3360593d7e76ae02d2cf79414ee58c4e91f79a8f393319f63b7cad900555e96ced05ac87
+  metadata.gz: '082e533cae85f3ec1ac9f8db5a1d80cf0f1574b876e6e37cf5e874a1ab7787e1aa606af2979e170818743391d4e06e8c05486947d0426b70970da43c48463dc1'
+  data.tar.gz: '08e6bdd8202cf293cfe4b93cdcdfc8103464559196b1362d1b76f9f5e5f073194effa619085f9913ca366bad1eff24573dd5b9be4ea43c20aaa54fc44eaaca48'

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,62 @@ 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')
+        svg.remove_attribute('width')
+        svg.remove_attribute('height')
+        svg.set_attribute('style', style)
+        placeholder.add_next_sibling(svg)
+        placeholder.remove()
       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 +108,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.7.0'
+    VERSION = '0.8.0'
   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'
@@ -36,13 +37,6 @@ 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
 
@@ -63,6 +57,6 @@ Jekyll::Hooks.register :site, :post_render do |site|
   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.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Paolo Brasolin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-29 00:00:00.000000000 Z
+date: 2022-08-25 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.6
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: Universal TeX integration for Jekyll
 test_files: []