arithmetic: Add space around mod and rem in rendering

Add spaces around `mod` and `rem` during rendering. Fixes: #906 Signed-off-by: Christophe de Dinechin <christophe@dinechin.org>
c3d · Apr 16, 2024 · b404edd · b404edd
1 parent f36718f
commit b404edd
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/color-images/expression.png b/color-images/expression.png
diff --git a/color-images/reduced.png b/color-images/reduced.png
diff --git a/color-images/two-levels.png b/color-images/two-levels.png
diff --git a/images/expression.png b/images/expression.png
diff --git a/images/reduced.png b/images/reduced.png
diff --git a/images/two-levels.png b/images/two-levels.png
diff --git a/src/expression.cc b/src/expression.cc
@@ -160,13 +160,19 @@ symbol_p expression::render(uint depth, int &precedence, bool editing)
         break;
         case 2:
         {
-            int lprec = 0, rprec = 0;
-            symbol_g op = obj->as_symbol(editing);
+            int      lprec = 0, rprec = 0;
+            symbol_g op   = obj->as_symbol(editing);
             symbol_g rtxt = render(depth, rprec, editing);
             symbol_g ltxt = render(depth, lprec, editing);
-            int prec = obj->precedence();
+            int      prec = obj->precedence();
             if (prec != precedence::FUNCTION)
             {
+                id oid  = obj->type();
+                if (oid == ID_mod || oid == ID_rem)
+                {
+                    op = symbol::make(' ') + op;
+                    op = op + symbol::make(' ');
+                }
                 if (lprec < prec)
                     ltxt = parentheses(ltxt);
                 if (rprec <= prec)
@@ -1879,9 +1885,10 @@ grob_p expression::graph(grapher &g, uint depth, int &precedence)
             {
                 if (lprec < prec)
                     lg = parentheses(g, lg);
-                if (rprec < prec ||
-                    (rprec == prec && (oid == ID_sub || oid == ID_div)))
-                    rg = parentheses(g, rg);
+                if (oid != ID_pow)
+                    if (rprec < prec ||
+                        (rprec == prec && (oid == ID_sub || oid == ID_div)))
+                        rg = parentheses(g, rg);
             }
             precedence = prec;
             switch (oid)

diff --git a/src/tests.cc b/src/tests.cc
@@ -158,7 +158,7 @@ void tests::run(bool onlyCurrent)
     if (onlyCurrent)
     {
         here().begin("Current");
-        sorting_functions();
+        regression_checks();
     }
     else
     {
@@ -6930,6 +6930,12 @@ void tests::regression_checks()
         .test("1968.1205", F6).expect("1 968 ²⁴¹/₂ ₀₀₀")
         .test("1968.0512", F6).expect("1 968 ³²/₆₂₅")
         .test(LSHIFT, N, RSHIFT, F4); // Reset modes
+
+    step("Bug 906: mod and rem should have spaces during editing")
+        .test(CLEAR, "X Y mod", ENTER).expect("'X mod Y'")
+        .test(NOSHIFT, DOWN, ENTER).expect("'X mod Y'")
+        .test(CLEAR, "X Y rem", ENTER).expect("'X rem Y'")
+        .test(NOSHIFT, DOWN, ENTER).expect("'X rem Y'");
 }