latexmath 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81fc79f8e8badb13f6f9a8010b81fa23cc6d610ecb2f5b61d88c5c4ef2c48e52
-  data.tar.gz: adc01e90660d4b963a5ed955bc10e5972a399b37a94fd72eed607c48bd5cc5fa
+  metadata.gz: 7e751a24bfc7b92e3df8e1af211b838f679acaa888236d34b12853f43614891e
+  data.tar.gz: 10f0770286d862f60da92690bc316a6f1926b1e11c95fe8f4249fe3a96a6e5bf
 SHA512:
-  metadata.gz: 4cd75a8fcf7e4eac4cf4b29fffa12ac0d75f178c9e3307e4f8b5d31dc993bc903ceefda271c747e9206f081fc7c62cd0ddb3b28c480e40e7f0cbc85bd06dc814
-  data.tar.gz: 19714d6f9fdfbdd5c1bb90764ae4c7590e386b895042b27f671bb306137f03efa133ac2e37edd63cfd680e08b1edfed9fdee1446922f5fa2eeef8f89b1e71e75
+  metadata.gz: 2e3ff4b0ca14dad864a356f98e4d9f805fcdc182b58359396963724f62d9f9da433249c0f2471b36503189fdf351fab4693ee916fb82e708a675568a0267cce9
+  data.tar.gz: e8b4bfd444e139005535f183769a8721a8b7bfea8ffde74c14028f4bd79398c0684dc0f2b515c353127eb8a4fd6df61b969e33d8c41b41451fe4abea56b85fab

data/.gitignore

@@ -7,6 +7,9 @@
 /spec/reports/
 /tmp/
 
+# ignore generated file via Rakefile
+/lib/latexmath/constants/symbols.rb
+
 # rspec failure tracking
 .rspec_status
 
@@ -16,6 +19,4 @@
 # ignore MacOS system file
 .DS_Store
 
-*.tex.html
-
 /dist/

data/.rubocop.yml

@@ -84,8 +84,6 @@ Style/Documentation:
     - 'lib/latexmath/aggregator.rb'
     - 'lib/latexmath/converter.rb'
     - 'lib/latexmath/equation.rb'
-    - 'lib/latexmath/latexml_requirement.rb'
-    - 'lib/latexmath/requirement.rb'
     - 'lib/latexmath/tokenizer.rb'
 
 # Offense count: 18
@@ -121,7 +119,6 @@ Style/NumericPredicate:
     - 'spec/**/*'
     - 'lib/latexmath/aggregator.rb'
     - 'lib/latexmath/converter.rb'
-    - 'lib/latexmath/latexml_requirement.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    latexmath (0.1.3)
+    latexmath (0.1.4)
       htmlentities (~> 4.3)
       ox (~> 2.13)
 

data/Rakefile

@@ -1,7 +1,6 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-
 RSpec::Core::RakeTask.new(:spec)
 
 task 'build-opal' do
@@ -29,4 +28,68 @@ task 'spec-opal' => 'build-opal' do
   ENV.delete 'TEST_OPAL'
 end
 
+def read_symbols(input)
+  @symbols = {}
+  File.readlines(input).each do |line|
+    next if line.start_with?('#')
+
+    columns = line.chop.split('^')
+    _unicode = columns[0]
+    latex = columns[2]
+    unicode_math = columns[3]
+
+    @symbols[latex] = _unicode if latex && !@symbols.include?(latex)
+    @symbols[unicode_math] = _unicode if unicode_math && !@symbols.include?(unicode_math)
+
+    matches = columns[-1].match(/=\s+(\\[^,^ ]+),?/)
+    if matches
+      @symbols[matches[1]] = _unicode unless @symbols[matches[1]]
+    end
+  end
+  @symbols
+end
+
+directory 'lib/latexmath/constants'
+file 'lib/latexmath/constants/symbols.rb' => [
+  'lib/latexmath/constants',
+  'lib/unimathsymbols.txt'
+  ] do |file|
+  symbols = read_symbols(file.prerequisites.last)
+
+  File.open(file.name, "w+") do |f|
+    f.puts <<~HERE
+    module Latexmath
+      module Constants
+        SYMBOLS = {
+    HERE
+
+    @symbols.each_pair do |k,v|
+      f.puts("     '#{k.to_s}' => '#{v}',")
+    end
+
+    f.puts <<~HERE
+        }.freeze
+      end
+    end
+    HERE
+  end
+end
+
+Rake::Task['build'].enhance ['lib/latexmath/constants/symbols.rb']
+Rake::Task[:spec].enhance ['lib/latexmath/constants/symbols.rb']
+
+desc 'Generate and write MathML fixtures'
+task 'create-mathml-fixtures' do
+  require_relative 'lib/latexmath'
+  records = Dir.glob('spec/fixtures/*/*.tex')
+
+  records.each do |file|
+    tex = File.read("./#{file}")
+    tokens = Latexmath::Tokenizer.new(tex).tokenize
+    aggr = Latexmath::Aggregator.new(tokens).aggregate
+
+    File.write("./#{file.chomp('.tex')}.html", Latexmath::Converter.new(aggr).convert)
+  end
+end
+
 task default: [:spec, 'spec-opal']

data/lib/latexmath.rb

@@ -1,10 +1,10 @@
-require 'byebug' unless RUBY_ENGINE == 'opal'
+#require 'byebug' unless RUBY_ENGINE == 'opal'
 require 'json'
 require 'htmlentities'
 require 'ox'
 require_relative 'latexmath/ext'
 require_relative 'latexmath/version'
-#require_relative 'latexmath/latexml_requirement'
+require_relative 'latexmath/constants/symbols'
 require_relative 'latexmath/aggregator'
 require_relative 'latexmath/converter'
 require_relative 'latexmath/symbol'
@@ -77,10 +77,6 @@ module Latexmath
     COMMANDS[limit] = [1, 'munder', {}]
   end
 
-  Requirements = {
-    #latexml: LatexmlRequirement.new
-  }.freeze
-
   def self.parse(string)
     lxm_input = HTMLEntities.new.decode(string)
 

data/lib/latexmath/converter.rb

@@ -301,6 +301,9 @@ module Latexmath
         if element == '_' && index == 1 && param == '\\sum'
           new_parent.tag = 'munder'
           classify(param, new_parent)
+        elsif element == '_^' && param == '\\sum'
+          new_parent.tag = 'munderover'
+          classify(param, new_parent)
         elsif element == '\\left' || element == '\\right'
           if param == '.'
 

data/lib/latexmath/symbol.rb

@@ -13,31 +13,9 @@ module Latexmath
         require 'native'
         @symbols ||= Native::Object.new(`globalThis.unimathsymbols`)
       else
-        @symbols ||= read_symbols
+        @symbols ||= Latexmath::Constants::SYMBOLS
       end
     end
 
-    private
-
-    def read_symbols
-      @symbols = {}
-      File.readlines(File.join(File.dirname(__FILE__), "..", 'unimathsymbols.txt')).each do |line|
-        next if line.start_with?('#')
-
-        columns = line.chop.split('^')
-        _unicode = columns[0]
-        latex = columns[2]
-        unicode_math = columns[3]
-
-        @symbols[latex] = _unicode if latex && !@symbols.include?(latex)
-        @symbols[unicode_math] = _unicode if unicode_math && !@symbols.include?(unicode_math)
-
-        matches = columns[-1].match(/=\s+(\\[^,^ ]+),?/)
-        if matches
-          @symbols[matches[1]] = _unicode unless @symbols[matches[1]]
-        end
-      end
-      @symbols
-    end
   end
 end

data/lib/latexmath/tokenizer.rb

@@ -58,9 +58,7 @@ module Latexmath
                 matched
               elsif scan(/\\\{/)
                 matched
-              elsif scan(/\\,/)
-                matched
-              elsif scan(/\\:/)
+              elsif scan(/\\[:;,]/)
                 matched
               elsif scan(/\\/)
                 matched

data/lib/latexmath/version.rb

@@ -1,3 +1,3 @@
 module Latexmath
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/unimathsymbols.js.erb

@@ -1,4 +1,4 @@
-<%# This preprocesses unimathsymbols.txt for Opal %>
-<% require_relative 'lib/latexmath/symbol' %>
+<%# This preprocesses Latexmath::SYMBOLS constant for Opal %>
+<% require_relative 'lib/latexmath/constants/symbols' %>
 
-globalThis.unimathsymbols = <%= Latexmath::Symbol.instance.symbols.to_json %>;
+globalThis.unimathsymbols = <%= Latexmath::Constants::SYMBOLS.to_json %>;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: latexmath
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -107,8 +107,6 @@ files:
 - lib/latexmath/converter.rb
 - lib/latexmath/equation.rb
 - lib/latexmath/ext.rb
-- lib/latexmath/latexml_requirement.rb
-- lib/latexmath/requirement.rb
 - lib/latexmath/symbol.rb
 - lib/latexmath/tokenizer.rb
 - lib/latexmath/version.rb
@@ -126,7 +124,7 @@ metadata:
   homepage_uri: https://github.com/plurimath/latexmath
   source_code_uri: https://github.com/plurimath/latexmath
   changelog_uri: https://github.com/plurimath/latexmath/blob/master/CHANGELOG.md.
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -142,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Converts LaTeX math into MathML.
 test_files: []

data/lib/latexmath/latexml_requirement.rb

@@ -1,83 +0,0 @@
-require_relative './requirement'
-require 'open3'
-
-module Latexmath
-  class LatexmlRequirement < Requirement
-    @recommended_version = '0.8.4'
-    @minimal_version = '0.8.0'
-
-    def initialize
-      version_output, = Open3.capture2e('latexml --VERSION')
-      version = version_output&.match(/\d+(.\d+)*/)
-      puts version_output
-      if version.to_s.empty?
-        @error_message = 'LaTeXML is not available. (Or is PATH not setup properly?)'\
-          " You must upgrade/install LaTeXML to a version higher than `#{@recommended_version}`"
-
-      elsif Gem::Version.new(version) < Gem::Version.new(@minimal_version)
-        @error_message = "Minimal supported LaTeXML version is `#{@minimal_version}` "\
-            "Version `#{version}` found; recommended version is `#{@recommended_version}`"
-
-      elsif Gem::Version.new(version) < Gem::Version.new(@recommended_version)
-        version = 'unknown' if version.to_s.empty?
-        header_msg = "latexmlmath version `#{version}` below `#{@recommended_version}`!"
-        suggestion = if Gem.win_platform?
-                       'cmd encoding is set to UTF-8 with `chcp 65001`'
-                     else
-                       'terminal encoding is set to UTF-8 with `export LANG=en_US.UTF-8`'
-                     end
-
-        @error_message = "WARNING #{header_msg} Please sure that #{suggestion} command."
-
-        @cmd = 'latexmlmath --strict --preload=amsmath -- -'
-        @cmd2 = 'latexmlmath --strict -- -'
-      else
-        @cmd = 'latexmlmath --strict --preload=amsmath --inputencoding=UTF-8 -- -'
-        @cmd2 = 'latexmlmath --strict --inputencoding=UTF-8 -- -'
-      end
-    rescue StandardError
-      @error_message = 'LaTeXML is not available. (Or is PATH not setup properly?)'\
-          " You must upgrade/install LaTeXML to a version higher than `#{@recommended_version}`"
-    end
-
-    def satisfied(abort = false)
-      unless @error_message.nil?
-        if abort
-          abort @error_message
-        else
-          warn @error_message
-        end
-      end
-
-      @error_message.nil?
-    end
-
-    def cmd
-      abort @error_message unless @error_message.nil?
-
-      [@cmd, @cmd2]
-    end
-
-    def run(input, command)
-      puts command
-      IO.popen(command, 'r+', external_encoding: 'UTF-8') do |io|
-        io.write(input)
-        io.close_write
-        io.read
-      end
-    end
-
-    def convert(input)
-      results = nil
-      cmd.each_with_index do |cmd, i|
-        warn "Retrying with #{cmd}" if i > 0
-        results = run(input, cmd)
-        if $CHILD_STATUS.to_i.zero?
-          warn 'Success!' if i > 0
-          break
-        end
-      end
-      $CHILD_STATUS.to_i.zero? ? results : nil
-    end
-  end
-end

data/lib/latexmath/requirement.rb

@@ -1,11 +0,0 @@
-module Latexmath
-  class Requirement
-    def satisfied
-      raise NotImplementedError('abstract method')
-    end
-
-    def cmd
-      raise NotImplementedError('abstract method')
-    end
-  end
-end