asciimath 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa1c3652a0a8ee204467385b78c06902d31c473d
-  data.tar.gz: 5c5f71402ee68f2b5f4fbbcca771b2f0f7b1107b
+  metadata.gz: ae64f8f21a57a2628a5e8ca6c04aaa15a7d6cae4
+  data.tar.gz: 88ffb4452dd16e56a9fc72876ecb0321f6724d82
 SHA512:
-  metadata.gz: d0c849c8dbcafb79620ae2b1358629e4644f6372f324b0e56a74beabc4509b395512dd3a64deb9916dc864bda42a16a013253db3a75818268a3193a82da6fa82
-  data.tar.gz: fbd88a8fa50bd2042976f9fe9b2529af73f4d8dac108197d316aa1e2b9666694ec283ce218f5af1862fe619b9cd79a692f3d05a6ef381e104d60c0258aa9f22a
+  metadata.gz: 5d53d55278be758c46d356214fd764b07839a2e64eac67e333b1de409b3a29ff3e1341adeb4eb8d9db084617f3f686dc19b069fe3cc15795938fa9a257f96144
+  data.tar.gz: 4a8f1ac5d07d7776a232d763cd6b435274916319783bfb356a668db96af99f9b6892e3ace5445222cc9c3f6eee604628d9a0476a0c42c61601b9cfbe7c0e810e

data/CHANGELOG.adoc

@@ -0,0 +1,31 @@
+= Asciimath Changelog
+
+== 1.0.4
+
+Enhancements::
+
+  * Add support for AsciiMath font commands
+
+== 1.0.3
+
+Bug Fixes::
+
+  * Issue #2: Correctly parse input strings containing multi-byte characters.
+
+== 1.0.2
+
+  Bug Fixes::
+
+  * Issue #1: Resolve uninitialized instance variable warning
+
+== 1.0.1
+
+Enhancements::
+
+  * Make AsciiMath compatible with Ruby 1.8
+
+== 1.0.0
+
+Initial release::
+
+  * An AsciiMath parser and MathML converter written in Ruby

data/{README.md → README.adoc}

@@ -1,14 +1,15 @@
 # AsciiMath
 
-An [AsciiMath](http://asciimath.org) parser and MathML generator written in pure Ruby.
+An http://asciimath.org[AsciiMath] parser and MathML generator written in pure Ruby.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-```ruby
+[source,ruby]
+----
 gem 'asciimath'
-```
+----
 
 And then execute:
 
@@ -24,23 +25,26 @@ Or install it yourself as:
 
 First require the library.
 
-```
+[source,ruby]
+----
 require 'asciimath'
-```
+----
 
 Then parse an AsciiMath string.
 
-```
+[source,ruby]
+----
 parsed_expression = AsciiMath.parse(asciimath)
-```
+----
 
 The parsed expression is a set of nested Array and Hash objects.
 
 This expression can then be converted to MathML.
 
-```
+[source,ruby]
+----
 math_ml = parsed_expression.to_mathml
-```
+----
 
 The MathML code is returned as a String.
 
@@ -48,16 +52,17 @@ The MathML code is returned as a String.
 
 The AsciiMath parser and MathML converter can be invoked via the command line as follows:
 
-```
+[source]
+----
 asciimath "an asciimath string"
-```
+----
 
 This command will print out the generated MathML code on stdout.
 
 ## Contributing
 
-1. Fork it ( https://github.com/pepijnve/asciimath/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+. Fork it (https://github.com/pepijnve/asciimath/fork)
+. Create your feature branch (`git checkout -b my-new-feature`)
+. Commit your changes (`git commit -am 'Add some feature'`)
+. Push to the branch (`git push origin my-new-feature`)
+. Create a new Pull Request

data/lib/asciimath/mathml.rb

@@ -54,6 +54,11 @@ module AsciiMath
               else
                 append(expression[:e])
               end
+            when :font
+              style = expression[:operator]
+              tag("mstyle", :mathvariant => style.to_s.gsub('_', '-')) do
+                append(expression[:s], :single_child => true, :strip_paren => true)
+              end
             when :unary
               operator = expression[:operator]
               tag("m#{operator}") do
@@ -103,7 +108,7 @@ module AsciiMath
       @mathml << '<' << @prefix << tag.to_s
 
       attrs.each_pair do |key, value|
-        @mathml << ' ' << key << '="' << value << '"'
+        @mathml << ' ' << key.to_s << '="' << value.to_s << '"'
       end
 
 

data/lib/asciimath/parser.rb

@@ -38,6 +38,7 @@ module AsciiMath
   # - :number a number
   # - :operator a mathematical operator symbol
   # - :unary a unary operator (e.g., sqrt, text, ...)
+  # - :font a unary font command (e.g., bb, cc, ...)
   # - :infix an infix operator (e.g, /, _, ^, ...)
   # - :binary a binary operator (e.g., frac, root, ...)
   # - :accent an accent character
@@ -350,6 +351,12 @@ module AsciiMath
         # Other
         'sqrt' => {:value => :sqrt, :type => :unary},
         'text' => {:value => :text, :type => :unary},
+        'bb' => {:value => :bold, :type => :font},
+        'bbb' => {:value => :double_struck, :type => :font},
+        'cc' => {:value => :script, :type => :font},
+        'tt' => {:value => :monospace, :type => :font},
+        'fr' => {:value => :fraktur, :type => :font},
+        'sf' => {:value => :sans_serif, :type => :font},
         'frac' => {:value => :frac, :type => :binary},
         'root' => {:value => :root, :type => :binary},
         'stackrel' => {:value => :over, :type => :binary},
@@ -481,9 +488,9 @@ module AsciiMath
         when :accent
           s = parse_simple_expression(tok, depth)
           {:type => :binary, :s1 => s, :s2 => {:type => :operator, :c => t1[:value]}, :operator => t1[:position]}
-        when :unary
+        when :unary, :font
           s = parse_simple_expression(tok, depth)
-          {:type => :unary, :s => s, :operator => t1[:value]}
+          {:type => t1[:type], :s => s, :operator => t1[:value]}
         when :binary
           s1 = parse_simple_expression(tok, depth)
           s2 = parse_simple_expression(tok, depth)

data/lib/asciimath/version.rb

@@ -1,3 +1,3 @@
 module AsciiMath
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/parser_spec.rb

@@ -43,7 +43,9 @@ TEST_CASES = {
     'sum_(k=1)^n k = 1+2+ cdots +n=(n(n+1))/2' =>
         '<math><munderover><mo>&#x2211;</mo><mrow><mi>k</mi><mo>=</mo><mn>1</mn></mrow><mi>n</mi></munderover><mi>k</mi><mo>=</mo><mn>1</mn><mo>+</mo><mn>2</mn><mo>+</mo><mo>&#x22EF;</mo><mo>+</mo><mi>n</mi><mo>=</mo><mfrac><mrow><mi>n</mi><mrow><mo>(</mo><mi>n</mi><mo>+</mo><mn>1</mn><mo>)</mo></mrow></mrow><mn>2</mn></mfrac></math>',
     '"Скорость"=("Расстояние")/("Время")' =>
-        '<math><mtext>Скорость</mtext><mo>=</mo><mfrac><mtext>Расстояние</mtext><mtext>Время</mtext></mfrac></math>'
+        '<math><mtext>Скорость</mtext><mo>=</mo><mfrac><mtext>Расстояние</mtext><mtext>Время</mtext></mfrac></math>',
+    'bb (a + b) + cc c = fr (d^n)' =>
+        '<math><mstyle mathvariant=\"bold\"><mrow><mi>a</mi><mo>+</mo><mi>b</mi></mrow></mstyle><mo>+</mo><mstyle mathvariant=\"script\"><mi>c</mi></mstyle><mo>=</mo><mstyle mathvariant=\"fraktur\"><msup><mi>d</mi><mi>n</mi></msup></mstyle></math>'
 }
 
 version = RUBY_VERSION.split('.').map { |s| s.to_i }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciimath
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
@@ -62,9 +62,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.adoc
 - Gemfile
 - LICENSE.txt
-- README.md
+- README.adoc
 - Rakefile
 - asciimath.gemspec
 - bin/asciimath