asciimath 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c38e7e41750527b0992c27f6e636cb6b670eec3008563e1a5fe19fc86458991
-  data.tar.gz: 3313df7a9524d4a4e384be1ec54f38aafe2ff70553ae65aa695c530fff5f45e9
+  metadata.gz: 86018ef6bb3e96fddebb125bf2d246b847378dd686cfa720398c09970ad00696
+  data.tar.gz: 6347a679a01a6fbfa1b56cfa366e43f80bf195a763efe9150f69067dbaf0c227
 SHA512:
-  metadata.gz: a7b29b1332ddb6965162a5b1e82d15c459e5a9ea4d514646b0663ea52adfe5b1999d1078e850dee228160e09b5ac052dde48b39aaa946d6587b97b2658109215
-  data.tar.gz: 6bfce3c229fea323dbfaff74ab1987802b9ae6c7b0ae32562b868bc5da2fd35bc76d0a8c9aa1e414c2765839e02065c5575d5366af89e4becadb882ee084ce08
+  metadata.gz: 9886f869eafa972e926c0103fc13c56a67203d2a71eaa607489169d7695225cfe3cdbf216ef325153e9d24f7ea8f57c26482a71752a9713992d866826b08a879
+  data.tar.gz: 985c445a620542eb3d6f851ce1c832b2c8b89c9aa1d3a2258c64d23456cddb7b36b7953de5f954c3fbbfd9769f113edc499881b88206b4bfc67137ea3cfbaf03

data/CHANGELOG.adoc

@@ -1,5 +1,11 @@
 = Asciimath Changelog
 
+== 2.0.5
+
+Bug fixes::
+
+  * Issue #75: render `tilde x` as `\tilde{x}` instead of `\~{x}` in LaTeX output.
+
 == 2.0.4
 
 Bug fixes::

data/lib/asciimath/latex.rb

@@ -73,7 +73,7 @@ module AsciiMath
       :glb => "\\operatorname{glb}",
       :partial => "\\del",
       :prime => ?',
-      :tilde => "\\~",
+      :tilde => "\\tilde",
       :nbsp => "\\;",
       :lceiling => "\\lceil",
       :rceiling => "\\rceil",
@@ -172,9 +172,9 @@ module AsciiMath
           if e.is_a?(AsciiMath::AST::UnaryOp) &&
             %i[underbrace overbrace].include?(e.operator.value)
             append(e)
-        else
-          curly(e)
-        end
+          else
+            curly(e)
+          end
 
           if sub
             @latex << "_"

data/lib/asciimath/parser.rb

@@ -253,9 +253,9 @@ module AsciiMath
       b.add('!=', 'ne', :ne, :symbol)
       b.add(':=', :assign, :symbol)
       b.add('<', 'lt', :lt, :symbol)
-      b.add('mlt', :mlt, :symbol)
+      b.add('mlt', 'll', :mlt, :symbol)
       b.add('>', 'gt', :gt, :symbol)
-      b.add('mgt', :mgt, :symbol)
+      b.add('mgt', 'gg', :mgt, :symbol)
       b.add('<=', 'le', :le, :symbol)
       b.add('>=', 'ge', :ge, :symbol)
       b.add('-<', '-lt', 'prec', :prec, :symbol)
@@ -432,16 +432,16 @@ module AsciiMath
       b.add('ubrace', 'underbrace', :underbrace, :unary)
       b.add('obrace', 'overbrace', :overbrace, :unary)
       b.add('cancel', :cancel, :unary)
-      b.add('bb', :bold, :unary)
-      b.add('bbb', :double_struck, :unary)
+      b.add('bb', 'mathbf', :bold, :unary)
+      b.add('bbb', 'mathbb', :double_struck, :unary)
       b.add('ii', :italic, :unary)
       b.add('bii', :bold_italic, :unary)
-      b.add('cc', :script, :unary)
+      b.add('cc', 'mathcal', :script, :unary)
       b.add('bcc', :bold_script, :unary)
-      b.add('tt', :monospace, :unary)
-      b.add('fr', :fraktur, :unary)
+      b.add('tt', 'mathtt', :monospace, :unary)
+      b.add('fr', 'mathfrak', :fraktur, :unary)
       b.add('bfr', :bold_fraktur, :unary)
-      b.add('sf', :sans_serif, :unary)
+      b.add('sf', 'mathsf', :sans_serif, :unary)
       b.add('bsf', :bold_sans_serif, :unary)
       b.add('sfi', :sans_serif_italic, :unary)
       b.add('sfbi', :sans_serif_bold_italic, :unary)
@@ -801,7 +801,7 @@ module AsciiMath
     end
 
     DEFAULT_COLOR_TABLE = ::AsciiMath::Parser.add_default_colors(AsciiMath::ColorTableBuilder.new).build
-    DEFAULT_PARSER_SYMBOL_TABLE = ::AsciiMath::Parser.add_default_parser_symbols(AsciiMath::SymbolTableBuilder.new).build
+    DEFAULT_PARSER_SYMBOL_TABLE = ::AsciiMath::Parser.add_default_parser_symbols(AsciiMath::SymbolTableBuilder.new(allow_symbol_overwrites: false)).build
   end
 
   class Expression

data/lib/asciimath/symbol_table.rb

@@ -1,7 +1,8 @@
 module AsciiMath
   class SymbolTableBuilder
-    def initialize()
+    def initialize(allow_symbol_overwrites: true)
       @table = {}
+      @allow_symbol_overwrites = allow_symbol_overwrites
     end
 
     def add(*args)
@@ -15,7 +16,11 @@ module AsciiMath
       entry[:value] = args.pop
 
       entry.freeze
-      args.each { |name| @table[name.freeze] = entry }
+      args.map(&:freeze).each do |name|
+        raise "Symbol overwrites are disallowed, but were attempted for #{name}" if !@allow_symbol_overwrites && !@table[name].nil?
+
+        @table[name] = entry
+      end
     end
 
     def build

data/lib/asciimath/version.rb

@@ -1,3 +1,3 @@
 module AsciiMath
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/customisation_spec.rb

@@ -25,4 +25,10 @@ describe 'AsciiMath::Parser', :variant => :ast do
     parsed = AsciiMath::parse("a + b", my_tokens_table.build)
     expect(parsed.ast).to eq(seq(identifier('a'), ::AsciiMath::AST::Symbol.new(:foo, '+', :symbol), identifier('b')))
   end
+
+  it "should support disallowing symbol overwrites" do
+    my_tokens_table = AsciiMath::SymbolTableBuilder.new(allow_symbol_overwrites: false)
+    AsciiMath::Parser.add_default_parser_symbols(my_tokens_table)
+    expect{my_tokens_table.add('+', :foo, :symbol)}.to raise_error 'Symbol overwrites are disallowed, but were attempted for +'
+  end
 end

data/spec/parser_spec.rb

@@ -649,6 +649,11 @@ RSpec.shared_examples 'AsciiMath Examples' do
     :mathml => '<math><munder><munder accentunder="true"><mrow><mo>(</mo><mtable><mtr><mtd><mn>1</mn></mtd><mtd><mn>0</mn></mtd></mtr><mtr><mtd><mn>0</mn></mtd><mtd><mn>1</mn></mtd></mtr></mtable><mo>)</mo></mrow><mo>&#x23DF;</mo></munder><mtext>Adjustment to texture space</mtext></munder></math>'
   ))
 
+  example('tilde x', &should_generate(
+    :ast => unary(symbol('tilde'), 'x'),
+    :latex => '\\tilde{x}'
+    ))
+
 
   version = RUBY_VERSION.split('.').map { |s| s.to_i }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: asciimath
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 - Gark Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby AsciiMath parsing and conversion library.
 email:
@@ -85,7 +85,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: AsciiMath parser and converter
 test_files: