asciidoctor-pdf-mathjax 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9584bfd63eeb80c3ff6f8158cbe96b6437a0b21342f3b99805d8298ed07d598
-  data.tar.gz: 9866513c3050b00e807385e5fde0f81854b9685db41a4cff6e7ed5112b411742
+  metadata.gz: 4129aed907ee9beb5d7a2c523a0ed1ffb783502aed7184f687305a051ec60afe
+  data.tar.gz: 5dcf3ee6fb448dd253b3fbafbc0ecdf879035744d490e192779f3cb0c0180015
 SHA512:
-  metadata.gz: dd4750377ed2242a86f3d420a62d5a28cd5e18c97fd0f4522cc17c26dc762f6161e56e5cf3f5ec42fb158f6f16102405bf95de20806a0c720241ffb87c6539ea
-  data.tar.gz: 9221217c5229d793464d5ce53cb1790f11d70f954a12e325403e1c2f2deb713c3fc35379141de48eee54a717e22a3923d5b03f31f410cedb7d3cd5f583cdf849
+  metadata.gz: 208a3e49a730fabb7eddce46b1ab711abd1765716c5647bfce354865b89e5553289d9b00c610f952daefbd9b6152b3718ceb94f90055aa44517867e948c6c09e
+  data.tar.gz: e018fbd87bd4e13675aaef9803c6e41505abdb80c952d07185d1a26d78a4cc56d59016a343836c4d437783fea07a299653de9a3d999c22652a95cb0e8d62b707

data/bin/render.js

@@ -1,9 +1,17 @@
 #!/usr/bin/env node
 
 const mj = require('mathjax-node');
+
+const latex = process.argv[2];
+const format = process.argv[3];
+const pixels_per_ex = parseInt(process.argv[4]);
+const font = process.argv[5];
+
 mj.config({
   MathJax: {
-    // MathJax configuration
+    SVG: {
+      font: font
+    }
   }
 });
 mj.start();
@@ -18,9 +26,6 @@ async function convertToSvg(latex, format, pixels_per_ex) {
   return data.svg;
 }
 
-const latex = process.argv[2];
-const format = process.argv[3];
-const pixels_per_ex = parseInt(process.argv[4]);
 convertToSvg(latex, format, pixels_per_ex).then(svg => {
   console.log(svg);
 }).catch(err => console.error(err));

data/lib/asciidoctor-pdf-mathjax.rb

@@ -7,6 +7,7 @@ require 'asciimath'
 
 POINTS_PER_EX = 6
 MATHJAX_DEFAULT_COLOR_STRING = "currentColor"
+MATHJAX_DEFAULT_FONT_FAMILY = "TeX"
 
 FALLBACK_FONT_SIZE = 12
 FALLBACK_FONT_STYLE = 'normal'
@@ -21,17 +22,20 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
     attr_reader :tempfiles
   end
 
-  def convert_stem node
+  def convert_stem(node)
     arrange_block node do |_|
       add_dest_for_block node if node.id
 
       latex_content = extract_latex_content(node.content, node.style.to_sym)
+      math_font = node.document.attributes['math-font'] || MATHJAX_DEFAULT_FONT_FAMILY
 
-      svg_output, error = stem_to_svg(latex_content, false)
+      svg_output, error = stem_to_svg(latex_content, false, math_font)
 
+      # noinspection RubyResolve
+      code_padding = @theme.code_padding
       if svg_output.nil? || svg_output.empty?
         logger.warn "Failed to convert STEM to SVG: #{error} (Fallback to code block)"
-        pad_box @theme.code_padding, node do
+        pad_box code_padding, node do
           theme_font :code do
             typeset_formatted_text [{ text: (guard_indentation latex_content), color: @font_color }],
                                    (calc_line_metrics @base_line_height),
@@ -48,12 +52,12 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
         scaling_factor = @font_size.to_f / svg_default_font_size
         svg_width = svg_width * scaling_factor
 
-        svg_file = Tempfile.new(['stem', '.svg'])
+        svg_file = Tempfile.new(%w[stem .svg])
         begin
           svg_file.write(svg_output)
           svg_file.close
 
-          pad_box @theme.code_padding, node do
+          pad_box code_padding, node do
             begin
               image_obj = image svg_file.path, position: :center, width: svg_width, height: nil
               logger.debug "Successfully embedded stem block (as latex) #{latex_content} as SVG image" if image_obj
@@ -71,25 +75,26 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
     theme_margin :block, :bottom, (next_enclosed_block node)
   end
 
-  def convert_inline_quoted node
+  def convert_inline_quoted(node)
     latex_content = extract_latex_content(node.text, node.type)
     return super if latex_content.nil?
 
     theme = (load_theme node.document)
+    math_font = node.document.attributes['math-font'] || MATHJAX_DEFAULT_FONT_FAMILY
 
-    svg_output, error = stem_to_svg(latex_content, true)
+    svg_output, error = stem_to_svg(latex_content, true, math_font)
     if svg_output.nil? || svg_output.empty?
       logger.warn "Error processing stem: #{error || 'No SVG output'}"
       return super
     end
     adjusted_svg, svg_width = adjust_svg_to_match_text(svg_output, node, theme)
-    tmp_svg = Tempfile.new(['stem-', '.svg'])
+    tmp_svg = Tempfile.new(%w[stem- .svg])
     self.class.tempfiles << tmp_svg
     begin
       tmp_svg.write(adjusted_svg)
       tmp_svg.close
 
-      logger.debug "Successfully embedded stem inline #{node.text} as SVG image"
+      logger.debug "Successfully embedded stem inline #{node.text} with font #{math_font} as SVG image"
       quoted_text = "<img src=\"#{tmp_svg.path}\" format=\"svg\" width=\"#{svg_width}\" alt=\"#{node.text}\">"
       node.id ? %(<a id="#{node.id}">#{DummyText}</a>#{quoted_text}) : quoted_text
     rescue => e
@@ -116,13 +121,18 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
     svg_output.gsub(MATHJAX_DEFAULT_COLOR_STRING, "##{font_color}")
   end
 
-  def stem_to_svg(latex_content, is_inline)
+  def stem_to_svg(latex_content, is_inline, math_font)
     js_script = File.join(File.dirname(__FILE__), '../bin/render.js')
     svg_output, error = nil, nil
     format = is_inline ? 'inline-TeX' : 'TeX'
-    Open3.popen3('node', js_script, latex_content, format, POINTS_PER_EX.to_s) do |_, stdout, stderr, wait_thr|
-      svg_output = stdout.read
-      error = stderr.read unless wait_thr.value.success?
+    begin
+      Open3.popen3('node', js_script, latex_content, format, POINTS_PER_EX.to_s, math_font) do |_, stdout, stderr, wait_thr|
+        svg_output = stdout.read
+        error = stderr.read unless wait_thr.value.success?
+      end
+    rescue Errno::ENOENT => e
+      error = "Node.js executable 'node' was not found. Please install Node.js and ensure 'node' is available on your PATH. Original error: #{e.message}"
+      svg_output = nil
     end
     [svg_output, error]
   end
@@ -142,7 +152,7 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
       font_style = theme["#{theme_key}_font_style"] || theme['heading_font_style'] || theme['base_font_style'] || FALLBACK_FONT_STYLE
       font_size = theme["#{theme_key}_font_size"] || theme['heading_font_size'] || theme['base_font_size'] || FALLBACK_FONT_SIZE
       font_color = theme["#{theme_key}_font_color"] || theme['heading_font_color'] || theme['base_font_color'] || FALLBACK_FONT_COLOR
-    else
+    elsif node_context
       if node_context.parent.is_a?(Asciidoctor::Section) && node_context.parent.sectname == 'abstract'
         theme_key = :abstract
       else
@@ -154,14 +164,17 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
       font_size = nil
       font_color = nil
       converter = node_context.converter
-      converter.theme_font theme_key do
+      converter&.theme_font theme_key do
         font_family = converter.font_family || FALLBACK_FONT_FAMILY
         font_style = converter.font_style || FALLBACK_FONT_STYLE
         font_size = converter.font_size || FALLBACK_FONT_SIZE
         font_color = converter.font_color || FALLBACK_FONT_COLOR
       end
+    else
+      raise "No font context found for node #{node}"
     end
 
+    # noinspection RubyResolve
     font_catalog = theme.font_catalog
     font_file = font_catalog[font_family][font_style.to_s]
 
@@ -170,8 +183,29 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
     end
 
     font = TTFunk::File.open(font_file)
+    unless font
+      raise "Failed opening font file: #{font_file}"
+    end
+
     descender_height = font.horizontal_header.descent.abs
     ascender_height = font.horizontal_header.ascent.abs
+    x_height = font.os2.x_height
+
+    unless x_height
+      logger.debug "'OS/2' table not found, falling back to estimating font x-height (ex) from glyph"
+
+      cmap_table = font.cmap.tables.find { |table| table.format == 4 && table.platform_id == 3 && table.encoding_id == 1 || table.encoding_id == 10 }
+      raise 'No suitable Unicode cmap table found' unless cmap_table
+
+      glyph_id = cmap_table.code_map['x'.ord]
+      raise "Glyph for 'x' not found" if glyph_id.nil? || glyph_id == 0
+
+      glyph = font.glyph_outlines.for(glyph_id)
+      raise 'Glyph data not available' unless glyph
+
+      x_height = glyph.y_max - glyph.y_min
+    end
+    logger.debug "Embedding Font: #{font_family} #{font_style}, x-height: #{x_height}, ascender: #{ascender_height}, descender: #{descender_height}"
 
     units_per_em = font.header.units_per_em.to_f
     total_height = (descender_height.to_f + ascender_height.to_f)
@@ -234,7 +268,7 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
     [svg_output, svg_width]
   rescue => e
     logger.warn "Failed to adjust SVG baseline: #{e.full_message}"
-    nil # Fallback to original if adjustment fails
+    nil # Fallback to the original if adjustment fails
   end
 
   def find_font_context(node)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf-mathjax
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Crown0815
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: AsciiDoctor extension to render STEM fields using MathJax SVG
 test_files: []