asciimath 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b287c84a0345545fe98b4fc8cb6e229db81256175fe3493267691cf870521b3
-  data.tar.gz: fffc143e77dbb1a5a0ba364b702ee08caaf8fe9077cd5b9694ba9ff273132937
+  metadata.gz: 1d9ffbd1e2a3ba0ae760422ed287d430cce18f80583aa8ceb043cd5235a9805e
+  data.tar.gz: ebbf1108292b512df0b9aa76a7ee4a17e91fdebf52019dafca3d1e4c9950c4e1
 SHA512:
-  metadata.gz: a691bf5414b2887f98052774c525e604fc3e74ed8fc51a1bec2a6beb3c2dbbf8a1aecc4161a9bd6a8e85bca9f34e307f2043df1bb819a5b8ff9c206adb2e4aa6
-  data.tar.gz: f83a4a4ce3340807aa2a1f0e47056bc1438a2504862538935eed6ef0010a9f2da01004e95b0c5f132c23190b01b0ad07f3e238859ecd00d5e3166741665537d4
+  metadata.gz: 6d117d91868212eea9a0a5fe763fd91e0d4e2febe112c6ed92f8ed6fe745005fb27fc91c0e4dbcfe274cf3beced5d2ffcaa566f03fa2310b355eb40e93fde964
+  data.tar.gz: 49580040db7cc0f1f5941bdd5d55d2d5829c5b84503ce093faef266ef54aae5a74b8fb7992bebd62b55b92d3f3d0fc75645e82c25a2ca3e0b990b4f7147aa11e

data/.github/workflows/ci.yml

@@ -14,12 +14,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Reinstall Bundler
-        if: matrix.os == 'windows-latest' && matrix.ruby == 'jruby'
-        # Temporary workaround for https://github.com/ruby/setup-ruby/issues/129
-        run: |
-          gem uninstall -x bundler
-          gem install -N bundler -v 2.1.4
       - name: Build
         run: bundle install --jobs 4 --retry 3
       - name: Test

data/CHANGELOG.adoc

@@ -1,5 +1,16 @@
 = Asciimath Changelog
 
+== 2.0.3
+
+Enhancements::
+
+  * Issue #59: make escaping of non-ASCII characters in MathML and HTML output optional.
+
+Bug fixes::
+
+  * Issue #58: produce `<mo>` tags instead of `<mi>` tags for non-alphanumeric strings.
+  * Issue #62: resolve infinite recursion in LaTeX generator.
+
 == 2.0.2
 
 Enhancements::

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in asciimath.gemspec
 gemspec
+
+gem "bundler", "> 0"
+gem "rake", "~> 13.0.0"
+gem "rspec", "~> 3.9.0"
+gem "nokogiri"

data/asciimath.gemspec

@@ -18,9 +18,4 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "> 0"
-  spec.add_development_dependency "rake", "~> 13.0.0"
-  spec.add_development_dependency "rspec", "~> 3.9.0"
-  spec.add_development_dependency "nokogiri", "~> 1.10.9"
 end

data/lib/asciimath/html.rb

@@ -7,6 +7,7 @@ module AsciiMath
       super(opts[:symbol_table] || ::AsciiMath::MarkupBuilder.default_display_symbol_table(fix_phi: opts.fetch(:fix_phi, true)))
       @prefix = opts[:prefifx] || ''
       @inline = opts[:inline]
+      @escape_non_ascii = opts.fetch(:escape_non_ascii, true)
       @html = ''
     end
 
@@ -227,7 +228,7 @@ module AsciiMath
             @html << "&lt;"
           elsif cp == 62
             @html << "&gt;"
-          elsif cp > 127
+          elsif cp > 127 && @escape_non_ascii
             @html << "&#x#{cp.to_s(16).upcase};"
           else
             @html << cp

data/lib/asciimath/latex.rb

@@ -382,7 +382,7 @@ module AsciiMath
       when AsciiMath::AST::Group
         is_very_small(e.expression)
       when AsciiMath::AST::Sequence
-        e.all? { |s| is_very_small(e) }
+        e.all? { |s| is_very_small(s) }
       when nil
         true
       else

data/lib/asciimath/markup.rb

@@ -329,7 +329,7 @@ module AsciiMath
         when ::AsciiMath::AST::Number
           append_number(node.value)
         when ::AsciiMath::AST::Identifier
-          append_identifier(node.value)
+          append_identifier_or_operator(node.value)
         when ::AsciiMath::AST::Symbol
           if (symbol = resolve_symbol(node))
             case symbol[:type]
@@ -339,7 +339,7 @@ module AsciiMath
                 append_identifier(symbol[:value])
             end
           else
-            append_identifier(node[:value])
+            append_identifier_or_operator(node[:value])
           end
         when ::AsciiMath::AST::Paren
           append_paren(resolve_paren(node.lparen), node.expression, resolve_paren(node.rparen), opts)
@@ -405,6 +405,14 @@ module AsciiMath
       raise NotImplementedError.new __method__.to_s
     end
 
+    def append_identifier_or_operator(value)
+      if value.empty? || value =~ /[[:alnum:]].*/
+        append_identifier(value)
+      else
+        append_operator(value)
+      end
+    end
+
     def append_identifier(identifier)
       raise NotImplementedError.new __method__.to_s
     end

data/lib/asciimath/mathml.rb

@@ -15,6 +15,7 @@ module AsciiMath
         @row_mode = :avoid
         @fence_mode = :row
       end
+      @escape_non_ascii = opts.fetch(:escape_non_ascii, true)
     end
 
     def to_s
@@ -239,7 +240,7 @@ module AsciiMath
           @mathml << "&lt;"
         elsif cp == 62
           @mathml << "&gt;"
-        elsif cp > 127
+        elsif cp > 127 && @escape_non_ascii
           @mathml << "&#x#{cp.to_s(16).upcase};"
         else
           @mathml << cp

data/lib/asciimath/version.rb

@@ -1,3 +1,3 @@
 module AsciiMath
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/spec/parser_spec.rb

@@ -7,11 +7,11 @@ require 'nokogiri'
 
 module Xml
   def self.mathml2_xsd
-    @schema ||= File.open(File.expand_path('../schema/mathml2/mathml2.xsd', __FILE__)) { |io| Nokogiri::XML::Schema(io) }
+    @mathml2_schema ||= File.open(File.expand_path('../schema/mathml2/mathml2.xsd', __FILE__)) { |io| Nokogiri::XML::Schema(io) }
   end
 
   def self.mathml3_xsd
-    @schema ||= File.open(File.expand_path('../schema/mathml3/mathml3.xsd', __FILE__)) { |io| Nokogiri::XML::Schema(io) }
+    @mathml3_schema ||= File.open(File.expand_path('../schema/mathml3/mathml3.xsd', __FILE__)) { |io| Nokogiri::XML::Schema(io) }
   end
 
   def self.parse(content)
@@ -31,12 +31,14 @@ def should_generate(expected_output)
             expect(parsed.ast).to eq(expected)
           when :mathml
             expect(parsed.to_mathml).to eq(expected)
-            xml_dom = Xml.parse(parsed.to_mathml(:xmlns => 'http://www.w3.org/1998/Math/MathML'))
-            Xml.mathml2_xsd.validate(xml_dom).each do |error|
-              fail(error.message)
-            end
-            Xml.mathml3_xsd.validate(xml_dom).each do |error|
-              fail(error.message)
+            if defined?(RUBY_ENGINE) && RUBY_ENGINE != 'jruby'
+              xml_dom = Xml.parse(parsed.to_mathml(:xmlns => 'http://www.w3.org/1998/Math/MathML'))
+              Xml.mathml2_xsd.validate(xml_dom).each do |error|
+                fail(error.message)
+              end
+              Xml.mathml3_xsd.validate(xml_dom).each do |error|
+                fail(error.message)
+              end
             end
           when :mathml_word
             expect(::AsciiMath::MathMLBuilder.new(:msword => true).append_expression(parsed.ast).to_s).to eq(expected)
@@ -568,7 +570,7 @@ RSpec.shared_examples 'AsciiMath Examples' do
           seq('x', symbol('\ '), ':', symbol('\ '), 'x', symbol('in'), 'A', symbol('^^'), 'x', symbol('in'), 'B'),
           symbol('}')
       ),
-      :mathml => '<math><mrow><mo>{</mo><mrow><mi>x</mi><mo>&#xA0;</mo><mi>:</mi><mo>&#xA0;</mo><mi>x</mi><mo>&#x2208;</mo><mi>A</mi><mo>&#x2227;</mo><mi>x</mi><mo>&#x2208;</mo><mi>B</mi></mrow><mo>}</mo></mrow></math>',
+      :mathml => '<math><mrow><mo>{</mo><mrow><mi>x</mi><mo>&#xA0;</mo><mo>:</mo><mo>&#xA0;</mo><mi>x</mi><mo>&#x2208;</mo><mi>A</mi><mo>&#x2227;</mo><mi>x</mi><mo>&#x2208;</mo><mi>B</mi></mrow><mo>}</mo></mrow></math>',
       :latex => '\\left \\{ x \\; : \\; x \\in A \\wedge x \\in B \\right \\}',
   ))
 
@@ -587,6 +589,13 @@ RSpec.shared_examples 'AsciiMath Examples' do
       :mathml => '<math><mover accent="true"><mi></mi><mo>^</mo></mover></math>'
   ))
 
+  example('40% * 3!', &should_generate(
+    :ast => seq('40', '%', symbol('*'), '3', '!'),
+    :mathml => '<math><mn>40</mn><mo>%</mo><mo>&#x22C5;</mo><mn>3</mn><mo>!</mo></math>',
+    :html => '<span class="math-inline"><span class="math-number">40</span><span class="math-operator">%</span><span class="math-operator">&#x22C5;</span><span class="math-number">3</span><span class="math-operator">!</span></span>',
+    :latex => '40 \% \cdot 3 !'
+  ))
+
   version = RUBY_VERSION.split('.').map { |s| s.to_i }
 
   if version[0] > 1 || version[1] > 8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciimath
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
@@ -9,64 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.9
+date: 2021-07-26 00:00:00.000000000 Z
+dependencies: []
 description: A pure Ruby AsciiMath parsing and conversion library.
 email:
 - pepijn@vaneeckhoudt.net
@@ -156,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: AsciiMath parser and converter