asciidoctor-pdf-mathjax 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 953f3afce27ff482bfcae64ac333e262c1282f6c50d0bdb8317064f3d60b888d
-  data.tar.gz: ea179ece644755ef9834f2ed4da39b21008917004b2d6ff7f2cbbca82495e6c8
+  metadata.gz: 3fc66d0f0c7026c39d6363d44464ad9c5f430aed3202b344de302604679d3166
+  data.tar.gz: 62009314bb1e5e72e759e2251ce7eaa7ffc14bb123a365a9c0f88dcc58d04bac
 SHA512:
-  metadata.gz: c671beb46e4bd786b0deceb6af5108430b9417ff1ea4a585b83efb3c77910bffe6b3b1384a47fa7e876708be13485ae7521b43b50dcf64155c748b4cf814a28b
-  data.tar.gz: 2d76424a66dc155b0078f1b91ba327e2b19f89a41de049c834dc90bf0af5f5609420a193492433d043b1f92e0fd57cc2d0b3c155e18e13808150e4cfba27d9e3
+  metadata.gz: 5234f95491bf7ec6320942e21c009f77575567a4312b1651e13736f19b1cb85d8eeee8cd9b3e443e483628c0b1e7d18847384cb98e9b4cab5efafb539973bcc8
+  data.tar.gz: 7e89244f2911bc889e4f2a3cdd2d34fc31fde201bacac64a0d995ddcbfbd14afe367e98c20922c828ce80bed93e0e05877cd2dbfb81fd655adda92e5c396a6e0

data/bin/render.js

@@ -2,10 +2,17 @@
 
 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];
+// Two modes:
+//   render.js <latex> <format> <pixels_per_ex> <font>
+//     renders one formula, prints the SVG and exits.
+//   render.js --server <font>
+//     starts MathJax once and renders one formula per line of stdin,
+//     {"math": "...", "format": "TeX", "ex": 6}, answering with one line
+//     per formula, {"svg": "..."} or {"error": "..."}.
+// Starting MathJax takes seconds; the server mode pays that once per font
+// instead of once per formula.
+const server = process.argv[2] === '--server';
+const font = server ? process.argv[3] : process.argv[5];
 
 mj.config({
   MathJax: {
@@ -26,6 +33,26 @@ async function convertToSvg(latex, format, pixels_per_ex) {
   return data.svg;
 }
 
-convertToSvg(latex, format, pixels_per_ex).then(svg => {
-  console.log(svg);
-}).catch(err => console.error(err));
+if (server) {
+  let queue = Promise.resolve();
+  require('readline').createInterface({ input: process.stdin }).on('line', line => {
+    queue = queue.then(async () => {
+      let answer;
+      try {
+        const request = JSON.parse(line);
+        answer = { svg: await convertToSvg(request.math, request.format, request.ex) };
+      } catch (err) {
+        answer = { error: String(err) };
+      }
+      process.stdout.write(JSON.stringify(answer) + '\n');
+    });
+  });
+} else {
+  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

@@ -1,5 +1,6 @@
 require 'asciidoctor-pdf' unless Asciidoctor::Converter.for 'pdf'
 require 'open3'
+require 'json'
 require 'tempfile'
 require 'rexml/document'
 require 'ttfunk'
@@ -97,7 +98,7 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
       tmp_svg.close
 
       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}\">"
+      quoted_text = "<img src=\"#{tmp_svg.path}\" format=\"svg\" width=\"#{svg_width}\" alt=\"#{node.text.gsub('"', '&quot;')}\">"
       node.id ? %(<a id="#{node.id}">#{DummyText}</a>#{quoted_text}) : quoted_text
     rescue => e
       logger.warn "Failed to process SVG: #{e.message}"
@@ -124,19 +125,62 @@ class AsciidoctorPDFExtensions < (Asciidoctor::Converter.for 'pdf')
   end
 
   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'
-    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
+    MathJaxServer.for(math_font).render(latex_content, format)
+  end
+
+  # One long-running render.js process per math font. Starting node and MathJax takes
+  # seconds, rendering a formula takes milliseconds, so a document pays the start once.
+  class MathJaxServer
+    JS_SCRIPT = File.join(File.dirname(__FILE__), '../bin/render.js')
+
+    @servers = {}
+
+    def self.for(math_font)
+      @servers[math_font] ||= new(math_font)
+    end
+
+    def initialize(math_font)
+      @math_font = math_font
+    end
+
+    def render(latex_content, format)
+      start unless @stdin
+      @stdin.puts JSON.generate('math' => latex_content, 'format' => format, 'ex' => POINTS_PER_EX)
+      @stdin.flush
+      answer = read_answer
+      [answer['svg'], answer['error']]
     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
+      [nil, "Node.js executable 'node' was not found. Please install Node.js and ensure 'node' is available on your PATH. Original error: #{e.message}"]
+    rescue IOError, SystemCallError => e
+      stop
+      [nil, "MathJax process for font #{@math_font} failed: #{e.message}"]
+    end
+
+    private
+
+    def start
+      @stdin, @stdout, @wait_thr = Open3.popen2('node', JS_SCRIPT, '--server', @math_font)
+      at_exit { stop }
+    end
+
+    # Skips anything else a dependency may print to stdout.
+    def read_answer
+      while (line = @stdout.gets)
+        answer = JSON.parse(line) rescue nil
+        return answer if answer.is_a?(Hash) && (answer.key?('svg') || answer.key?('error'))
+      end
+      raise IOError, 'render.js ended without an answer'
+    end
+
+    def stop
+      return unless @stdin
+      @stdin.close unless @stdin.closed?
+      Process.kill('KILL', @wait_thr.pid) unless @wait_thr.join(5)
+      @stdin = @stdout = @wait_thr = nil
+    rescue SystemCallError
+      @stdin = @stdout = @wait_thr = nil
     end
-    [svg_output, error]
   end
 
   def adjust_svg_to_match_text(svg_content, font)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf-mathjax
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Crown0815