lib/plurimath/latex/transform.rb in plurimath-0.6.0 vs lib/plurimath/latex/transform.rb in plurimath-0.7.0

@@ -12,11 +12,11 @@
       rule(operant: simple(:oper))    { Math::Symbol.new(oper) }
       rule(symbol: simple(:symbol))   { Math::Symbol.new(symbol) }
       rule(lparen: simple(:lparen))   { Math::Symbol.new(lparen) }
       rule(rparen: simple(:rparen))   { Math::Symbol.new(rparen) }
       rule(limits: simple(:limits))   { limits }
-      rule("\\\\" => simple(:slash))  { Math::Symbol.new(slash) }
+      rule("\\\\" => simple(:slash))  { Math::Function::Linebreak.new }
       rule(expression: simple(:expr)) { expr }
       rule(environment: simple(:env)) { env }
       rule(ternary: simple(:ternary)) { Utility.get_class(ternary).new }
 
       rule(unary_functions: simple(:unary)) { unary }
@@ -486,60 +486,60 @@
         )
       end
 
       rule(text: simple(:text),
            first_value: simple(:first_value)) do
-        Math::Function::Text.new(first_value)
+        Utility.get_class(text).new(first_value)
       end
 
       rule(text: simple(:text),
            first_value: sequence(:first_value)) do
-        Math::Function::Text.new(first_value.join)
+        Utility.get_class(text).new(first_value.join)
       end
 
       rule(text: simple(:text),
            first_value: simple(:first_value),
            supscript: simple(:supscript),) do
         Math::Function::Power.new(
-          Math::Function::Text.new(first_value),
+          Utility.get_class(text).new(first_value),
           supscript,
         )
       end
 
       rule(text: simple(:text),
            first_value: sequence(:first_value),
            supscript: simple(:supscript),) do
         Math::Function::Power.new(
-          Math::Function::Text.new(first_value.join),
+          Utility.get_class(text).new(first_value.join),
           supscript,
         )
       end
 
       rule(text: simple(:text),
            first_value: sequence(:first_value),
            subscript: simple(:subscript)) do
         Math::Function::Base.new(
-          Math::Function::Text.new(first_value.join),
+          Utility.get_class(text).new(first_value.join),
           subscript,
         )
       end
 
       rule(text: simple(:text),
            first_value: simple(:first_value),
            subscript: simple(:subscript)) do
         Math::Function::Base.new(
-          Math::Function::Text.new(first_value),
+          Utility.get_class(text).new(first_value),
           subscript,
         )
       end
 
       rule(text: simple(:text),
            first_value: simple(:first_value),
            subscript: simple(:subscript),
            supscript: simple(:supscript)) do
         Math::Function::PowerBase.new(
-          Math::Function::Text.new(first_value),
+          Utility.get_class(text).new(first_value),
           subscript,
           supscript,
         )
       end
 
@@ -946,15 +946,11 @@
         )
       end
 
       rule(substack: simple(:substack),
            expression: sequence(:value)) do
-        tds = Utility.td_values(value, "\\\\")
-
-        substack_values = tds.map { |td| Math::Function::Tr.new([td]) }
         Math::Function::Substack.new(
-          substack_values.shift,
-          substack_values.shift,
+          Utility.organize_table(value),
         )
       end
     end
   end
 end