jekyll-maths-latex-to-image 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5146b9654d4722f4a553c31e656c29e49b7e56b4f77b29c1e397efddef5da579
-  data.tar.gz: 7ca3ed37a917326f862d840db43462fe824d1b4d8b99bac26fe2f26be191eaef
+  metadata.gz: 4014f3d1474ac3460c49063d8879910f3d589d12c75401f941d31e9a114254c2
+  data.tar.gz: c09fa98531b2964bd86320f519228e3c0a8b98185e2a4b2023818af138629eea
 SHA512:
-  metadata.gz: 6c76f6ef95718291558eeaedd149f2a3700765700e2cd4f40b2e96cf3c60331eba5ff5240df2119bc097634998c2209b5d06b94b7fad6b60ee97e3dbe9a028b0
-  data.tar.gz: 7d4f860c8328ae9a528cab9514f4936143438bd9390fdaf4aa2d57e14f71e5f5a72a65c53881453ac5a048870196b6ce1622aa9070124e18d54caac969797c29
+  metadata.gz: 3d8761cdf4f578de9d239cced88e53793592fbc9219a6201e540ea045137b65ffe1d1e5953b34410727a1a77d4c94b9e52367f742be224efffc2b9113a6251f5
+  data.tar.gz: a28b0f793e938dfe19a66c26dcbe54ba5e51b1a291647abf7d010d93c60ab702f0b2e9ef7dbb967bacf28d6c40b60dd5929777d97644fdef2f3fcfccffeedf18

data/lib/jekyll-maths-latex-to-image/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module MathsLatexToImage
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/jekyll-maths-latex-to-image.rb

@@ -149,53 +149,111 @@ end
 
 module Jekyll
   module MathsLatexToImage
-    class Generator < Jekyll::Generator  # Changed from MathRenderer to MathsLatexToImage
+    class Generator < Jekyll::Generator
       priority :highest
       
       def initialize(config = nil)
         super()
         setup_logging
-        setup_debug_dir
+        setup_debug_dir  # Added back debug dir setup
         @config = config
+        @enabled = nil
         @svg_cache = {}
         
-        # Register the post_write hook during initialization
+        # Essential patterns for math detection
+        @display_math_pattern = /\$\$(.*?)\$\$/m
+        @inline_math_pattern = /(?<!\\)\$([^\$]+?)\$/
+        
         Jekyll::Hooks.register :site, :post_write do |site|
-          @console_logger.info("Post-write hook triggered")
-          begin
-            copy_svg_files(site) # First copy SVG files
-            convert_to_png(site) # Then do conversion to PNG
-            @console_logger.info("Post-write tasks completed successfully")
-          rescue => e
-            @console_logger.error("Post-write tasks failed: #{e.message}")
-            @console_logger.error(e.backtrace.join("\n"))
-          end
+          next unless enabled?(site)
+          handle_post_write(site)
         end
         
-        @@instance = self  # Store instance for hook access
-        
-        # Updated regex patterns
-        @display_math_pattern = /\$\$(.*?)\$\$/m
-        @inline_math_pattern = /(?<!\\)\$([^\$]+?)\$/  # Changed pattern
+        @@instance = self
+      end
+
+      def enabled?(site)
+        # Cache the enabled state per site
+        @enabled ||= begin
+          # Explicitly check configuration
+          config = site.config['jekyll-maths-latex-to-image'] || {}
+          is_enabled = config['enabled'].nil? ? true : config['enabled']
+          
+          @console_logger.info("Jekyll Maths LaTeX to Image plugin state: #{is_enabled ? 'enabled' : 'disabled'}")
+          @console_logger.debug("Configuration: #{config.inspect}")
+          
+          is_enabled
+        end
+      end
+
+      def generate(site)
+        @site = site
         
+        # Early return if plugin is disabled
+        unless enabled?(site)
+          @console_logger.info("Plugin is disabled via configuration - skipping all processing")
+          return
+        end
+
+        @console_logger.info("Starting math processing")
+        initialize_renderer
+        setup_directories
+        process_site_content(site)
+      rescue => e
+        @console_logger.error("Error during generation: #{e.message}")
+        @console_logger.error(e.backtrace.join("\n"))
+        raise
+      end
+
+      private
+
+      def initialize_renderer
+        return if @renderer || !enabled?(@site)
         @renderer = NodeRendererClient.new(@console_logger)
       rescue => e
         @console_logger.error("Failed to initialize renderer: #{e.message}")
         raise
       end
 
-      def generate(site)
-        @site = site
+      def setup_directories
+        return unless enabled?(@site)
         setup_svg_dir
         setup_temp_dir
+      end
+
+      def process_site_content(site)
+        return unless enabled?(site)
+        
         start_time = Time.now
+        @svg_files = {}
         
-        @svg_files = {}  # Map of temp paths to final paths
         process_documents(site)
         
         @console_logger.info("Math rendering completed in #{Time.now - start_time.round(2)} seconds")
       end
 
+      def handle_post_write(site)
+        return unless enabled?(site)
+        
+        @console_logger.info("Running post-write tasks")
+        begin
+          copy_svg_files(site)
+          convert_to_png(site)
+          cleanup_temp_files
+          @console_logger.info("Post-write tasks completed successfully")
+        rescue => e
+          @console_logger.error("Post-write tasks failed: #{e.message}")
+          @console_logger.error(e.backtrace.join("\n"))
+        end
+      end
+
+      def cleanup_temp_files
+        return unless enabled?(@site)
+        
+        FileUtils.rm_rf(@temp_svg_dir) if @temp_svg_dir && Dir.exist?(@temp_svg_dir)
+        @renderer&.cleanup
+      end
+
       def convert_to_png(site)
         build_dir = site.dest
         user_dir = Dir.pwd
@@ -226,19 +284,6 @@ module Jekyll
         end
       end
 
-      # New method to handle post-write tasks
-      def post_write_tasks(site)
-        begin
-          convert_to_png(site)  # Do PNG conversion first
-          copy_svg_files(site)  # Then copy both SVG and PNG files
-        rescue => e
-          @console_logger.error("Post-write tasks failed: #{e.message}")
-          @console_logger.error(e.backtrace.join("\n"))
-        end
-      end
-
-      private
-
       def setup_logging
         log_dir = File.join(Dir.pwd, '_logs', 'math')
         FileUtils.mkdir_p(log_dir)
@@ -266,9 +311,11 @@ module Jekyll
       end
 
       def setup_svg_dir
-        # Use configurable path from _config.yml or default
-        base_path = @site.config.dig('texsvg_math_renderer', 'path') || '/assets/img/math'
+        # Use configurable path from new config structure
+        config = @site.config['jekyll-maths-latex-to-image'] || {}
+        base_path = config['path'] || '/assets/img/math'
         @svg_url_path = File.join(@site.config['baseurl'].to_s, base_path)
+        @console_logger.info("SVG URL path set to: #{@svg_url_path}")
       end
 
       def setup_temp_dir
@@ -348,6 +395,7 @@ module Jekyll
       end
 
       def render_math(math, display_mode)
+        return math unless enabled?(@site)
         cache_key = "#{math}:#{display_mode}"
         return @svg_cache[cache_key] if @svg_cache.key?(cache_key)
         
@@ -357,8 +405,9 @@ module Jekyll
           svg_path = save_svg(math, svg, SecureRandom.uuid)
           png_path = svg_path.sub(/\.svg$/, '.png')
           
-          # Get format preference from config
-          format = @site.config.dig('texsvg_math_renderer', 'format') || 'both'
+          # Get format from new config structure
+          config = @site.config['jekyll-maths-latex-to-image'] || {}
+          format = config['format'] || 'both'
           
           # Build srcset based on format
           srcset = case format
@@ -474,27 +523,18 @@ module Jekyll
         })
       end
 
-      # Remove old logging methods
-      def log_error(message, data = {})
-        @console_logger.error("#{message} #{data.inspect unless data.empty()}")
-      end
-
-      def log_info(message, data = {})
-        @console_logger.info("#{message} #{data.inspect unless data.empty()}")
-      end
-
-      def log_debug(message, data = {})
-        @console_logger.debug("#{message} #{data.inspect unless data.empty()}")
-      end
-
       def process_documents(site)
-        all_documents = site.pages + site.posts.docs
+        return unless enabled?(site)
+        
+        # Include both pages and posts
+        all_documents = site.pages + site.posts.docs + site.documents
         chunks = all_documents.each_slice(5).to_a
         
         Parallel.each(chunks, in_threads: Parallel.processor_count) do |chunk|
           chunk.each do |doc|
+            next unless has_math?(doc.content)
             begin
-              convert_math(doc) if has_math?(doc.content)
+              convert_math(doc)
             rescue => e
               @console_logger.error("Error processing #{doc.path}: #{e.message}")
             end
@@ -521,6 +561,9 @@ module Jekyll
           raise msg
         end
       end
+
+      # Add missing SecureRandom require
+      require 'securerandom'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maths-latex-to-image
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - vrocky
@@ -137,9 +137,6 @@ extra_rdoc_files: []
 files:
 - lib/jekyll-maths-latex-to-image.rb
 - lib/jekyll-maths-latex-to-image/version.rb
-- lib/js/svg_to_png_converter.js
-- lib/js/tex2svg_renderer__index.bundled.js
-- lib/js/tex2svg_renderer__index.bundled.js.map
 homepage: https://github.com/vrocky/jekyll-maths-latex-to-image
 licenses:
 - MIT

data/lib/js/svg_to_png_converter.js

@@ -1,37 +0,0 @@
-const sharp = require('sharp');
-const glob = require('glob');
-const path = require('path');
-const fs = require('fs');
-
-async function convertSvgToPng(buildDir) {
-  try {
-    // Find all SVG files recursively
-    const svgFiles = glob.sync('**/*.svg', { cwd: buildDir });
-    
-    for (const svgFile of svgFiles) {
-      const svgPath = path.join(buildDir, svgFile);
-      const pngPath = svgPath.replace(/\.svg$/, '.png');
-      
-      try {
-        await sharp(svgPath)
-          .png()
-          .toFile(pngPath);
-        console.log(`Converted: ${svgFile} -> ${path.basename(pngPath)}`);
-      } catch (err) {
-        console.error(`Error converting ${svgFile}:`, err);
-      }
-    }
-  } catch (err) {
-    console.error('Conversion error:', err);
-    process.exit(1);
-  }
-}
-
-// Get build directory from command line argument
-const buildDir = process.argv[2];
-if (!buildDir) {
-  console.error('Please provide the build directory path');
-  process.exit(1);
-}
-
-convertSvgToPng(buildDir);