plurimath 0.11.0 → 0.11.1

data/lib/plurimath/unicode_math/parsing_rules/sub_sup.rb

@@ -20,26 +20,52 @@ module Plurimath
 
         rule(:power_symbol) { str("^") }
         rule(:power_syntax) { power_symbol | above }
-        rule(:sub_override) { (invisible_space? >> base_syntax >> op_size_overrides_symbols >> (operator_symbols.maybe >> baseless_sub_values(:sub_script))) }
-        rule(:sup_override) { (invisible_space? >> power_syntax >> op_size_overrides_symbols >> (operator_symbols.maybe >> baseless_sup_values(:sup_script))) }
+        rule(:sub_override) do
+          invisible_space? >> base_syntax >> op_size_overrides_symbols >> (operator_symbols.maybe >> baseless_sub_values(:sub_script))
+        end
+        rule(:sup_override) do
+          invisible_space? >> power_syntax >> op_size_overrides_symbols >> (operator_symbols.maybe >> baseless_sup_values(:sup_script))
+        end
 
-        rule(:sub_sup_paren) { sub_paren.as(:sub_paren) | sup_paren.as(:sup_paren) }
-        rule(:pre_subscript) { base_syntax >> prescript_values.as(:pre_subscript) | sub_paren.as(:pre_subscript) }
-        rule(:pre_supscript) { power_syntax >> prescript_values.as(:pre_supscript) | sup_paren.as(:pre_supscript) }
+        rule(:sub_sup_paren) do
+          sub_paren.as(:sub_paren) | sup_paren.as(:sup_paren)
+        end
+        rule(:pre_subscript) do
+          (base_syntax >> prescript_values.as(:pre_subscript)) | sub_paren.as(:pre_subscript)
+        end
+        rule(:pre_supscript) do
+          (power_syntax >> prescript_values.as(:pre_supscript)) | sup_paren.as(:pre_supscript)
+        end
 
-        rule(:mini_sub_value) { (sub_sup_operand.as(:base) >> sub_paren.as(:sub)).as(:mini_sub) }
-        rule(:mini_sup_value) { (sub_sup_operand.as(:base) >> sup_paren.as(:sup)).as(:mini_sup) }
+        rule(:mini_sub_value) do
+          (sub_sup_operand.as(:base) >> sub_paren.as(:sub)).as(:mini_sub)
+        end
+        rule(:mini_sup_value) do
+          (sub_sup_operand.as(:base) >> sup_paren.as(:sup)).as(:mini_sup)
+        end
 
-        rule(:pre_script_base) { (operand.as(:base) >> (subsup | mini_subsup | subscript_value | supscript_value).maybe) }
+        rule(:pre_script_base) do
+          operand.as(:base) >> (subsup | mini_subsup | subscript_value | supscript_value).maybe
+        end
 
         rule(:sub_sup_override) { sub_override | sup_override }
-        rule(:operator_symbols) { combined_symbols | negatable_symbols | operator }
-        rule(:invisible_space?) { (invisible_unicode? >> invisible_times.maybe).maybe }
-        rule(:prescript_values) { operand | mini_sub_sup | operator_symbols | binary_symbols }
+        rule(:operator_symbols) do
+          combined_symbols | negatable_symbols | operator
+        end
+        rule(:invisible_space?) do
+          (invisible_unicode? >> invisible_times.maybe).maybe
+        end
+        rule(:prescript_values) do
+          operand | mini_sub_sup | operator_symbols | binary_symbols
+        end
 
-        rule(:power_base_script) { (base_value >> subsup).as(:subsup_exp) | subscript.as(:sub_exp) | supscript.as(:sup_exp) }
+        rule(:power_base_script) do
+          (base_value >> subsup).as(:subsup_exp) | subscript.as(:sub_exp) | supscript.as(:sup_exp)
+        end
 
-        rule(:mini_sub_sup_present?) { mini_sub_value.present? | mini_sup_value.present? | mini_subsup.present? }
+        rule(:mini_sub_sup_present?) do
+          mini_sub_value.present? | mini_sup_value.present? | mini_subsup.present?
+        end
 
         rule(:subscript_value) do
           (sub_paren | baseless_sub.as(:sub)) >> recursive_baseless_sub_exp.maybe
@@ -50,8 +76,8 @@ module Plurimath
         end
 
         rule(:pre_sub_sup_override) do
-          base_syntax >> op_size_overrides_symbols >> prescript_values.as(:pre_subscript) |
-            power_syntax >> op_size_overrides_symbols >> prescript_values.as(:pre_supscript)
+          (base_syntax >> op_size_overrides_symbols >> prescript_values.as(:pre_subscript)) |
+            (power_syntax >> op_size_overrides_symbols >> prescript_values.as(:pre_supscript))
         end
 
         rule(:naryand_recursion) do
@@ -84,11 +110,11 @@ module Plurimath
         end
 
         rule(:naryand_values) do
-          binomial_fraction.absent? >> fraction.as(:frac) |
+          (binomial_fraction.absent? >> fraction.as(:frac)) |
             (exp_bracket >> (subsup | subscript_value | supscript_value).maybe) |
             (exp_script >> space?) |
-            binomial_fraction.as(:frac) >> space? |
-            negatable_symbols.absent? >> sub_sup_operand
+            (binomial_fraction.as(:frac) >> space?) |
+            (negatable_symbols.absent? >> sub_sup_operand)
         end
 
         rule(:mini_sub_sup) do
@@ -110,27 +136,27 @@ module Plurimath
         end
 
         rule(:base_value) do
-          op_nary.present? >> op_nary >> invisible_space? >> number.as(:mask).maybe |
-            script_base.as(:base) >> invisible_space?
+          (op_nary.present? >> op_nary >> invisible_space? >> number.as(:mask).maybe) |
+            (script_base.as(:base) >> invisible_space?)
         end
 
         rule(:subsup) do
-          op_size_overrides_symbols.absent? >> baseless_sub.as(:sub) >> (sup_override.as(:sup) | baseless_sup.as(:sup)) |
-            op_size_overrides_symbols.absent? >> baseless_sup.as(:sup) >> (sub_override.as(:sub) | baseless_sub.as(:sub)) |
-            (sub_override.as(:sub) | baseless_sub.as(:sub)) >> baseless_sup.as(:sup) |
-            (sup_override.as(:sup) | baseless_sup.as(:sup)) >> baseless_sub.as(:sub)
+          (op_size_overrides_symbols.absent? >> baseless_sub.as(:sub) >> (sup_override.as(:sup) | baseless_sup.as(:sup))) |
+            (op_size_overrides_symbols.absent? >> baseless_sup.as(:sup) >> (sub_override.as(:sub) | baseless_sub.as(:sub))) |
+            ((sub_override.as(:sub) | baseless_sub.as(:sub)) >> baseless_sup.as(:sup)) |
+            ((sup_override.as(:sup) | baseless_sup.as(:sup)) >> baseless_sub.as(:sub))
         end
 
         rule(:mini_subsup) do
-          sub_paren.as(:sub) >> sup_paren.as(:sup) |
-            sup_paren.as(:sup) >> sub_paren.as(:sub)
+          (sub_paren.as(:sub) >> sup_paren.as(:sup)) |
+            (sup_paren.as(:sup) >> sub_paren.as(:sub))
         end
 
         rule(:accents_subsup) do
-          baseless_sub.as(:sub) >> baseless_sup.as(:sup) |
-            baseless_sup.as(:sup) >> baseless_sub.as(:sub) |
-            sub_paren.as(:sub) >> sup_paren.as(:sup) |
-            sup_paren.as(:sup) >> sub_paren.as(:sub) |
+          (baseless_sub.as(:sub) >> baseless_sup.as(:sup)) |
+            (baseless_sup.as(:sup) >> baseless_sub.as(:sub)) |
+            (sub_paren.as(:sub) >> sup_paren.as(:sup)) |
+            (sup_paren.as(:sup) >> sub_paren.as(:sub)) |
             baseless_sub.as(:sub) |
             baseless_sup.as(:sup) |
             sub_paren.as(:sub) |
@@ -138,38 +164,38 @@ module Plurimath
         end
 
         rule(:mini_power_base) do
-          sup_paren.as(:pre_supscript) >> sub_paren.as(:pre_subscript).maybe >> mini_values.as(:mini_base) >> sub_paren.as(:mini_sub).maybe >> mini_values.as(:mini_sup) |
-            sub_paren.as(:pre_subscript) >> sup_paren.as(:pre_supscript).maybe >> mini_values.as(:mini_base) >> sup_paren.as(:mini_sup).maybe >> mini_values.as(:mini_sub) |
-            mini_values.as(:mini_base) >> sub_paren.as(:mini_sub) >> mini_values.as(:mini_sup) |
-            mini_values.as(:mini_base) >> sup_paren.as(:mini_sup) >> sub_paren.as(:mini_sub) |
-            mini_values.as(:mini_base) >> mini_values.as(:mini_sup) |
-            mini_values.as(:mini_base) >> sub_paren.as(:mini_sub)
+          (sup_paren.as(:pre_supscript) >> sub_paren.as(:pre_subscript).maybe >> mini_values.as(:mini_base) >> sub_paren.as(:mini_sub).maybe >> mini_values.as(:mini_sup)) |
+            (sub_paren.as(:pre_subscript) >> sup_paren.as(:pre_supscript).maybe >> mini_values.as(:mini_base) >> sup_paren.as(:mini_sup).maybe >> mini_values.as(:mini_sub)) |
+            (mini_values.as(:mini_base) >> sub_paren.as(:mini_sub) >> mini_values.as(:mini_sup)) |
+            (mini_values.as(:mini_base) >> sup_paren.as(:mini_sup) >> sub_paren.as(:mini_sub)) |
+            (mini_values.as(:mini_base) >> mini_values.as(:mini_sup)) |
+            (mini_values.as(:mini_base) >> sub_paren.as(:mini_sub))
         end
 
         rule(:mini_values) do
           op_sup_operators |
-          op_sub_operators |
-          op_sup_digits |
-          op_sub_digits |
-          op_sup_alpha |
-          op_sub_alpha
+            op_sub_operators |
+            op_sup_digits |
+            op_sub_digits |
+            op_sup_alpha |
+            op_sub_alpha
         end
 
         rule(:exp_script) do
-          op_nary.present? >> nary_sub_sup.as(:nary) |
-            op_unary_functions.present? >> unary_sub_sup.as(:unary_subsup) |
-            accents.present? >> (accents.as(:base) >> accents_subsup).as(:accents_subsup) |
+          (op_nary.present? >> nary_sub_sup.as(:nary)) |
+            (op_unary_functions.present? >> unary_sub_sup.as(:unary_subsup)) |
+            (accents.present? >> (accents.as(:base) >> accents_subsup).as(:accents_subsup)) |
             power_base_script |
             (base_value >> sub_sup_override).as(:override_subsup) |
-            pre_sub_sup_override.as(:pre_override_subsup) >> pre_script_base |
+            (pre_sub_sup_override.as(:pre_override_subsup) >> pre_script_base) |
             (paren_wrap_rule(pre_subsup) >> space? >> pre_script_base).as(:pre_script) |
             mini_sub_sup |
             mini_power_base
         end
 
         rule(:pre_subsup) do
-          pre_subscript >> pre_supscript |
-            pre_supscript >> pre_subscript |
+          (pre_subscript >> pre_supscript) |
+            (pre_supscript >> pre_subscript) |
             pre_subscript |
             pre_supscript
         end
@@ -177,7 +203,7 @@ module Plurimath
         rule(:sub_sup_operand) do
           binary_symbols |
             accents |
-            op_unary_functions >> invisible_unicode? |
+            (op_unary_functions >> invisible_unicode?) |
             alpha_numeric_values |
             number |
             an_math |
@@ -191,37 +217,37 @@ module Plurimath
         end
 
         rule(:sub_alpha_digits) do
-          (op_sub_digits >> op_sub_alpha).as(:expr) >> sub_paren.as(:sub_recursion).maybe |
-            (op_sub_alpha >> op_sub_digits).as(:expr) >> sub_paren.as(:sub_recursion).maybe |
-            op_sub_alpha >> sub_paren.as(:sub_recursion_expr).maybe |
-            op_sub_digits >> sub_paren.as(:sub_recursion_expr).maybe |
-            op_sub_operators >> sub_paren.as(:sub_recursions).maybe
+          ((op_sub_digits >> op_sub_alpha).as(:expr) >> sub_paren.as(:sub_recursion).maybe) |
+            ((op_sub_alpha >> op_sub_digits).as(:expr) >> sub_paren.as(:sub_recursion).maybe) |
+            (op_sub_alpha >> sub_paren.as(:sub_recursion_expr).maybe) |
+            (op_sub_digits >> sub_paren.as(:sub_recursion_expr).maybe) |
+            (op_sub_operators >> sub_paren.as(:sub_recursions).maybe)
         end
 
         rule(:sup_alpha_digits) do
-          (op_sup_digits >> op_sup_alpha).as(:expr) >> sup_paren.as(:sup_recursion).maybe |
-            (op_sup_alpha >> op_sup_digits).as(:expr) >> sup_paren.as(:sup_recursion).maybe |
-            op_sup_alpha >> sup_paren.as(:sup_recursion_expr).maybe |
-            op_sup_digits >> sup_paren.as(:sup_recursion_expr).maybe |
-            op_sup_operators >> sup_paren.as(:sup_recursions).maybe
+          ((op_sup_digits >> op_sup_alpha).as(:expr) >> sup_paren.as(:sup_recursion).maybe) |
+            ((op_sup_alpha >> op_sup_digits).as(:expr) >> sup_paren.as(:sup_recursion).maybe) |
+            (op_sup_alpha >> sup_paren.as(:sup_recursion_expr).maybe) |
+            (op_sup_digits >> sup_paren.as(:sup_recursion_expr).maybe) |
+            (op_sup_operators >> sup_paren.as(:sup_recursions).maybe)
         end
 
         rule(:sub_paren) do
-          (op_sub_open_paren >> sub_alpha_digits.as(:mini_expr) >> op_sub_close_paren).as(:mini_intermediate_exp) >> sub_paren.maybe |
-            sub_alpha_digits >> sub_paren.maybe
+          ((op_sub_open_paren >> sub_alpha_digits.as(:mini_expr) >> op_sub_close_paren).as(:mini_intermediate_exp) >> sub_paren.maybe) |
+            (sub_alpha_digits >> sub_paren.maybe)
         end
 
         rule(:sup_paren) do
-          (op_sup_open_paren >> sup_alpha_digits.as(:mini_expr) >> op_sup_close_paren).as(:mini_intermediate_exp) >> sup_paren.maybe |
-            sup_alpha_digits >> sup_paren.maybe
+          ((op_sup_open_paren >> sup_alpha_digits.as(:mini_expr) >> op_sup_close_paren).as(:mini_intermediate_exp) >> sup_paren.maybe) |
+            (sup_alpha_digits >> sup_paren.maybe)
         end
 
         rule(:sub_sup_values) do
           (operator_symbols.as(:expr) >> (((mini_sub_sup | sub_or_sup) >> space?) >> bracketed_soperand.maybe)) |
             (operator_symbols.as(:expr) >> bracketed_soperand) |
             (((primes | prefixed_primes).as(:symbol).as(:first_value) >> repeated_accent_symbols).as(:accents) >> (sub_or_sup.maybe >> space? >> bracketed_soperand).maybe) |
-            bracketed_soperand >> str("−").absent? >> operator_symbols.absent? >> sub_sup_values.as(:expr).maybe |
-            sub_sup_binary_absent >> str("−").absent? >> operator_symbols.absent? >> sub_sup_values.as(:expr).maybe |
+            (bracketed_soperand >> str("−").absent? >> operator_symbols.absent? >> sub_sup_values.as(:expr).maybe) |
+            (sub_sup_binary_absent >> str("−").absent? >> operator_symbols.absent? >> sub_sup_values.as(:expr).maybe) |
             bracketed_soperand |
             prefixed_primes |
             primes |
@@ -229,10 +255,10 @@ module Plurimath
         end
 
         rule(:alpha_numeric_values) do
-          alpha_ascii >> alpha_numeric_values.as(:expr) |
-          (number | n_ascii) >> alpha_numeric_values.as(:expr) |
-          alpha_ascii |
-          (number | n_ascii)
+          (alpha_ascii >> alpha_numeric_values.as(:expr)) |
+            ((number | n_ascii) >> alpha_numeric_values.as(:expr)) |
+            alpha_ascii |
+            (number | n_ascii)
         end
 
         def paren_wrap_rule(passed_rule)
@@ -241,13 +267,13 @@ module Plurimath
         end
 
         def baseless_sub_values(soperand_name)
-          (mini_sub_sup | sub_sup_paren).as(soperand_name) >> recursive_baseless_sub_exp.maybe >> sub_sup_values.maybe |
-            sub_sup_values.as(soperand_name) >> recursive_baseless_sub_exp.maybe
+          ((mini_sub_sup | sub_sup_paren).as(soperand_name) >> recursive_baseless_sub_exp.maybe >> sub_sup_values.maybe) |
+            (sub_sup_values.as(soperand_name) >> recursive_baseless_sub_exp.maybe)
         end
 
         def baseless_sup_values(soperand_name)
-          (mini_sub_sup | sub_sup_paren).as(soperand_name) >> recursive_baseless_sup_exp.maybe >> sub_sup_values.maybe |
-            sub_sup_values.as(soperand_name) >> recursive_baseless_sup_exp.maybe
+          ((mini_sub_sup | sub_sup_paren).as(soperand_name) >> recursive_baseless_sup_exp.maybe >> sub_sup_values.maybe) |
+            (sub_sup_values.as(soperand_name) >> recursive_baseless_sup_exp.maybe)
         end
       end
     end