asciimath 1.0.9 → 2.0.3

data/lib/asciimath/mathml.rb

@@ -1,8 +1,21 @@
+require_relative 'markup'
+require_relative 'symbol_table'
+
 module AsciiMath
-  class MathMLBuilder
-    def initialize(prefix)
-      @prefix = prefix
+  class MathMLBuilder < ::AsciiMath::MarkupBuilder
+
+    def initialize(opts = {})
+      super(opts[:symbol_table] || ::AsciiMath::MarkupBuilder.default_display_symbol_table(fix_phi: opts.fetch(:fix_phi, true)))
+      @prefix = opts[:prefix] || ''
       @mathml = ''
+      if opts[:msword]
+        @row_mode = :force
+        @fence_mode = :fenced
+      else
+        @row_mode = :avoid
+        @fence_mode = :row
+      end
+      @escape_non_ascii = opts.fetch(:escape_non_ascii, true)
     end
 
     def to_s
@@ -11,78 +24,166 @@ module AsciiMath
 
     def append_expression(expression, attrs = {})
       math('', attrs) do
-        append(expression, :single_child => true)
+        append(expression, :row => :omit)
       end
     end
 
     private
 
-    def append(expression, opts = {})
-      case expression
-        when Array
-          if expression.length <= 1 || opts[:single_child]
-            expression.each { |e| append(e) }
-          else
-            mrow do
-              expression.each { |e| append(e) }
-            end
-          end
-        when Hash
-          case expression[:type]
-            when :operator
-              mo(expression[:c])
-            when :identifier
-              mi(expression[:c])
-            when :number
-              mn(expression[:c])
-            when :text
-              mtext(expression[:c])
-            when :paren
-              if !opts[:strip_paren]
-                fenced(expression[:lparen], expression[:rparen]) do
-                  append(expression[:e])
-                end
-              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
-                append(expression[:s], :single_child => true, :strip_paren => true)
-              end
-            when :binary
-              operator = expression[:operator]
-              tag("m#{operator}") do
-                append(expression[:s1], :strip_paren => (operator != :sub && operator != :sup))
-                append(expression[:s2], :strip_paren => true)
-              end
-            when :ternary
-              operator = expression[:operator]
-              tag("m#{operator}") do
-                append(expression[:s1])
-                append(expression[:s2], :strip_paren => true)
-                append(expression[:s3], :strip_paren => true)
-              end
-            when :matrix
-              fenced(expression[:lparen], expression[:rparen]) do
-                mtable do
-                  expression[:rows].each do |row|
-                    mtr do
-                      row.each do |col|
-                        mtd do
-                          append(col)
-                        end
-                      end
-                    end
-                  end
+    def append_row(expressions)
+      mrow do
+        expressions.each { |e| append(e) }
+      end
+    end
+
+    def append_operator(operator)
+      mo(operator)
+    end
+
+    def append_identifier(identifier)
+      mi(identifier)
+    end
+
+    def append_text(text)
+      mtext(text)
+    end
+
+    def append_number(number)
+      mn(number)
+    end
+
+    def append_sqrt(expression)
+      tag("m#{"sqrt"}") do
+        append(expression, :row => @row_mode)
+      end
+    end
+
+    def append_cancel(expression)
+      tag("menclose", :notation => "updiagonalstrike") do
+        append(expression, :row => :omit)
+      end
+    end
+
+    def append_root(base, index)
+      tag("m#{"root"}") do
+        append(base, :row => @row_mode)
+        append(index, :row => @row_mode)
+      end
+    end
+
+    def append_fraction(numerator, denominator)
+      tag("m#{"frac"}") do
+        append(numerator, :row => @row_mode)
+        append(denominator, :row => @row_mode)
+      end
+    end
+
+
+    def append_font(style, e)
+      tag("mstyle", :mathvariant => style.to_s.gsub('_', '-')) do
+        append(e)
+      end
+    end
+
+    def append_color(color, e)
+      tag("mstyle", :mathcolor => color) do
+        append(e)
+      end
+    end
+
+    def append_matrix(lparen, rows, rparen)
+      fenced(lparen, rparen) do
+        mtable do
+          rows.each do |row|
+            mtr do
+              row.each do |col|
+                mtd do
+                  append(col)
                 end
               end
+            end
           end
+        end
+      end
+    end
+
+    def append_operator_unary(operator, expression)
+      mrow do
+        mo(operator)
+        append(expression, :row => @row_mode)
+      end
+    end
+
+    def append_identifier_unary(identifier, expression)
+      mrow do
+        mi(identifier)
+        append(expression, :row => @row_mode)
+      end
+    end
+
+    def append_paren(lparen, e, rparen, opts = {})
+      fenced(lparen, rparen) do
+        append(e, :row => @row_mode)
+      end
+    end
+
+    def append_subsup(base, sub, sup)
+      if sub && sup
+        msubsup do
+          append(base, :row => @row_mode)
+          append(sub, :row => @row_mode)
+          append(sup, :row => @row_mode)
+        end
+      elsif sub
+        msub do
+          append(base, :row => @row_mode)
+          append(sub, :row => @row_mode)
+        end
+      elsif sup
+        msup do
+          append(base, :row => @row_mode)
+          append(sup, :row => @row_mode)
+        end
+      else
+        append(base)
+      end
+    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(attrs) do
+          append(base, :row => @row_mode)
+          append(sub, :row => sub_row_mode)
+          append(sup, :row => sup_row_mode)
+        end
+      elsif sub
+        munder(attrs) do
+          append(base, :row => @row_mode)
+          append(sub, :row => sub_row_mode)
+        end
+      elsif sup
+        mover(attrs) do
+          append(base, :row => @row_mode)
+          append(sup, :row => sup_row_mode)
+        end
+      else
+        append(base)
       end
     end
 
@@ -90,10 +191,18 @@ module AsciiMath
       tag(meth, *args, &block)
     end
 
-    def fenced(lparen, rparen, &block)
+    def fenced(lparen, rparen)
       if lparen || rparen
-        mfenced(:open => lparen || '', :close => rparen || '') do
-          yield self
+        if @fence_mode == :fenced
+          mfenced(:open => lparen || '', :close => rparen || '') do
+            yield self
+          end
+        else
+          mrow do
+            mo(lparen) if lparen
+            yield self
+            mo(rparen) if rparen
+          end
         end
       else
         yield self
@@ -102,41 +211,51 @@ module AsciiMath
 
     def tag(tag, *args)
       attrs = args.last.is_a?(Hash) ? args.pop : {}
-      text = args.last.is_a?(String) ? args.pop : ''
+      text = args.last.is_a?(String) || args.last.is_a?(Symbol) ? args.pop.to_s : ''
 
       @mathml << '<' << @prefix << tag.to_s
 
       attrs.each_pair do |key, value|
-        @mathml << ' ' << key.to_s << '="' << value.to_s << '"'
+        @mathml << ' ' << key.to_s << '="'
+        append_escaped(value.to_s)
+        @mathml << '"'
       end
 
 
       if block_given? || text
         @mathml << '>'
-        text.each_codepoint do |cp|
-          if cp == 38
-            @mathml << "&amp;"
-          elsif cp == 60
-            @mathml << "&lt;"
-          elsif cp == 62
-            @mathml << "&gt;"
-          elsif cp > 127
-            @mathml << "&#x#{cp.to_s(16).upcase};"
-          else
-            @mathml << cp
-          end
-        end
+        append_escaped(text)
         yield self if block_given?
         @mathml << '</' << @prefix << tag.to_s << '>'
       else
         @mathml << '/>'
       end
     end
+
+    def append_escaped(text)
+      text.each_codepoint do |cp|
+        if cp == 38
+          @mathml << "&amp;"
+        elsif cp == 60
+          @mathml << "&lt;"
+        elsif cp == 62
+          @mathml << "&gt;"
+        elsif cp > 127 && @escape_non_ascii
+          @mathml << "&#x#{cp.to_s(16).upcase};"
+        else
+          @mathml << cp
+        end
+      end
+    end
   end
 
   class Expression
     def to_mathml(prefix = "", attrs = {})
-      MathMLBuilder.new(prefix).append_expression(@parsed_expression, attrs).to_s
+      if prefix.is_a? Hash
+        attrs = prefix
+        prefix = ""
+      end
+      MathMLBuilder.new(:prefix => prefix).append_expression(ast, attrs).to_s
     end
   end
-end
+end

data/lib/asciimath/parser.rb

@@ -1,4 +1,7 @@
 require 'strscan'
+require_relative 'ast'
+require_relative 'color_table'
+require_relative 'symbol_table'
 
 # Parser for ASCIIMath expressions.
 #
@@ -33,28 +36,18 @@ module AsciiMath
   # The :type key indicates the semantics of the token. The value for :type will be one
   # of the following symbols:
   #
-  # - :identifier a symbolic name or a bit of text without any further semantics
+  # - :symbol a symbolic name or a bit of text without any further semantics
   # - :text a bit of arbitrary text
   # - :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
   # - :eof indicates no more tokens are available
   #
-  # Each token type may also have an :underover modifier. When present and set to true
-  # sub- and superscript expressions associated with the token will be rendered as
-  # under- and overscriptabove and below rather than as sub- or superscript.
-  #
-  # :accent tokens additionally have a :postion value which is set to either :over or :under.
-  # This determines if the accent should be rendered over or under the expression to which
-  # it applies.
-  #
   class Tokenizer
     WHITESPACE = /\s+/
-    NUMBER = /-?[0-9]+(?:\.[0-9]+)?/
+    NUMBER = /[0-9]+(?:\.[0-9]+)?/
     QUOTED_TEXT = /"[^"]*"/
     TEX_TEXT = /text\([^)]*\)/
 
@@ -66,7 +59,7 @@ module AsciiMath
       @string = StringScanner.new(string)
       @symbols = symbols
       lookahead = @symbols.keys.map { |k| k.length }.max
-      @symbol_regexp = /([^\s0-9]{1,#{lookahead}})/
+      @symbol_regexp = /((?:\\[\s0-9]|[^\s0-9]){1,#{lookahead}})/
       @push_back = nil
     end
 
@@ -86,19 +79,19 @@ module AsciiMath
       return {:value => nil, :type => :eof} if @string.eos?
 
       case @string.peek(1)
-      when '"'
-        read_quoted_text
-      when 't'
-        case @string.peek(5)
-        when 'text('
-          read_tex_text
+        when '"'
+          read_quoted_text
+        when 't'
+          case @string.peek(5)
+            when 'text('
+              read_tex_text
+            else
+              read_symbol
+          end
+        when '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+          read_number || read_symbol
         else
           read_symbol
-        end
-      when '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
-        read_number || read_symbol
-      else
-        read_symbol
       end
     end
 
@@ -173,7 +166,12 @@ module AsciiMath
           s.chop!
         end
         @string.pos = position + bytesize(s)
-        @symbols[s] || {:value => s, :type => :identifier}
+        symbol = @symbols[s]
+        if symbol
+          symbol.merge({:text => s})
+        else
+          {:value => s, :type => :identifier}
+        end
       end
     end
 
@@ -185,7 +183,7 @@ module AsciiMath
     # Returns the matched String or the value returned by the block if one was given
     def read_value(regexp)
       s = @string.scan(regexp)
-      if s
+      if s && block_given?
         yield s
       else
         s
@@ -200,290 +198,335 @@ module AsciiMath
   end
 
   class Parser
-    SYMBOLS = {
-        # Operation symbols
-        '+' => {:value => '+', :type => :operator},
-        '-' => {:value => "\u2212", :type => :operator},
-        '*' => {:value => "\u22C5", :type => :operator},
-        '**' => {:value => "\u002A", :type => :operator},
-        '***' => {:value => "\u22C6", :type => :operator},
-        '//' => {:value => '/', :type => :operator},
-        '\\\\' => {:value => '\\', :type => :operator},
-        'xx' => {:value => "\u00D7", :type => :operator},
-        '-:' => {:value => "\u00F7", :type => :operator},
-        '|><' => {:value => "\u22C9", :type => :operator},
-        '><|' => {:value => "\u22CA", :type => :operator},
-        '|><|' => {:value => "\u22C8", :type => :operator},
-        '@' => {:value => "\u26AC", :type => :operator},
-        'o+' => {:value => "\u2295", :type => :operator},
-        'ox' => {:value => "\u2297", :type => :operator},
-        'o.' => {:value => "\u2299", :type => :operator},
-        'sum' => {:value => "\u2211", :type => :operator, :underover => true},
-        'prod' => {:value => "\u220F", :type => :operator, :underover => true},
-        '^^' => {:value => "\u2227", :type => :operator},
-        '^^^' => {:value => "\u22C0", :type => :operator, :underover => true},
-        'vv' => {:value => "\u2228", :type => :operator},
-        'vvv' => {:value => "\u22C1", :type => :operator, :underover => true},
-        'nn' => {:value => "\u2229", :type => :operator},
-        'nnn' => {:value => "\u22C2", :type => :operator, :underover => true},
-        'uu' => {:value => "\u222A", :type => :operator},
-        'uuu' => {:value => "\u22C3", :type => :operator, :underover => true},
-
-        # Relation symbols
-        '=' => {:value => '=', :type => :operator},
-        '!=' => {:value => "\u2260", :type => :operator},
-        ':=' => {:value => ':=', :type => :operator},
-        '<' => {:value => "\u003C", :type => :operator},
-        'lt' => {:value => "\u003C", :type => :operator},
-        '>' => {:value => "\u003E", :type => :operator},
-        'gt' => {:value => "\u003E", :type => :operator},
-        '<=' => {:value => "\u2264", :type => :operator},
-        'le' => {:value => "\u2264", :type => :operator},
-        '>=' => {:value => "\u2265", :type => :operator},
-        'ge' => {:value => "\u2265", :type => :operator},
-        '-<' => {:value => "\u227A", :type => :operator},
-        '>-' => {:value => "\u227B", :type => :operator},
-        '-<=' => {:value => "\u2AAF", :type => :operator},
-        '>-=' => {:value => "\u2AB0", :type => :operator},
-        'in' => {:value => "\u2208", :type => :operator},
-        '!in' => {:value => "\u2209", :type => :operator},
-        'sub' => {:value => "\u2282", :type => :operator},
-        'sup' => {:value => "\u2283", :type => :operator},
-        'sube' => {:value => "\u2286", :type => :operator},
-        'supe' => {:value => "\u2287", :type => :operator},
-        '-=' => {:value => "\u2261", :type => :operator},
-        '~=' => {:value => "\u2245", :type => :operator},
-        '~~' => {:value => "\u2248", :type => :operator},
-        'prop' => {:value => "\u221D", :type => :operator},
-
-        # Logical symbols
-        'and' => {:value => 'and', :type => :text},
-        'or' => {:value => 'or', :type => :text},
-        'not' => {:value => "\u00AC", :type => :operator},
-        '=>' => {:value => "\u21D2", :type => :operator},
-        'if' => {:value => 'if', :type => :operator},
-        '<=>' => {:value => "\u21D4", :type => :operator},
-        'AA' => {:value => "\u2200", :type => :operator},
-        'EE' => {:value => "\u2203", :type => :operator},
-        '_|_' => {:value => "\u22A5", :type => :operator},
-        'TT' => {:value => "\u22A4", :type => :operator},
-        '|--' => {:value => "\u22A2", :type => :operator},
-        '|==' => {:value => "\u22A8", :type => :operator},
-
-        # Grouping brackets
-        '(' => {:value => '(', :type => :lparen},
-        ')' => {:value => ')', :type => :rparen},
-        '[' => {:value => '[', :type => :lparen},
-        ']' => {:value => ']', :type => :rparen},
-        '{' => {:value => '{', :type => :lparen},
-        '}' => {:value => '}', :type => :rparen},
-        '(:' => {:value => "\u2329", :type => :lparen},
-        ':)' => {:value => "\u232A", :type => :rparen},
-        '<<' => {:value => "\u2329", :type => :lparen},
-        '>>' => {:value => "\u232A", :type => :rparen},
-        '|' => {:value => '|', :type => :lrparen},
-        '||' => {:value => '||', :type => :lrparen},
-        '{:' => {:value => nil, :type => :lparen},
-        ':}' => {:value => nil, :type => :rparen},
-
-        # Miscellaneous symbols
-        'int' => {:value => "\u222B", :type => :operator},
-        'dx' => {:value => 'dx', :type => :identifier},
-        'dy' => {:value => 'dy', :type => :identifier},
-        'dz' => {:value => 'dz', :type => :identifier},
-        'dt' => {:value => 'dt', :type => :identifier},
-        'oint' => {:value => "\u222E", :type => :operator},
-        'del' => {:value => "\u2202", :type => :operator},
-        'grad' => {:value => "\u2207", :type => :operator},
-        '+-' => {:value => "\u00B1", :type => :operator},
-        'O/' => {:value => "\u2205", :type => :operator},
-        'oo' => {:value => "\u221E", :type => :operator},
-        'aleph' => {:value => "\u2135", :type => :operator},
-        '...' => {:value => '...', :type => :operator},
-        ':.' => {:value => "\u2234", :type => :operator},
-        '/_' => {:value => "\u2220", :type => :operator},
-        '\\ ' => {:value => "\u00A0", :type => :operator},
-        'quad' => {:value => '\u00A0\u00A0', :type => :operator},
-        'qquad' => {:value => '\u00A0\u00A0\u00A0\u00A0', :type => :operator},
-        'cdots' => {:value => "\u22EF", :type => :operator},
-        'vdots' => {:value => "\u22EE", :type => :operator},
-        'ddots' => {:value => "\u22F1", :type => :operator},
-        'diamond' => {:value => "\u22C4", :type => :operator},
-        'square' => {:value => "\u25A1", :type => :operator},
-        '|__' => {:value => "\u230A", :type => :operator},
-        '__|' => {:value => "\u230B", :type => :operator},
-        '|~' => {:value => "\u2308", :type => :operator},
-        '~|' => {:value => "\u2309", :type => :operator},
-        'CC' => {:value => "\u2102", :type => :operator},
-        'NN' => {:value => "\u2115", :type => :operator},
-        'QQ' => {:value => "\u211A", :type => :operator},
-        'RR' => {:value => "\u211D", :type => :operator},
-        'ZZ' => {:value => "\u2124", :type => :operator},
-
-        'lim' => {:value => 'lim', :type => :operator, :underover => true},
-        'Lim' => {:value => 'Lim', :type => :operator, :underover => true},
-
-        # Standard functions
-        'sin' => {:value => 'sin', :type => :identifier},
-        'cos' => {:value => 'cos', :type => :identifier},
-        'tan' => {:value => 'tan', :type => :identifier},
-        'sec' => {:value => 'sec', :type => :identifier},
-        'csc' => {:value => 'csc', :type => :identifier},
-        'cot' => {:value => 'cot', :type => :identifier},
-        'arcsin' => {:value => 'arcsin', :type => :identifier},
-        'arccos' => {:value => 'arccos', :type => :identifier},
-        'arctan' => {:value => 'arctan', :type => :identifier},
-        'sinh' => {:value => 'sinh', :type => :identifier},
-        'cosh' => {:value => 'cosh', :type => :identifier},
-        'tanh' => {:value => 'tanh', :type => :identifier},
-        'sech' => {:value => 'sech', :type => :identifier},
-        'csch' => {:value => 'csch', :type => :identifier},
-        'coth' => {:value => 'coth', :type => :identifier},
-        'exp' => {:value => 'exp', :type => :identifier},
-        'log' => {:value => 'log', :type => :identifier},
-        'ln' => {:value => 'ln', :type => :identifier},
-        'det' => {:value => 'det', :type => :identifier},
-        'dim' => {:value => 'dim', :type => :identifier},
-        'mod' => {:value => 'mod', :type => :identifier},
-        'gcd' => {:value => 'gcd', :type => :identifier},
-        'lcm' => {:value => 'lcm', :type => :identifier},
-        'lub' => {:value => 'lub', :type => :identifier},
-        'glb' => {:value => 'glb', :type => :identifier},
-        'min' => {:value => 'min', :type => :identifier, :underover => true},
-        'max' => {:value => 'max', :type => :identifier, :underover => true},
-        'f' => {:value => 'f', :type => :identifier},
-        'g' => {:value => 'g', :type => :identifier},
-
-        # Accents
-        'hat' => {:value => "\u005E", :type => :accent, :position => :over},
-        'bar' => {:value => "\u00AF", :type => :accent, :position => :over},
-        'ul' => {:value => '_', :type => :accent, :position => :under},
-        'vec' => {:value => "\u2192", :type => :accent, :position => :over},
-        'dot' => {:value => '.', :type => :accent, :position => :over},
-        'ddot' => {:value => '..', :type => :accent, :position => :over},
-        'obrace' => {:value => "\u23DE", :type => :accent, :position => :over},
-        'ubrace' => {:value => "\u23DF", :type => :accent, :position => :under},
-
-        # Arrows
-        'uarr' => {:value => "\u2191", :type => :operator},
-        'darr' => {:value => "\u2193", :type => :operator},
-        'rarr' => {:value => "\u2192", :type => :operator},
-        '->' => {:value => "\u2192", :type => :operator},
-        '>->' => {:value => "\u21A3", :type => :operator},
-        '->>' => {:value => "\u21A0", :type => :operator},
-        '>->>' => {:value => "\u2916", :type => :operator},
-        '|->' => {:value => "\u21A6", :type => :operator},
-        'larr' => {:value => "\u2190", :type => :operator},
-        'harr' => {:value => "\u2194", :type => :operator},
-        'rArr' => {:value => "\u21D2", :type => :operator},
-        'lArr' => {:value => "\u21D0", :type => :operator},
-        'hArr' => {:value => "\u21D4", :type => :operator},
-
-        # Other
-        'sqrt' => {:value => :sqrt, :type => :unary},
-        'text' => {:value => :text, :type => :unary},
-        'bb' => {:value => :bold, :type => :font},
-        'bbb' => {:value => :double_struck, :type => :font},
-        'ii' => {:value => :italic, :type => :font},
-        'bii' => {:value => :bold_italic, :type => :font},
-        'cc' => {:value => :script, :type => :font},
-        'bcc' => {:value => :bold_script, :type => :font},
-        'tt' => {:value => :monospace, :type => :font},
-        'fr' => {:value => :fraktur, :type => :font},
-        'bfr' => {:value => :bold_fraktur, :type => :font},
-        'sf' => {:value => :sans_serif, :type => :font},
-        'bsf' => {:value => :bold_sans_serif, :type => :font},
-        'sfi' => {:value => :sans_serif_italic, :type => :font},
-        'sfbi' => {:value => :sans_serif_bold_italic, :type => :font},
-        'frac' => {:value => :frac, :type => :binary},
-        'root' => {:value => :root, :type => :binary},
-        'stackrel' => {:value => :over, :type => :binary},
-        '/' => {:value => :frac, :type => :infix},
-        '_' => {:value => :sub, :type => :infix},
-        '^' => {:value => :sup, :type => :infix},
-
-        # Greek letters
-        'alpha' => {:value => "\u03b1", :type => :identifier},
-        'Alpha' => {:value => "\u0391", :type => :identifier},
-        'beta' => {:value => "\u03b2", :type => :identifier},
-        'Beta' => {:value => "\u0392", :type => :identifier},
-        'gamma' => {:value => "\u03b3", :type => :identifier},
-        'Gamma' => {:value => "\u0393", :type => :operator},
-        'delta' => {:value => "\u03b4", :type => :identifier},
-        'Delta' => {:value => "\u0394", :type => :operator},
-        'epsilon' => {:value => "\u03b5", :type => :identifier},
-        'Epsilon' => {:value => "\u0395", :type => :identifier},
-        'varepsilon' => {:value => "\u025b", :type => :identifier},
-        'zeta' => {:value => "\u03b6", :type => :identifier},
-        'Zeta' => {:value => "\u0396", :type => :identifier},
-        'eta' => {:value => "\u03b7", :type => :identifier},
-        'Eta' => {:value => "\u0397", :type => :identifier},
-        'theta' => {:value => "\u03b8", :type => :identifier},
-        'Theta' => {:value => "\u0398", :type => :operator},
-        'vartheta' => {:value => "\u03d1", :type => :identifier},
-        'iota' => {:value => "\u03b9", :type => :identifier},
-        'Iota' => {:value => "\u0399", :type => :identifier},
-        'kappa' => {:value => "\u03ba", :type => :identifier},
-        'Kappa' => {:value => "\u039a", :type => :identifier},
-        'lambda' => {:value => "\u03bb", :type => :identifier},
-        'Lambda' => {:value => "\u039b", :type => :operator},
-        'mu' => {:value => "\u03bc", :type => :identifier},
-        'Mu' => {:value => "\u039c", :type => :identifier},
-        'nu' => {:value => "\u03bd", :type => :identifier},
-        'Nu' => {:value => "\u039d", :type => :identifier},
-        'xi' => {:value => "\u03be", :type => :identifier},
-        'Xi' => {:value => "\u039e", :type => :operator},
-        'omicron' => {:value => "\u03bf", :type => :identifier},
-        'Omicron' => {:value => "\u039f", :type => :identifier},
-        'pi' => {:value => "\u03c0", :type => :identifier},
-        'Pi' => {:value => "\u03a0", :type => :operator},
-        'rho' => {:value => "\u03c1", :type => :identifier},
-        'Rho' => {:value => "\u03a1", :type => :identifier},
-        'sigma' => {:value => "\u03c3", :type => :identifier},
-        'Sigma' => {:value => "\u03a3", :type => :operator},
-        'tau' => {:value => "\u03c4", :type => :identifier},
-        'Tau' => {:value => "\u03a4", :type => :identifier},
-        'upsilon' => {:value => "\u03c5", :type => :identifier},
-        'Upsilon' => {:value => "\u03a5", :type => :identifier},
-        'phi' => {:value => "\u03c6", :type => :identifier},
-        'Phi' => {:value => "\u03a6", :type => :identifier},
-        'varphi' => {:value => "\u03d5", :type => :identifier},
-        'chi' => {:value => '\u03b3c7', :type => :identifier},
-        'Chi' => {:value => '\u0393a7', :type => :identifier},
-        'psi' => {:value => "\u03c8", :type => :identifier},
-        'Psi' => {:value => "\u03a8", :type => :identifier},
-        'omega' => {:value => "\u03c9", :type => :identifier},
-        'Omega' => {:value => "\u03a9", :type => :operator},
-    }
+    def self.add_default_colors(b)
+      b.add('aqua', 0, 255, 255)
+      b.add('black', 0, 0, 0)
+      b.add('blue', 0, 0, 255)
+      b.add('fuchsia', 255, 0, 255)
+      b.add('gray', 128, 128, 128)
+      b.add('green', 0, 128, 0)
+      b.add('lime', 0, 255, 0)
+      b.add('maroon', 128, 0, 0)
+      b.add('navy', 0, 0, 128)
+      b.add('olive', 128, 128, 0)
+      b.add('purple', 128, 0, 128)
+      b.add('red', 255, 0, 0)
+      b.add('silver', 192, 192, 192)
+      b.add('teal', 0, 128, 128)
+      b.add('white', 255, 255, 255)
+      b.add('yellow', 255, 255, 0)
+      b
+    end
+
+    def self.add_default_parser_symbols(b)
+      # Operation symbols
+      b.add('+', :plus, :symbol)
+      b.add('-', :minus, :symbol)
+      b.add('*', 'cdot', :cdot, :symbol)
+      b.add('**', 'ast', :ast, :symbol)
+      b.add('***', 'star', :star, :symbol)
+      b.add('//', :slash, :symbol)
+      b.add('\\\\', 'backslash', :backslash, :symbol)
+      b.add('setminus', :setminus, :symbol)
+      b.add('xx', 'times', :times, :symbol)
+      b.add('|><', 'ltimes', :ltimes, :symbol)
+      b.add('><|', 'rtimes', :rtimes, :symbol)
+      b.add('|><|', 'bowtie', :bowtie, :symbol)
+      b.add('-:', 'div', 'divide', :div, :symbol)
+      b.add('@', 'circ', :circ, :symbol)
+      b.add('o+', 'oplus', :oplus, :symbol)
+      b.add('ox', 'otimes', :otimes, :symbol)
+      b.add('o.', 'odot', :odot, :symbol)
+      b.add('sum', :sum, :symbol)
+      b.add('prod', :prod, :symbol)
+      b.add('^^', 'wedge', :wedge, :symbol)
+      b.add('^^^', 'bigwedge', :bigwedge, :symbol)
+      b.add('vv', 'vee', :vee, :symbol)
+      b.add('vvv', 'bigvee', :bigvee, :symbol)
+      b.add('nn', 'cap', :cap, :symbol)
+      b.add('nnn', 'bigcap', :bigcap, :symbol)
+      b.add('uu', 'cup', :cup, :symbol)
+      b.add('uuu', 'bigcup', :bigcup, :symbol)
+
+      # Relation symbols
+      b.add('=', :eq, :symbol)
+      b.add('!=', 'ne', :ne, :symbol)
+      b.add(':=', :assign, :symbol)
+      b.add('<', 'lt', :lt, :symbol)
+      b.add('>', 'gt', :gt, :symbol)
+      b.add('<=', 'le', :le, :symbol)
+      b.add('>=', 'ge', :ge, :symbol)
+      b.add('-<', '-lt', 'prec', :prec, :symbol)
+      b.add('>-', 'succ', :succ, :symbol)
+      b.add('-<=', 'preceq', :preceq, :symbol)
+      b.add('>-=', 'succeq', :succeq, :symbol)
+      b.add('in', :in, :symbol)
+      b.add('!in', 'notin', :notin, :symbol)
+      b.add('sub', 'subset', :subset, :symbol)
+      b.add('sup', 'supset', :supset, :symbol)
+      b.add('sube', 'subseteq', :subseteq, :symbol)
+      b.add('supe', 'supseteq', :supseteq, :symbol)
+      b.add('-=', 'equiv', :equiv, :symbol)
+      b.add('~=', 'cong', :cong, :symbol)
+      b.add('~~', 'approx', :approx, :symbol)
+      b.add('prop', 'propto', :propto, :symbol)
+
+      # Logical symbols
+      b.add('and', :and, :symbol)
+      b.add('or', :or, :symbol)
+      b.add('not', 'neg', :not, :symbol)
+      b.add('=>', 'implies', :implies, :symbol)
+      b.add('if', :if, :symbol)
+      b.add('<=>', 'iff', :iff, :symbol)
+      b.add('AA', 'forall', :forall, :symbol)
+      b.add('EE', 'exists', :exists, :symbol)
+      b.add('_|_', 'bot', :bot, :symbol)
+      b.add('TT', 'top', :top, :symbol)
+      b.add('|--', 'vdash', :vdash, :symbol)
+      b.add('|==', 'models', :models, :symbol)
+
+      # Grouping brackets
+      b.add('(', 'left(', :lparen, :lparen)
+      b.add(')', 'right)', :rparen, :rparen)
+      b.add('[', 'left[', :lbracket, :lparen)
+      b.add(']', 'right]', :rbracket, :rparen)
+      b.add('{', :lbrace, :lparen)
+      b.add('}', :rbrace, :rparen)
+      b.add('|', :vbar, :lrparen)
+      b.add(':|:', :vbar, :symbol)
+      b.add('|:', :vbar, :lparen)
+      b.add(':|', :vbar, :rparen)
+      # b.add('||', '||', :lrparen)
+      b.add('(:', '<<', 'langle', :langle, :lparen)
+      b.add(':)', '>>', 'rangle', :rangle, :rparen)
+      b.add('{:', nil, :lparen)
+      b.add(':}', nil, :rparen)
+
+      # Miscellaneous symbols
+      b.add('int', :integral, :symbol)
+      b.add('dx', :dx, :symbol)
+      b.add('dy', :dy, :symbol)
+      b.add('dz', :dz, :symbol)
+      b.add('dt', :dt, :symbol)
+      b.add('oint', :contourintegral, :symbol)
+      b.add('del', 'partial', :partial, :symbol)
+      b.add('grad', 'nabla', :nabla, :symbol)
+      b.add('+-', 'pm', :pm, :symbol)
+      b.add('O/', 'emptyset', :emptyset, :symbol)
+      b.add('oo', 'infty', :infty, :symbol)
+      b.add('aleph', :aleph, :symbol)
+      b.add('...', 'ldots', :ellipsis, :symbol)
+      b.add(':.', 'therefore', :therefore, :symbol)
+      b.add(':\'', 'because', :because, :symbol)
+      b.add('/_', 'angle', :angle, :symbol)
+      b.add('/_\\', 'triangle', :triangle, :symbol)
+      b.add('\'', 'prime', :prime, :symbol)
+      b.add('tilde', :tilde, :unary)
+      b.add('\\ ', :nbsp, :symbol)
+      b.add('frown', :frown, :symbol)
+      b.add('quad', :quad, :symbol)
+      b.add('qquad', :qquad, :symbol)
+      b.add('cdots', :cdots, :symbol)
+      b.add('vdots', :vdots, :symbol)
+      b.add('ddots', :ddots, :symbol)
+      b.add('diamond', :diamond, :symbol)
+      b.add('square', :square, :symbol)
+      b.add('|__', 'lfloor', :lfloor, :symbol)
+      b.add('__|', 'rfloor', :rfloor, :symbol)
+      b.add('|~', 'lceiling', :lceiling, :symbol)
+      b.add('~|', 'rceiling', :rceiling, :symbol)
+      b.add('CC', :dstruck_captial_c, :symbol)
+      b.add('NN', :dstruck_captial_n, :symbol)
+      b.add('QQ', :dstruck_captial_q, :symbol)
+      b.add('RR', :dstruck_captial_r, :symbol)
+      b.add('ZZ', :dstruck_captial_z, :symbol)
+      b.add('f', :f, :symbol)
+      b.add('g', :g, :symbol)
+
+
+      # Standard functions
+      b.add('lim', :lim, :symbol)
+      b.add('Lim', :Lim, :symbol)
+      b.add('min', :min, :symbol)
+      b.add('max', :max, :symbol)
+      b.add('sin', :sin, :symbol)
+      b.add('Sin', :Sin, :symbol)
+      b.add('cos', :cos, :symbol)
+      b.add('Cos', :Cos, :symbol)
+      b.add('tan', :tan, :symbol)
+      b.add('Tan', :Tan, :symbol)
+      b.add('sinh', :sinh, :symbol)
+      b.add('Sinh', :Sinh, :symbol)
+      b.add('cosh', :cosh, :symbol)
+      b.add('Cosh', :Cosh, :symbol)
+      b.add('tanh', :tanh, :symbol)
+      b.add('Tanh', :Tanh, :symbol)
+      b.add('cot', :cot, :symbol)
+      b.add('Cot', :Cot, :symbol)
+      b.add('sec', :sec, :symbol)
+      b.add('Sec', :Sec, :symbol)
+      b.add('csc', :csc, :symbol)
+      b.add('Csc', :Csc, :symbol)
+      b.add('arcsin', :arcsin, :symbol)
+      b.add('arccos', :arccos, :symbol)
+      b.add('arctan', :arctan, :symbol)
+      b.add('coth', :coth, :symbol)
+      b.add('sech', :sech, :symbol)
+      b.add('csch', :csch, :symbol)
+      b.add('exp', :exp, :symbol)
+      b.add('abs', :abs, :unary)
+      b.add('Abs', :abs, :unary)
+      b.add('norm', :norm, :unary)
+      b.add('floor', :floor, :unary)
+      b.add('ceil', :ceil, :unary)
+      b.add('log', :log, :symbol)
+      b.add('Log', :Log, :symbol)
+      b.add('ln', :ln, :symbol)
+      b.add('Ln', :Ln, :symbol)
+      b.add('det', :det, :symbol)
+      b.add('dim', :dim, :symbol)
+      b.add('ker', :ker, :symbol)
+      b.add('mod', :mod, :symbol)
+      b.add('gcd', :gcd, :symbol)
+      b.add('lcm', :lcm, :symbol)
+      b.add('lub', :lub, :symbol)
+      b.add('glb', :glb, :symbol)
+
+      # Arrows
+      b.add('uarr', 'uparrow', :uparrow, :symbol)
+      b.add('darr', 'downarrow', :downarrow, :symbol)
+      b.add('rarr', 'rightarrow', :rightarrow, :symbol)
+      b.add('->', 'to', :to, :symbol)
+      b.add('>->', 'rightarrowtail', :rightarrowtail, :symbol)
+      b.add('->>', 'twoheadrightarrow', :twoheadrightarrow, :symbol)
+      b.add('>->>', 'twoheadrightarrowtail', :twoheadrightarrowtail, :symbol)
+      b.add('|->', 'mapsto', :mapsto, :symbol)
+      b.add('larr', 'leftarrow', :leftarrow, :symbol)
+      b.add('harr', 'leftrightarrow', :leftrightarrow, :symbol)
+      b.add('rArr', 'Rightarrow', :Rightarrow, :symbol)
+      b.add('lArr', 'Leftarrow', :Leftarrow, :symbol)
+      b.add('hArr', 'Leftrightarrow', :Leftrightarrow, :symbol)
+
+      # Other
+      b.add('sqrt', :sqrt, :unary)
+      b.add('root', :root, :binary)
+      b.add('frac', :frac, :binary)
+      b.add('/', :frac, :infix)
+      b.add('stackrel', :stackrel, :binary)
+      b.add('overset', :overset, :binary)
+      b.add('underset', :underset, :binary)
+      b.add('color', :color, :binary, :convert_operand1 => ::AsciiMath::Parser.instance_method(:convert_to_color))
+      b.add('_', :sub, :infix)
+      b.add('^', :sup, :infix)
+      b.add('hat', :hat, :unary)
+      b.add('bar', :overline, :unary)
+      b.add('vec', :vec, :unary)
+      b.add('dot', :dot, :unary)
+      b.add('ddot', :ddot, :unary)
+      b.add('overarc', 'overparen', :overarc, :unary)
+      b.add('ul', 'underline', :underline, :unary)
+      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('ii', :italic, :unary)
+      b.add('bii', :bold_italic, :unary)
+      b.add('cc', :script, :unary)
+      b.add('bcc', :bold_script, :unary)
+      b.add('tt', :monospace, :unary)
+      b.add('fr', :fraktur, :unary)
+      b.add('bfr', :bold_fraktur, :unary)
+      b.add('sf', :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)
+      b.add('rm', :roman, :unary)
+
+      # Greek letters
+      b.add('alpha', :alpha, :symbol)
+      b.add('Alpha', :Alpha, :symbol)
+      b.add('beta', :beta, :symbol)
+      b.add('Beta', :Beta, :symbol)
+      b.add('gamma', :gamma, :symbol)
+      b.add('Gamma', :Gamma, :symbol)
+      b.add('delta', :delta, :symbol)
+      b.add('Delta', :Delta, :symbol)
+      b.add('epsi', 'epsilon', :epsilon, :symbol)
+      b.add('Epsilon', :Epsilon, :symbol)
+      b.add('varepsilon', :varepsilon, :symbol)
+      b.add('zeta', :zeta, :symbol)
+      b.add('Zeta', :Zeta, :symbol)
+      b.add('eta', :eta, :symbol)
+      b.add('Eta', :Eta, :symbol)
+      b.add('theta', :theta, :symbol)
+      b.add('Theta', :Theta, :symbol)
+      b.add('vartheta', :vartheta, :symbol)
+      b.add('iota', :iota, :symbol)
+      b.add('Iota', :Iota, :symbol)
+      b.add('kappa', :kappa, :symbol)
+      b.add('Kappa', :Kappa, :symbol)
+      b.add('lambda', :lambda, :symbol)
+      b.add('Lambda', :Lambda, :symbol)
+      b.add('mu', :mu, :symbol)
+      b.add('Mu', :Mu, :symbol)
+      b.add('nu', :nu, :symbol)
+      b.add('Nu', :Nu, :symbol)
+      b.add('xi', :xi, :symbol)
+      b.add('Xi', :Xi, :symbol)
+      b.add('omicron', :omicron, :symbol)
+      b.add('Omicron', :Omicron, :symbol)
+      b.add('pi', :pi, :symbol)
+      b.add('Pi', :Pi, :symbol)
+      b.add('rho', :rho, :symbol)
+      b.add('Rho', :Rho, :symbol)
+      b.add('sigma', :sigma, :symbol)
+      b.add('Sigma', :Sigma, :symbol)
+      b.add('tau', :tau, :symbol)
+      b.add('Tau', :Tau, :symbol)
+      b.add('upsilon', :upsilon, :symbol)
+      b.add('Upsilon', :Upsilon, :symbol)
+      b.add('phi', :phi, :symbol)
+      b.add('Phi', :Phi, :symbol)
+      b.add('varphi', :varphi, :symbol)
+      b.add('chi', :chi, :symbol)
+      b.add('Chi', :Chi, :symbol)
+      b.add('psi', :psi, :symbol)
+      b.add('Psi', :Psi, :symbol)
+      b.add('omega', :omega, :symbol)
+      b.add('Omega', :Omega, :symbol)
+
+      b
+    end
+
+    def initialize(symbol_table, color_table)
+      @symbol_table = symbol_table
+      @color_table = color_table
+    end
 
     def parse(input)
       Expression.new(
           input,
-          parse_expression(Tokenizer.new(input, SYMBOLS), 0)
+          parse_expression(Tokenizer.new(input, @symbol_table), 0)
       )
     end
 
     private
+
+    include AsciiMath::AST
+
     def parse_expression(tok, depth)
       e = []
 
-      while (s1 = parse_simple_expression(tok, depth))
+      while (s1 = parse_intermediate_expression(tok, depth))
         t1 = tok.next_token
 
-        if t1[:type] == :infix
-          s2 = parse_simple_expression(tok, depth)
-          t2 = tok.next_token
-          if t1[:value] == :sub && t2[:value] == :sup
-            s3 = parse_simple_expression(tok, depth)
-            operator = s1[:underover] ? :underover : :subsup
-            e << {:type => :ternary, :operator => operator, :s1 => s1, :s2 => s2, :s3 => s3}
+        if t1[:type] == :infix && t1[:value] == :frac
+          s2 = parse_intermediate_expression(tok, depth)
+          if s2
+            e << infix(unwrap_paren(s1), symbol(:frac, t1[:text]), unwrap_paren(s2))
           else
-            operator = s1[:underover] ? (t1[:value] == :sub ? :under : :over) : t1[:value]
-            e << {:type => :binary, :operator => operator, :s1 => s1, :s2 => s2}
-            tok.push_back(t2)
-            if (t2[:type] == :lrparen || t2[:type] == :rparen) && depth > 0
-              break
-            end
+            e << s1
           end
         elsif t1[:type] == :eof
           e << s1
@@ -497,7 +540,46 @@ module AsciiMath
         end
       end
 
-      e
+      expression(*e)
+    end
+
+    def parse_intermediate_expression(tok, depth)
+      s = parse_simple_expression(tok, depth)
+      sub = nil
+      sup = nil
+
+      t1 = tok.next_token
+      case t1[:type]
+        when :infix
+          case t1[:value]
+            when :sub
+              sub = parse_simple_expression(tok, depth)
+              if sub
+                t2 = tok.next_token
+                if t2[:type] == :infix && t2[:value] == :sup
+                  sup = parse_simple_expression(tok, depth)
+                else
+                  tok.push_back(t2)
+                end
+              end
+            when :sup
+              sup = parse_simple_expression(tok, depth)
+            else
+              tok.push_back(t1)
+          end
+        else
+          tok.push_back(t1)
+      end
+
+      if sub && sup
+        subsup(s, unwrap_paren(sub), unwrap_paren(sup))
+      elsif sub
+        sub(s, unwrap_paren(sub))
+      elsif sup
+        sup(s, unwrap_paren(sup))
+      else
+        s
+      end
     end
 
     def parse_simple_expression(tok, depth)
@@ -508,7 +590,7 @@ module AsciiMath
           t2 = tok.next_token
           case t2[:type]
             when :rparen, :lrparen
-              {:type => :paren, :e => nil, :lparen => t1[:value], :rparen => t2[:value]}
+              paren(token_to_symbol(t1), nil, token_to_symbol(t2))
             else
               tok.push_back(t2)
 
@@ -517,93 +599,171 @@ module AsciiMath
               t2 = tok.next_token
               case t2[:type]
                 when :rparen, :lrparen
-                  convert_to_matrix({:type => :paren, :e => e, :lparen => t1[:value], :rparen => t2[:value]})
+                  convert_to_matrix(paren(token_to_symbol(t1), e, token_to_symbol(t2)))
                 else
                   tok.push_back(t2)
-                  {:type => :paren, :e => e, :lparen => t1[:value]}
+                  paren(token_to_symbol(t1), e, nil)
               end
           end
-        when :accent
-          s = parse_simple_expression(tok, depth)
-          {:type => :binary, :s1 => s, :s2 => {:type => :operator, :c => t1[:value]}, :operator => t1[:position]}
-        when :unary, :font
-          s = parse_simple_expression(tok, depth)
-          {:type => t1[:type], :s => s, :operator => t1[:value]}
+        when :rparen
+          if depth > 0
+            tok.push_back(t1)
+            nil
+          else
+            token_to_symbol(t1)
+          end
+        when :unary
+          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 = parse_simple_expression(tok, depth)
-          s2 = parse_simple_expression(tok, depth)
-          {:type => :binary, :s1 => s1, :s2 => s2, :operator => t1[:value]}
+          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])
+
+          binary(token_to_symbol(t1), s1, s2)
         when :eof
           nil
+        when :number
+          number(t1[:value])
+        when :text
+          text(t1[:value])
+        when :identifier
+          identifier(t1[:value])
         else
-          {:type => t1[:type], :c => t1[:value], :underover => t1[:underover]}
+          token_to_symbol(t1)
+      end
+    end
+
+    def token_to_symbol(t1)
+      symbol(t1[:value], t1[:text])
+    end
+
+    def unwrap_paren(node)
+      if node.is_a?(::AsciiMath::AST::Paren)
+        group(node.lparen, node.expression, node.rparen)
+      else
+        node
       end
     end
 
-    def convert_to_matrix(expression)
-      return expression unless expression.is_a?(Hash) && expression[:type] == :paren
+    def convert_to_matrix(node)
+      return node unless node.is_a?(::AsciiMath::AST::Paren) && node.expression.is_a?(::AsciiMath::AST::Sequence)
 
-      rows, separators = expression[:e].partition.with_index { |obj, i| i.even? }
-      return expression unless rows.length > 1 &&
+      rows, separators = node.expression.partition.with_index { |obj, i| i.even? }
+      return node unless rows.length > 1 &&
           rows.length > separators.length &&
           separators.all? { |item| is_matrix_separator(item) } &&
-          (rows.all? { |item| item[:type] == :paren && item[:lparen] == '(' && item[:rparen] == ')' } ||
-              rows.all? { |item| item[:type] == :paren && item[:lparen] == '[' && item[:rparen] == ']' })
+          (rows.all? { |item| item.is_a?(::AsciiMath::AST::Paren) && item.lparen == symbol(:lparen, '(') && item.rparen == symbol(:rparen, ')') } ||
+              rows.all? { |item| item.is_a?(::AsciiMath::AST::Paren) && item.lparen == symbol(:lbracket, '[') && item.rparen == symbol(:rbracket, ']') })
 
       rows = rows.map do |row|
         chunks = []
         current_chunk = []
-        row[:e].each do |item|
-          if is_matrix_separator(item)
-            chunks << current_chunk
-            current_chunk = []
-          else
-            current_chunk << item
+
+        row_content = row.expression
+        unless row_content.is_a?(::AsciiMath::AST::Sequence)
+          [expression(row_content)]
+        else
+          row_content.each do |item|
+            if is_matrix_separator(item)
+              chunks << current_chunk
+              current_chunk = []
+            else
+              current_chunk << item
+            end
           end
-        end
 
-        chunks << current_chunk
+          chunks << current_chunk
 
-        chunks.map {|c| c.length == 1 ? c[0] : c }.to_a
+          chunks.map { |c| c.length == 1 ? c[0] : expression(*c) }.to_a
+        end
       end
 
-      return expression unless rows.all? { |row| row.length == rows[0].length }
+      return node unless rows.all? { |row| row.length == rows[0].length }
 
-      {:type => :matrix, :rows => rows, :lparen => expression[:lparen], :rparen => expression[:rparen]}
+      matrix(node.lparen, rows, node.rparen)
     end
 
-    def is_matrix_separator(item)
-      item[:type] == :identifier && item[:c] == ','
+    def is_matrix_separator(node)
+      node.is_a?(Identifier) && node.value == ','
     end
 
-    def matrix?(expression)
-      return false unless expression.is_a?(Hash) && expression[:type] == :paren
-
-      rows, separators = expression[:e].partition.with_index { |obj, i| i.even? }
-
-      rows.length > 1 &&
-          rows.length > separators.length &&
-          separators.all?(&method(:is_matrix_separator)) &&
-          (rows.all? { |item| item[:type] == :paren && item[:lparen] == '(' && item[:rparen] == ')' } ||
-              rows.all? { |item| item[:type] == :paren && item[:lparen] == '[' && item[:rparen] == ']' }) &&
-          rows.all? { |item| item[:e].length == rows[0][:e].length } &&
-          rows.all? { |item| matrix_cols?(item[:e]) }
+    def convert_node(node, converter)
+      case converter
+        when nil
+          node
+        when UnboundMethod
+          converter.bind(self).call(node)
+        when Method, Proc
+          converter.call(node)
+      end
     end
 
-    def matrix_cols?(expression)
-      return false unless expression.is_a?(Array)
+    def convert_to_color(color_expression)
+      s = ""
+      append_color_text(s, color_expression)
 
-      cols, separators = expression.partition.with_index { |obj, i| i.even? }
+      case s
+        when /#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})/i
+          color_value = {:r => $1.to_i(16), :g => $2.to_i(16), :b => $3.to_i(16), }
+        when /#([0-9a-f])([0-9a-f])([0-9a-f])/i
+          color_value = {:r => "#{$1}#{$1}".to_i(16), :g => "#{$2}#{$2}".to_i(16), :b => "#{$3}#{$3}".to_i(16), }
+        else
+          color_value = @color_table[s.downcase] || {:r => 0, :g => 0, :b => 0}
+      end
 
-      cols.all? { |item| item[:type] != :identifier || item[:c] != ',' } &&
-          separators.all?(&method(:is_col_separator))
+      color(color_value[:r], color_value[:g], color_value[:b], s)
     end
+
+    def append_color_text(s, node)
+      case node
+        when ::AsciiMath::AST::Sequence
+          node.each { |n| append_color_text(s, n) }
+        when ::AsciiMath::AST::Number, ::AsciiMath::AST::Identifier, ::AsciiMath::AST::Text
+          s << node.value
+        when ::AsciiMath::AST::Symbol
+          s << node.text
+        when ::AsciiMath::AST::Group
+          append_color_text(s, node.expression)
+        when ::AsciiMath::AST::Paren
+          append_color_text(s, node.lparen)
+          append_color_text(s, node.expression)
+          append_color_text(s, node.rparen)
+        when ::AsciiMath::AST::SubSup
+          append_color_text(s, node.base_expression)
+          append_color_text(s, node.operator)
+          append_color_text(s, node.operand2)
+        when ::AsciiMath::AST::UnaryOp
+          append_color_text(s, node.operator)
+          append_color_text(s, node.operand)
+        when ::AsciiMath::AST::BinaryOp
+          append_color_text(s, node.operator)
+          append_color_text(s, node.operand1)
+          append_color_text(s, node.operand2)
+        when ::AsciiMath::AST::InfixOp
+          append_color_text(s, node.operand1)
+          append_color_text(s, node.operator)
+          append_color_text(s, node.operand2)
+      end
+    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
   end
 
   class Expression
-    def initialize(asciimath, parsed_expression)
+    attr_accessor :ast
+
+    def initialize(asciimath, ast)
       @asciimath = asciimath
-      @parsed_expression = parsed_expression
+      @ast = ast
     end
 
     def to_s
@@ -611,7 +771,7 @@ module AsciiMath
     end
   end
 
-  def self.parse(asciimath)
-    Parser.new.parse(asciimath)
+  def self.parse(asciimath, parser_symbol_table = ::AsciiMath::Parser::DEFAULT_PARSER_SYMBOL_TABLE, parser_color_table = ::AsciiMath::Parser::DEFAULT_COLOR_TABLE)
+    Parser.new(parser_symbol_table, parser_color_table).parse(asciimath)
   end
 end