asciimath 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4492ccf2978a02b79bf6d5a70a23871fd33db6893e4a90b1b159db3b4d7b8b3
-  data.tar.gz: 43fbc1d2bba388ca359e0e908e0118b22189479cc05bf4a9882cb6459b4c6488
+  metadata.gz: 9b287c84a0345545fe98b4fc8cb6e229db81256175fe3493267691cf870521b3
+  data.tar.gz: fffc143e77dbb1a5a0ba364b702ee08caaf8fe9077cd5b9694ba9ff273132937
 SHA512:
-  metadata.gz: 60c01de3ce18dd8eec2ff1a1fa559da2e0de840e08b59686ab3d1ff913a02f2656f2d8ceee1106657ae99bf9de2fdb2f80eeef1f71cc604845541d9d503f7bed
-  data.tar.gz: 62e0c29f76f709c53b040260dee1e36dce9af4c8737822297ea9d1908b2c72ade763d236c36266c411ce8f7330fbf397d4f0877ac2d5fc80d9064c40920bcbee
+  metadata.gz: a691bf5414b2887f98052774c525e604fc3e74ed8fc51a1bec2a6beb3c2dbbf8a1aecc4161a9bd6a8e85bca9f34e307f2043df1bb819a5b8ff9c206adb2e4aa6
+  data.tar.gz: f83a4a4ce3340807aa2a1f0e47056bc1438a2504862538935eed6ef0010a9f2da01004e95b0c5f132c23190b01b0ad07f3e238859ecd00d5e3166741665537d4

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby: [jruby, 2.3, 2.4, 2.5, 2.6, 2.7]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        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
+        run: bundle exec rake test

data/CHANGELOG.adoc

@@ -1,5 +1,17 @@
 = Asciimath Changelog
 
+== 2.0.2
+
+Enhancements::
+
+  * Issue #51: generate `accent` and `accentunder` attributes on `munder`, `mover`, and `munderover` tags when appropriate
+  * Issue #52: map `phi` to U+03D5 and `varphi` to U+03C6 by default.
+  * Issue #53: Add support for Roman style font command `rm`.
+
+Bug fixes::
+
+  * Issue #50: fix parsing error when unary and binary operators are missing an operand
+
 == 2.0.1
 
 Enhancements::

data/README.adoc

@@ -1,4 +1,5 @@
 # AsciiMath
+:uri-project: https://github.com/asciidoctor/asciimath
 ifndef::env-site[:status:]
 
 An http://asciimath.org[AsciiMath] parser and MathML/LaTeX generator written in pure Ruby.
@@ -7,7 +8,7 @@ ifdef::status[]
 [discrete]
 ## Status
 
-image:https://travis-ci.org/pepijnve/asciimath.svg?branch=master["Linux Build Status", link="https://travis-ci.org/asciidoctor/asciimath"]
+image:{uri-project}/workflows/CI/badge.svg?branch=master["Build Status", link={uri-project}/actions?query=branch%3Amaster]
 image:https://img.shields.io/gem/v/asciimath.svg?label=gem%20version[Gem Version, link=https://rubygems.org/gems/asciimath]
 endif::status[]
 

data/dump_symbol_table.rb

@@ -21,7 +21,7 @@ AsciiMath::Parser::DEFAULT_PARSER_SYMBOL_TABLE.each_pair do |asciimath, value|
     next
   end
 
-  mathml = AsciiMath::MathMLBuilder::DEFAULT_DISPLAY_SYMBOL_TABLE[sym]
+  mathml = AsciiMath::MathMLBuilder.default_display_symbol_table[sym]
 
   if mathml
     val = mathml[:value]

data/lib/asciimath/html.rb

@@ -4,7 +4,7 @@ module AsciiMath
   class HTMLBuilder < ::AsciiMath::MarkupBuilder
 
     def initialize(opts = {})
-      super(opts[:symbol_table] || DEFAULT_DISPLAY_SYMBOL_TABLE)
+      super(opts[:symbol_table] || ::AsciiMath::MarkupBuilder.default_display_symbol_table(fix_phi: opts.fetch(:fix_phi, true)))
       @prefix = opts[:prefifx] || ''
       @inline = opts[:inline]
       @html = ''

data/lib/asciimath/latex.rb

@@ -96,6 +96,7 @@ module AsciiMath
       :bold_sans_serif => "\\mathsf",
       :sans_serif_italic => "\\mathsf",
       :sans_serif_bold_italic => "\\mathsf",
+      :roman => "\\mathrm",
     }.freeze
 
     private
@@ -244,8 +245,6 @@ module AsciiMath
           end
         
         when AsciiMath::AST::Matrix
-          len = expression.length - 1
-          
           parens(expression.lparen, expression.rparen) do
             c = expression.length
             @latex << "\\begin{matrix} "

data/lib/asciimath/markup.rb

@@ -4,7 +4,7 @@ require_relative 'symbol_table'
 module AsciiMath
   class MarkupBuilder
     # Operation symbols
-    def self.add_default_display_symbols(b)
+    def self.add_default_display_symbols(b, fix_phi: true)
       b.add(:plus, '+', :operator)
       b.add(:minus, "\u2212", :operator)
       b.add(:cdot, "\u22C5", :operator)
@@ -221,6 +221,7 @@ module AsciiMath
       b.add(:bold_sans_serif, :bold_sans_serif, :font)
       b.add(:sans_serif_italic, :sans_serif_italic, :font)
       b.add(:sans_serif_bold_italic, :sans_serif_bold_italic, :font)
+      b.add(:roman, :normal, :font)
 
       # Greek letters
       b.add(:alpha, "\u03b1", :identifier)
@@ -265,9 +266,14 @@ module AsciiMath
       b.add(:Tau, "\u03a4", :identifier)
       b.add(:upsilon, "\u03c5", :identifier)
       b.add(:Upsilon, "\u03a5", :identifier)
-      b.add(:phi, "\u03c6", :identifier)
+      if fix_phi
+        b.add(:phi, "\u03d5", :identifier)
+        b.add(:varphi, "\u03c6", :identifier)
+      else
+        b.add(:phi, "\u03c6", :identifier)
+        b.add(:varphi, "\u03d5", :identifier)
+      end
       b.add(:Phi, "\u03a6", :identifier)
-      b.add(:varphi, "\u03d5", :identifier)
       b.add(:chi, "\u03c7", :identifier)
       b.add(:Chi, "\u03a7", :identifier)
       b.add(:psi, "\u03c8", :identifier)
@@ -278,7 +284,18 @@ module AsciiMath
       b
     end
 
-    DEFAULT_DISPLAY_SYMBOL_TABLE = ::AsciiMath::MarkupBuilder.add_default_display_symbols(AsciiMath::SymbolTableBuilder.new).build
+    private
+    DEFAULT_SYMBOL_TABLE = ::AsciiMath::MarkupBuilder.add_default_display_symbols(AsciiMath::SymbolTableBuilder.new, fix_phi: false).build
+    DEFAULT_SYMBOL_TABLE_FIX_PHI = ::AsciiMath::MarkupBuilder.add_default_display_symbols(AsciiMath::SymbolTableBuilder.new, fix_phi: true).build
+
+    public
+    def self.default_display_symbol_table(fix_phi: true)
+      if fix_phi
+        DEFAULT_SYMBOL_TABLE_FIX_PHI
+      else
+        DEFAULT_SYMBOL_TABLE
+      end
+    end
 
     def initialize(symbol_table)
       @symbol_table = symbol_table
@@ -475,5 +492,10 @@ module AsciiMath
           nil
       end
     end
+
+    def is_accent(node)
+      resolved = resolve_symbol(node)
+      !resolved.nil? && resolved[:type] == :accent
+    end
   end
 end

data/lib/asciimath/mathml.rb

@@ -5,7 +5,7 @@ module AsciiMath
   class MathMLBuilder < ::AsciiMath::MarkupBuilder
 
     def initialize(opts = {})
-      super(opts[:symbol_table] || DEFAULT_DISPLAY_SYMBOL_TABLE)
+      super(opts[:symbol_table] || ::AsciiMath::MarkupBuilder.default_display_symbol_table(fix_phi: opts.fetch(:fix_phi, true)))
       @prefix = opts[:prefix] || ''
       @mathml = ''
       if opts[:msword]
@@ -149,21 +149,37 @@ module AsciiMath
     end
 
     def append_underover(base, sub, sup)
+      attrs = {}
+
+      sub_row_mode = @row_mode
+      if is_accent(sub)
+        attrs[:accentunder] = true
+        sub_row_mode = :avoid
+      end
+
+      sup_row_mode = @row_mode
+      if is_accent(sup)
+        attrs[:accent] = true
+        sup_row_mode = :avoid
+      end
+
+
+
       if sub && sup
-        munderover do
+        munderover(attrs) do
           append(base, :row => @row_mode)
-          append(sub, :row => @row_mode)
-          append(sup, :row => @row_mode)
+          append(sub, :row => sub_row_mode)
+          append(sup, :row => sup_row_mode)
         end
       elsif sub
-        munder do
+        munder(attrs) do
           append(base, :row => @row_mode)
-          append(sub, :row => @row_mode)
+          append(sub, :row => sub_row_mode)
         end
       elsif sup
-        mover do
+        mover(attrs) do
           append(base, :row => @row_mode)
-          append(sup, :row => @row_mode)
+          append(sup, :row => sup_row_mode)
         end
       else
         append(base)

data/lib/asciimath/parser.rb

@@ -441,6 +441,7 @@ module AsciiMath
       b.add('bsf', :bold_sans_serif, :unary)
       b.add('sfi', :sans_serif_italic, :unary)
       b.add('sfbi', :sans_serif_bold_italic, :unary)
+      b.add('rm', :roman, :unary)
 
       # Greek letters
       b.add('alpha', :alpha, :symbol)
@@ -612,12 +613,16 @@ module AsciiMath
             token_to_symbol(t1)
           end
         when :unary
-          s = unwrap_paren(parse_simple_expression(tok, depth))
+          parse_simple_expression = parse_simple_expression(tok, depth)
+          s = unwrap_paren(parse_simple_expression)
+          s = identifier('') if s.nil?
           s = convert_node(s, t1[:convert_operand])
           unary(token_to_symbol(t1), s)
         when :binary
           s1 = unwrap_paren(parse_simple_expression(tok, depth))
+          s1 = identifier('') if s1.nil?
           s2 = unwrap_paren(parse_simple_expression(tok, depth))
+          s2 = identifier('') if s2.nil?
 
           s1 = convert_node(s1, t1[:convert_operand1])
           s2 = convert_node(s2, t1[:convert_operand2])
@@ -704,7 +709,6 @@ module AsciiMath
     def convert_to_color(color_expression)
       s = ""
       append_color_text(s, color_expression)
-      s
 
       case s
         when /#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})/i

data/lib/asciimath/version.rb

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

data/spec/parser_spec.rb

@@ -74,8 +74,8 @@ RSpec.shared_examples 'AsciiMath Examples' do
           'j',
           sub(symbol('vartheta'), '0')
       ),
-      :mathml => '<math><munder><mover><mi>A</mi><mo>^</mo></mover><mo>_</mo></munder><mo>=</mo><mover><mi>A</mi><mo>^</mo></mover><mi>exp</mi><mi>j</mi><msub><mi>&#x3D1;</mi><mn>0</mn></msub></math>',
-      :mathml_word => '<math><munder><mrow><mover><mrow><mi>A</mi></mrow><mrow><mo>^</mo></mrow></mover></mrow><mrow><mo>_</mo></mrow></munder><mo>=</mo><mover><mrow><mi>A</mi></mrow><mrow><mo>^</mo></mrow></mover><mi>exp</mi><mi>j</mi><msub><mrow><mi>&#x3D1;</mi></mrow><mrow><mn>0</mn></mrow></msub></math>',
+      :mathml => '<math><munder><mover accent="true"><mi>A</mi><mo>^</mo></mover><mo>_</mo></munder><mo>=</mo><mover accent="true"><mi>A</mi><mo>^</mo></mover><mi>exp</mi><mi>j</mi><msub><mi>&#x3D1;</mi><mn>0</mn></msub></math>',
+      :mathml_word => '<math><munder><mrow><mover accent="true"><mrow><mi>A</mi></mrow><mo>^</mo></mover></mrow><mrow><mo>_</mo></mrow></munder><mo>=</mo><mover accent="true"><mrow><mi>A</mi></mrow><mo>^</mo></mover><mi>exp</mi><mi>j</mi><msub><mrow><mi>&#x3D1;</mi></mrow><mrow><mn>0</mn></mrow></msub></math>',
       :latex => '\\underset{\\text{–}}{\\hat{A}} = \\hat{A} \\exp j \\vartheta_0'
   ))
 
@@ -272,7 +272,7 @@ RSpec.shared_examples 'AsciiMath Examples' do
           unary(symbol('ul'), group('A')),
           unary(symbol('vec'), group('v')),
       ),
-      :mathml => '<math><mover><mrow><mi>a</mi><mi>b</mi></mrow><mo>^</mo></mover><mover><mrow><mi>x</mi><mi>y</mi></mrow><mo>&#xAF;</mo></mover><munder><mi>A</mi><mo>_</mo></munder><mover><mi>v</mi><mo>&#x2192;</mo></mover></math>',
+      :mathml => '<math><mover accent="true"><mrow><mi>a</mi><mi>b</mi></mrow><mo>^</mo></mover><mover accent="true"><mrow><mi>x</mi><mi>y</mi></mrow><mo>&#xAF;</mo></mover><munder accentunder="true"><mi>A</mi><mo>_</mo></munder><mover accent="true"><mi>v</mi><mo>&#x2192;</mo></mover></math>',
       :html => '<span class="math-inline"><span class="math-blank">&#x200D;</span><span class="math-underover"><span class="math-smaller"><span class="math-operator">^</span></span><span class="math-row"><span class="math-identifier">a</span><span class="math-identifier">b</span></span><span class="math-smaller"><span class="math-blank">&#x200D;</span></span></span><span class="math-blank">&#x200D;</span><span class="math-underover"><span class="math-smaller"><span class="math-operator">&#xAF;</span></span><span class="math-row"><span class="math-identifier">x</span><span class="math-identifier">y</span></span><span class="math-smaller"><span class="math-blank">&#x200D;</span></span></span><span class="math-blank">&#x200D;</span><span class="math-underover"><span class="math-smaller"><span class="math-blank">&#x200D;</span></span><span class="math-identifier">A</span><span class="math-smaller"><span class="math-operator">_</span></span></span><span class="math-blank">&#x200D;</span><span class="math-underover"><span class="math-smaller"><span class="math-operator">&#x2192;</span></span><span class="math-identifier">v</span><span class="math-smaller"><span class="math-blank">&#x200D;</span></span></span></span>',
       :latex => '\\hat{a b} \\overline{x y} \\underline{A} \\vec{v}',
   ))
@@ -418,7 +418,7 @@ RSpec.shared_examples 'AsciiMath Examples' do
           unary(symbol('ubrace'), grseq('1', symbol('+'), '2')),
           unary(symbol('obrace'), group(symbol('('), seq('3', symbol('+'), '4'), nil))
       ),
-      :mathml => '<math><munder><mrow><mn>1</mn><mo>+</mo><mn>2</mn></mrow><mo>&#x23DF;</mo></munder><mover><mrow><mn>3</mn><mo>+</mo><mn>4</mn></mrow><mo>&#x23DE;</mo></mover></math>',
+      :mathml => '<math><munder accentunder="true"><mrow><mn>1</mn><mo>+</mo><mn>2</mn></mrow><mo>&#x23DF;</mo></munder><mover accent="true"><mrow><mn>3</mn><mo>+</mo><mn>4</mn></mrow><mo>&#x23DE;</mo></mover></math>',
       :latex => '\\underbrace{1 + 2} \\overbrace{3 + 4}',
   ))
 
@@ -519,7 +519,7 @@ RSpec.shared_examples 'AsciiMath Examples' do
 
   example('overarc a_b^c', &should_generate(
       :ast => subsup(unary(symbol('overarc'), 'a'), 'b', 'c'),
-      :mathml => '<math><msubsup><mover><mi>a</mi><mo>&#x23DC;</mo></mover><mi>b</mi><mi>c</mi></msubsup></math>',
+      :mathml => '<math><msubsup><mover accent="true"><mi>a</mi><mo>&#x23DC;</mo></mover><mi>b</mi><mi>c</mi></msubsup></math>',
       :latex => '{\\overset{\\frown}{a}}_b^c'
   ))
 
@@ -572,6 +572,21 @@ RSpec.shared_examples 'AsciiMath Examples' do
       :latex => '\\left \\{ x \\; : \\; x \\in A \\wedge x \\in B \\right \\}',
   ))
 
+  example('ii', &should_generate(
+      :ast => unary(symbol('ii'), identifier('')),
+      :mathml => '<math><mstyle mathvariant="italic"><mi></mi></mstyle></math>'
+  ))
+
+  example('rm(ms)', &should_generate(
+      :ast => unary(symbol('rm'), grseq(identifier('m'), identifier('s'))),
+      :mathml => '<math><mstyle mathvariant="normal"><mrow><mi>m</mi><mi>s</mi></mrow></mstyle></math>'
+  ))
+
+  example('hat', &should_generate(
+      :ast => unary(symbol('hat'), identifier('')),
+      :mathml => '<math><mover accent="true"><mi></mi><mo>^</mo></mover></math>'
+  ))
+
   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.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,8 +76,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - AST.adoc
 - CHANGELOG.adoc
 - Gemfile
@@ -156,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AsciiMath parser and converter

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-cache:
-  apt: true
-  directories:
-    - vendor/bundle
-    - $HOME/.cache/pip
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - jruby
-  - truffleruby
-before_install:
-  - type bundle || gem install bundler --version '~> 1.0'
-install:
-  - bundle install --path vendor/bundle --jobs=3 --retry=3