asciidoctor-mathematical 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fd0033c90a779c003b2358774f5e9801eb8edc30f24407eca58c1f5239d322a
-  data.tar.gz: db842b6dee4c6ad6dbc15dee99321d721b3f34238b473ee2d497d1ddaaca6b2f
+  metadata.gz: faf0fb4e29f2614d868f99bd0d85367a0a6db8ca6481668b2061ad452abf097f
+  data.tar.gz: a05239f948741cd7474442e095dbc0cb920da2d60bec09ec21965ae36f236a0e
 SHA512:
-  metadata.gz: 8496913a5bf4be427950d5892f1b33910a56c4e35139a448ce6490ac38e19f429039465cfc35ae940ce129757394410698415e6d7c1fc933df39c28482951713
-  data.tar.gz: c9607a682a7e4074d6ee509170202ec4e39909eacc8213714b355547de62b61ff43b217a3084e541249ebfa1c461edb9cac9fbec3b9db2947e095f6c7826c21f
+  metadata.gz: 0de6aa46ffbf1450dee13b0710c00445839a767a8ca238d0ed9643163da84b19a995c776221b5698508f832bcbfbd94d7da297563db3a7cdebb2a6b99c3705c5
+  data.tar.gz: 37bc274bfa70f1d653ae01ad25195c528b2a55758db519bc1677e872c6d42204bcda86db281f2ffb914ca7901d44452a3c1debe6b4c1008fb26eee366479b92c

data/lib/asciidoctor-mathematical/extension.rb

@@ -1,13 +1,15 @@
 require 'pathname'
 require 'asciidoctor/extensions'
+require 'asciimath'
 
 autoload :Digest, 'digest'
 autoload :Mathematical, 'mathematical'
 
 class MathematicalTreeprocessor < Asciidoctor::Extensions::Treeprocessor
   LineFeed = %(\n)
-  StemInlineMacroRx = /\\?(?:stem|latexmath):([a-z,]*)\[(.*?[^\\])\]/m
+  StemInlineMacroRx = /\\?(?:stem|latexmath|asciimath):([a-z,]*)\[(.*?[^\\])\]/m
   LatexmathInlineMacroRx = /\\?latexmath:([a-z,]*)\[(.*?[^\\])\]/m
+  AsciiMathInlineMacroRx = /\\?asciimath:([a-z,]*)\[(.*?[^\\])\]/m
 
   def process document
     format = ((document.attr 'mathematical-format') || 'png').to_sym
@@ -69,16 +71,24 @@ class MathematicalTreeprocessor < Asciidoctor::Extensions::Treeprocessor
 
   def handle_stem_block(stem, mathematical, image_output_dir, image_target_dir, format, inline)
     equation_type = stem.style.to_sym
-    return unless equation_type == :latexmath
 
-    img_target, img_width, img_height = make_equ_image stem.content, stem.id, false, mathematical, image_output_dir, image_target_dir, format, inline
+    case equation_type
+    when :latexmath
+      content = stem.content
+    when :asciimath
+      content = AsciiMath.parse(stem.content).to_latex
+    else
+      return
+    end
+
+    img_target, img_width, img_height = make_equ_image content, stem.id, false, mathematical, image_output_dir, image_target_dir, format, inline
 
     parent = stem.parent
     if inline
       stem_image = create_pass_block parent, %{<div class="stemblock"> #{img_target} </div>}, {}
       parent.blocks[parent.blocks.index stem] = stem_image
     else
-      alt_text = stem.attr 'alt', %($$#{stem.content}$$)
+      alt_text = stem.attr 'alt', (equation_type == :latexmath ? %($$#{content}$$) : %(`#{content}`))
       attrs = {'target' => img_target, 'alt' => alt_text, 'align' => 'center'}
       # NOTE: The following setups the *intended width and height in pixel* for png images, which can be different that that of the generated image when PPIs larger than 72.0 is used.
       if format == :png
@@ -127,8 +137,18 @@ class MathematicalTreeprocessor < Asciidoctor::Extensions::Treeprocessor
   def handle_inline_stem(node, text, mathematical, image_output_dir, image_target_dir, format, inline)
     document = node.document
     to_html = document.basebackend? 'html'
-    support_stem_prefix = document.attr? 'stem', 'latexmath'
-    stem_rx = support_stem_prefix ? StemInlineMacroRx : LatexmathInlineMacroRx
+
+    case document.attr 'stem'
+    when 'latexmath'
+      support_stem_prefix = true
+      stem_rx = LatexmathInlineMacroRx
+    when 'asciimath'
+      support_stem_prefix = true
+      stem_rx = AsciiMathInlineMacroRx
+    else
+      support_stem_prefix = false
+      stem_rx = StemInlineMacroRx
+    end
 
     source_modified = false
     # TODO skip passthroughs in the source (e.g., +stem:[x^2]+)
@@ -152,7 +172,7 @@ class MathematicalTreeprocessor < Asciidoctor::Extensions::Treeprocessor
       else
         %(image:#{img_target}[width=#{img_width},height=#{img_height}])
       end
-    } if (text != nil) && (text.include? ':') && ((support_stem_prefix && (text.include? 'stem:')) || (text.include? 'latexmath:'))
+    } if (text != nil) && (text.include? ':') && ((support_stem_prefix && (text.include? 'stem:')) || (text.include? 'latexmath:') || (text.include? 'asciimath:'))
 
     [text, source_modified]
   end
@@ -179,31 +199,24 @@ class MathematicalTreeprocessor < Asciidoctor::Extensions::Treeprocessor
     end
   end
 
-  def image_output_and_target_dir(parent)
-    document = parent.document
-
-    output_dir = parent.attr('imagesoutdir')
+  def image_output_and_target_dir(doc)
+    output_dir = doc.attr('imagesoutdir')
     if output_dir
-      base_dir = nil
-      if parent.attr('imagesdir').nil_or_empty?
+      if doc.attr('imagesdir').nil_or_empty?
         target_dir = output_dir
       else
         # When imagesdir attribute is set, every relative path is prefixed with it. So the real target dir shall then be relative to the imagesdir, instead of being relative to document root.
-        doc_outdir = parent.attr('outdir') || (document.respond_to?(:options) && document.options[:to_dir])
-        abs_imagesdir = parent.normalize_system_path(parent.attr('imagesdir'), doc_outdir)
-        abs_outdir = parent.normalize_system_path(output_dir, base_dir)
-        p1 = ::Pathname.new abs_outdir
-        p2 = ::Pathname.new abs_imagesdir
-        target_dir = p1.relative_path_from(p2).to_s
+        abs_imagesdir = ::Pathname.new doc.normalize_system_path(doc.attr('imagesdir'))
+        abs_outdir = ::Pathname.new doc.normalize_system_path(output_dir)
+        target_dir = abs_outdir.relative_path_from(abs_imagesdir).to_s
       end
     else
-      base_dir = parent.attr('outdir') || (document.respond_to?(:options) && document.options[:to_dir])
-      output_dir = parent.attr('imagesdir')
+      output_dir = doc.attr('imagesdir')
       # since we store images directly to imagesdir, target dir shall be NULL and asciidoctor converters will prefix imagesdir.
       target_dir = "."
     end
 
-    output_dir = parent.normalize_system_path(output_dir, base_dir)
+    output_dir = doc.normalize_system_path(output_dir, doc.attr('docdir'))
     return [output_dir, target_dir]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-mathematical
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tobias Stumm
@@ -50,22 +50,42 @@ dependencies:
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: asciimath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Asciidoctor STEM processor based on Mathematical