asciidoctor-mathematical 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40baf9e028b3c45d87e6729315726abee28758f5503db1f0a139a11ca38bc185
-  data.tar.gz: d6e620377bb81cf8668f391c89e30460a011ce3913644968263667945c600d05
+  metadata.gz: 820fa9ac5cbaa532408ba0899efae0ce7f2b216c2904159dfc3f417687f387ed
+  data.tar.gz: d34b290453b87eba7a3ce17d17d542f6123a3a3c3dce26372d87d22d1e4652d3
 SHA512:
-  metadata.gz: 73996778845f27a019b98e5fedd2dc3e2634bf27e5cc48aae7a342248b28c482a29d9ecae8d6ffde2c78f957ab599ef595674352e55b26eeb244309cbc13e319
-  data.tar.gz: 0eb1d78cdea5f7b3e97028b6b8b34b7b994d614ac7e8c99cd158b44d7b307ce8e451e90b4abdc64a7832790d5e818ebd9168e00f2e2af3132123cc5bb07cafbe
+  metadata.gz: 24b48818b3d70344a114d2c2221d118eb49a4702d6dca8094d9394a7a55ba5f640e4b693cf3bdabeadbfa25a584b61697e4686a06deabd95d4d27379d60b227e
+  data.tar.gz: 884c13bfae4d298b14e42770f93e49698328bbaff4c4f0341ce9b9aae5992619ea1b80d1d1759a26bd3d19d5ea7241d4e38082065f0534ffd225a13a9f51e855

data/lib/asciidoctor-mathematical/extension.rb

@@ -7,20 +7,20 @@ autoload :Mathematical, 'mathematical'
 
 class MathematicalTreeprocessor < Asciidoctor::Extensions::Treeprocessor
   LineFeed = %(\n)
-  StemInlineMacroRx = /\\?(?:stem|latexmath|asciimath):([a-z,]*)\[(.*?[^\\])\]/m
-  LatexmathInlineMacroRx = /\\?latexmath:([a-z,]*)\[(.*?[^\\])\]/m
-  AsciiMathInlineMacroRx = /\\?asciimath:([a-z,]*)\[(.*?[^\\])\]/m
+  StemInlineMacroRx = /\\?(stem|(?:latex|ascii)math):([a-z,]*)\[(.*?[^\\])\]/m
 
   def process document
+    return unless document.attr? 'stem'
+    
     format = ((document.attr 'mathematical-format') || 'png').to_sym
-    if format != :png and format != :svg
+    unless format == :png || format == :svg
       warn %(Unknown format '#{format}', retreat to 'png')
       format = :png
     end
     ppi = ((document.attr 'mathematical-ppi') || '300.0').to_f
     ppi = format == :png ? ppi : 72.0
     inline = document.attr 'mathematical-inline'
-    if inline and format == :png
+    if inline && format == :png
       warn 'Can\'t use mathematical-inline together with mathematical-format=png'
     end
     # The no-args constructor defaults to SVG and standard delimiters ($..$ for inline, $$..$$ for block)
@@ -30,41 +30,22 @@ class MathematicalTreeprocessor < Asciidoctor::Extensions::Treeprocessor
       ::Asciidoctor::Helpers.mkdir_p image_output_dir unless ::File.directory? image_output_dir
     end
 
-    unless (stem_blocks = document.find_by context: :stem).nil_or_empty?
-      stem_blocks.each do |stem|
-        handle_stem_block stem, mathematical, image_output_dir, image_target_dir, format, inline
-      end
+    (document.find_by context: :stem, traverse_documents: true).each do |stem|
+      handle_stem_block stem, mathematical, image_output_dir, image_target_dir, format, inline
     end
 
-    unless (prose_blocks = document.find_by {|b|
+    document.find_by(traverse_documents: true) {|b|
       (b.content_model == :simple && (b.subs.include? :macros)) || b.context == :list_item
-    }).nil_or_empty?
-      prose_blocks.each do |prose|
-        handle_prose_block prose, mathematical, image_output_dir, image_target_dir, format, inline
-      end
+    }.each do |prose|
+      handle_prose_block prose, mathematical, image_output_dir, image_target_dir, format, inline
     end
 
-    # handle table cells of the "asciidoc" type, as suggested by mojavelinux
-    # at asciidoctor/asciidoctor-mathematical#20.
-    unless (table_blocks = document.find_by context: :table).nil_or_empty?
-      table_blocks.each do |table|
-        (table.rows[:body] + table.rows[:foot]).each do |row|
-          row.each do |cell|
-            if cell.style == :asciidoc
-              process cell.inner_document
-            elsif cell.style != :literal
-              handle_nonasciidoc_table_cell cell, mathematical, image_output_dir, image_target_dir, format, inline
-            end
-          end
-        end
-      end
+    (document.find_by content: :section).each do |sect|
+      handle_section_title sect, mathematical, image_output_dir, image_target_dir, format, inline
     end
 
-    unless (sect_blocks = document.find_by content: :section).nil_or_empty?
-      sect_blocks.each do |sect|
-        handle_section_title sect, mathematical, image_output_dir, image_target_dir, format, inline
-      end
-    end
+    document.remove_attr 'stem'
+    (document.instance_variable_get :@header_attributes).delete 'stem' rescue nil
 
     nil
   end
@@ -106,83 +87,64 @@ class MathematicalTreeprocessor < Asciidoctor::Extensions::Treeprocessor
   end
 
   def handle_prose_block(prose, mathematical, image_output_dir, image_target_dir, format, inline)
-    text = prose.context == :list_item ? (prose.instance_variable_get :@text) : (prose.lines * LineFeed)
+    if prose.context == :list_item || prose.context == :table_cell
+      use_text_property = true
+      text = prose.instance_variable_get :@text
+    else
+      text = prose.lines * LineFeed
+    end
     text, source_modified = handle_inline_stem prose, text, mathematical, image_output_dir, image_target_dir, format, inline
     if source_modified
-      if prose.context == :list_item
-        prose.instance_variable_set :@text, text
+      if use_text_property
+        prose.text = text
       else
         prose.lines = text.split LineFeed
       end
     end
   end
 
-  def handle_nonasciidoc_table_cell(cell, mathematical, image_output_dir, image_target_dir, format, inline)
-    text = cell.instance_variable_get :@text
-    text, source_modified = handle_inline_stem cell, text, mathematical, image_output_dir, image_target_dir, format, inline
-    if source_modified
-      cell.instance_variable_set :@text, text
-    end
-  end
-
   def handle_section_title(sect, mathematical, image_output_dir, image_target_dir, format, inline)
     text = sect.instance_variable_get :@title
     text, source_modified = handle_inline_stem sect, text, mathematical, image_output_dir, image_target_dir, format, inline
-    if source_modified
-      sect.instance_variable_set :@title, text
-      sect.remove_instance_variable :@subbed_title
-    end
+    sect.title = text if source_modified
   end
 
   def handle_inline_stem(node, text, mathematical, image_output_dir, image_target_dir, format, inline)
     document = node.document
-    to_html = document.basebackend? 'html'
+    source_modified = false
 
-    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
+    return [text, source_modified] unless document.attr? 'stem'
 
-    source_modified = false
+    to_html = document.basebackend? 'html'
+
+    default_equation_type = document.attr('stem').include?('tex') ? :latexmath : :asciimath
 
     # TODO skip passthroughs in the source (e.g., +stem:[x^2]+)
-    if text != nil && (text.include? ':')
-      text = text.gsub(stem_rx) {
+    if text && text.include?(':') && (text.include?('stem:') || text.include?('math:'))
+      text = text.gsub(StemInlineMacroRx) do
         if (m = $~)[0].start_with? '\\'
           next m[0][1..-1]
         end
 
-        if (eq_data = m[2].rstrip).empty?
-          next
-        else
-          source_modified = true
-        end
+        next '' if (eq_data = m[3].rstrip).empty?
 
-        if text.include? 'asciimath:'
+        equation_type = default_equation_type if (equation_type = m[1].to_sym) == :stem
+        if equation_type == :asciimath
           eq_data = AsciiMath.parse(eq_data).to_latex
-        elsif (support_stem_prefix && (text.include? 'stem:')) || (text.include? 'latexmath:')
-          eq_data.gsub! '\]', ']'
-          subs = m[1].nil_or_empty? ? (to_html ? [:specialcharacters] : []) : (node.resolve_pass_subs m[1])
+        else # :latexmath
+          eq_data = eq_data.gsub('\]', ']')
+          subs = m[2].nil_or_empty? ? (to_html ? [:specialcharacters] : []) : (node.resolve_pass_subs m[2])
           eq_data = node.apply_subs eq_data, subs unless subs.empty?
-        else
-          source_modified = false
-          return text
         end
-          
+
+        source_modified = true
         img_target, img_width, img_height = make_equ_image eq_data, nil, true, mathematical, image_output_dir, image_target_dir, format, inline
         if inline
-          %(pass:[<span class="steminline"> #{img_target} </span>])
+          %(pass:[<span class="steminline">#{img_target}</span>])
         else
           %(image:#{img_target}[width=#{img_width},height=#{img_height}])
         end
-      }
+      end
     end
 
     [text, source_modified]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-mathematical
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Tobias Stumm
@@ -12,40 +12,20 @@ bindir: bin
 cert_chain: []
 date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby-enum
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: mathematical
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.8
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.8
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
@@ -53,9 +33,6 @@ dependencies:
     - - "~>"
       - !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
@@ -63,29 +40,20 @@ dependencies:
     - - "~>"
       - !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
+        version: '2.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.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement