From cd5baa7eb44b0e755946481cb43f20f736ab693b Mon Sep 17 00:00:00 2001
From: Heiko Bauke <heiko.bauke@mail.de>
Date: Sun, 31 Dec 2023 18:00:54 +0100
Subject: [PATCH] improve type setting

add no spaces around unary + and -
---
 qml/pages/SimpleCalculator.qml | 118 +++++++++++++++++----------------
 src/Calculator.cpp             |  51 ++++++++------
 src/Calculator.hpp             |   3 +-
 3 files changed, 93 insertions(+), 79 deletions(-)

diff --git a/qml/pages/SimpleCalculator.qml b/qml/pages/SimpleCalculator.qml
index a185e83..d45c1ab 100644
--- a/qml/pages/SimpleCalculator.qml
+++ b/qml/pages/SimpleCalculator.qml
@@ -25,7 +25,7 @@ Page {
       }
       MenuItem {
         text: qsTr('Get memory')
-        onClicked: formula.text = formula.text + simpleCalculatorPage.memory
+        onClicked: formula.text = calculator.typeset(formula.text + simpleCalculatorPage.memory)
       }
       MenuItem {
         text: qsTr('Save result')
@@ -126,13 +126,13 @@ Page {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '√'
-            onClicked: formula.text = formula.text + '√('
+            onClicked: formula.text = calculator.typeset(formula.text + '√(')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '^'
-            onClicked: formula.text = formula.text + '^'
+            onClicked: formula.text = calculator.typeset(formula.text + '^')
           }
           PCButton {
             visible: model.index === 0
@@ -148,134 +148,136 @@ Page {
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '<b>C</b>'
             onClicked: {
-              if (formula.text.length > 0) {
-                if (formula.text.slice(-1) === ' ')
-                  formula.text = formula.text.slice(0, -1)
+              var text = formula.text
+              if (text.length > 0) {
+                if (text.slice(-1) === ' ')
+                  text = text.slice(0, -1)
               }
-              if (formula.text.match(/[a-z]+\($/)) {
-                formula.text = formula.text.replace(/[a-z]+\($/, '')
+              if (text.match(/[a-z]+\($/)) {
+                text = text.replace(/[a-z]+\($/, '')
               } else {
-                if (formula.text.length > 0) {
-                  formula.text = formula.text.slice(0, -1)
+                if (text.length > 0) {
+                  text = text.slice(0, -1)
                 }
-                if (formula.text.length > 0) {
-                  if (formula.text.slice(-1) === ' ')
-                    formula.text = formula.text.slice(0, -1)
+                if (text.length > 0) {
+                  if (text.slice(-1) === ' ')
+                    text = text.slice(0, -1)
                 }
-                if (formula.text.length > 0) {
-                  if (formula.text.slice(-1) === '√')
-                    formula.text = formula.text.slice(0, -1)
+                if (text.length > 0) {
+                  if (text.slice(-1) === '√')
+                    text = text.slice(0, -1)
                 }
               }
+              formula.text = calculator.typeset(text)
             }
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '('
-            onClicked: formula.text = formula.text + '('
+            onClicked: formula.text = calculator.typeset(formula.text + '(')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: ')'
-            onClicked: formula.text = formula.text + ')'
+            onClicked: formula.text = calculator.typeset(formula.text + ')')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'π'
-            onClicked: formula.text = formula.text + 'π'
+            onClicked: formula.text = calculator.typeset(formula.text + 'π')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '+'
-            onClicked: formula.text = formula.text + ' + '
+            onClicked: formula.text = calculator.typeset(formula.text + '+')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '1'
-            onClicked: formula.text = formula.text + '1'
+            onClicked: formula.text = calculator.typeset(formula.text + '1')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '2'
-            onClicked: formula.text = formula.text + '2'
+            onClicked: formula.text = calculator.typeset(formula.text + '2')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '3'
-            onClicked: formula.text = formula.text + '3'
+            onClicked: formula.text = calculator.typeset(formula.text + '3')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '−'
-            onClicked: formula.text = formula.text + ' − '
+            onClicked: formula.text = calculator.typeset(formula.text + '−')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '4'
-            onClicked: formula.text = formula.text + '4'
+            onClicked: formula.text = calculator.typeset(formula.text + '4')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '5'
-            onClicked: formula.text = formula.text + '5'
+            onClicked: formula.text = calculator.typeset(formula.text + '5')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '6'
-            onClicked: formula.text = formula.text + '6'
+            onClicked: formula.text = calculator.typeset(formula.text + '6')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '×'
-            onClicked: formula.text = formula.text + ' · '
+            onClicked: formula.text = calculator.typeset(formula.text + '·')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '7'
-            onClicked: formula.text = formula.text + '7'
+            onClicked: formula.text = calculator.typeset(formula.text + '7')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '8'
-            onClicked: formula.text = formula.text + '8'
+            onClicked: formula.text = calculator.typeset(formula.text + '8')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '9'
-            onClicked: formula.text = formula.text + '9'
+            onClicked: formula.text = calculator.typeset(formula.text + '9')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '/'
-            onClicked: formula.text = formula.text + ' / '
+            onClicked: formula.text = calculator.typeset(formula.text + '/')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '0'
-            onClicked: formula.text = formula.text + '0'
+            onClicked: formula.text = calculator.typeset(formula.text + '0')
           }
           PCButton {
             visible: model.index === 0
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '.'
-            onClicked: formula.text = formula.text + '.'
+            onClicked: formula.text = calculator.typeset(formula.text + '.')
           }
           PCButton {
             visible: model.index === 0
@@ -292,145 +294,145 @@ Page {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'sin'
-            onClicked: formula.text = formula.text + 'sin('
+            onClicked: formula.text = calculator.typeset(formula.text + 'sin(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'asin'
-            onClicked: formula.text = formula.text + 'asin('
+            onClicked: formula.text = calculator.typeset(formula.text + 'asin(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'sinh'
-            onClicked: formula.text = formula.text + 'sinh('
+            onClicked: formula.text = calculator.typeset(formula.text + 'sinh(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'asinh'
-            onClicked: formula.text = formula.text + 'asinh('
+            onClicked: formula.text = calculator.typeset(formula.text + 'asinh(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'cos'
-            onClicked: formula.text = formula.text + 'cos('
+            onClicked: formula.text = calculator.typeset(formula.text + 'cos(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'acos'
-            onClicked: formula.text = formula.text + 'acos('
+            onClicked: formula.text = calculator.typeset(formula.text + 'acos(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'cosh'
-            onClicked: formula.text = formula.text + 'cosh('
+            onClicked: formula.text = calculator.typeset(formula.text + 'cosh(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'acosh'
-            onClicked: formula.text = formula.text + 'acosh('
+            onClicked: formula.text = calculator.typeset(formula.text + 'acosh(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'tan'
-            onClicked: formula.text = formula.text + 'tan('
+            onClicked: formula.text = calculator.typeset(formula.text + 'tan(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'atan'
-            onClicked: formula.text = formula.text + 'atan('
+            onClicked: formula.text = calculator.typeset(formula.text + 'atan(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'tanh'
-            onClicked: formula.text = formula.text + 'tanh('
+            onClicked: formula.text = calculator.typeset(formula.text + 'tanh(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'atanh'
-            onClicked: formula.text = formula.text + 'atanh('
+            onClicked: formula.text = calculator.typeset(formula.text + 'atanh(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'cot'
-            onClicked: formula.text = formula.text + 'cot('
+            onClicked: formula.text = calculator.typeset(formula.text + 'cot(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'acot'
-            onClicked: formula.text = formula.text + 'acot('
+            onClicked: formula.text = calculator.typeset(formula.text + 'acot(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'coth'
-            onClicked: formula.text = formula.text + 'coth('
+            onClicked: formula.text = calculator.typeset(formula.text + 'coth(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'acoth'
-            onClicked: formula.text = formula.text + 'acoth('
+            onClicked: formula.text = calculator.typeset(formula.text + 'acoth(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'exp'
-            onClicked: formula.text = formula.text + 'exp('
+            onClicked: formula.text = calculator.typeset(formula.text + 'exp(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'ln'
-            onClicked: formula.text = formula.text + 'ln('
+            onClicked: formula.text = calculator.typeset(formula.text + 'ln(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '!'
-            onClicked: formula.text = formula.text + '!'
+            onClicked: formula.text = calculator.typeset(formula.text + '!')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: '°'
-            onClicked: formula.text = formula.text + '°'
+            onClicked: formula.text = calculator.typeset(formula.text + '°')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'abs'
-            onClicked: formula.text = formula.text + 'abs('
+            onClicked: formula.text = calculator.typeset(formula.text + 'abs(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'log'
-            onClicked: formula.text = formula.text + 'log('
+            onClicked: formula.text = calculator.typeset(formula.text + 'log(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'rad'
-            onClicked: formula.text = formula.text + 'rad('
+            onClicked: formula.text = calculator.typeset(formula.text + 'rad(')
           }
           PCButton {
             visible: model.index === 1
             Layout.preferredWidth: Theme.buttonWidthSmall / 2.125
             text: 'deg'
-            onClicked: formula.text = formula.text + 'deg('
+            onClicked: formula.text = calculator.typeset(formula.text + 'deg(')
           }
         }
       }
diff --git a/src/Calculator.cpp b/src/Calculator.cpp
index 08cd88e..34bce3a 100644
--- a/src/Calculator.cpp
+++ b/src/Calculator.cpp
@@ -49,13 +49,7 @@ void Calculator::init_variables() {
 
 
 QVariantMap Calculator::calculate(QString formula) {
-  static const QRegularExpression pi_regex{R"(\bpi\b)"};
-  static const QRegularExpression sqrt_regex{R"(\bsqrt\b)"};
-  static const QRegularExpression Gamma_regex{R"(\bGamma\b)"};
-  static const QRegularExpression gamma_regex{R"(\bgamma\b)"};
-  static const QRegularExpression leading_spaces_regex{R"(^\s*)"};
   static const QRegularExpression assignment_regex{R"(^\s*([[:alpha:]]\w*)\s*=\s*(.*))"};
-  static const QRegularExpression binary_operator_regex{R"(([=+−·/]))"};
 
   QString formula_plain{formula};
   formula_plain.replace("−", "-")
@@ -81,18 +75,8 @@ QVariantMap Calculator::calculate(QString formula) {
   } catch (std::exception &e) {
     error = e.what();
   }
-  QString res_str{typeset(res)};
-  formula.replace(" ", "")
-      .replace("-", "−")
-      .replace("*", "·")
-      .replace(binary_operator_regex, " \\1 ")
-      .replace(",", ", ")
-      .replace(pi_regex, "π")
-      .replace(sqrt_regex, "√")
-      .replace(Gamma_regex, "Γ")
-      .replace(gamma_regex, "γ")
-      .replace(leading_spaces_regex, "")
-      .replace("  ", " ");
+  QString res_str{typeset_value(res)};
+  formula = typeset(formula);
   if (auto match{assignment_regex.match(formula)}; match.hasMatch())
     formula = match.capturedRef(2).toString();
   QVariantMap res_map;
@@ -121,10 +105,37 @@ void Calculator::clear() {
 }
 
 
+QString Calculator::typeset(QString formula) const {
+  static const QRegularExpression pi_regex{R"(\bpi\b)"};
+  static const QRegularExpression sqrt_regex{R"(\bsqrt\b)"};
+  static const QRegularExpression Gamma_regex{R"(\bGamma\b)"};
+  static const QRegularExpression gamma_regex{R"(\bgamma\b)"};
+  static const QRegularExpression leading_spaces_regex{R"(^\s*)"};
+  static const QRegularExpression ending_spaces_regex{R"(\s*$)"};
+  static const QRegularExpression binary_operator1_regex{R"((?<!^|\(|=)([+−]))"};
+  static const QRegularExpression binary_operator2_regex{R"(([=·/]))"};
+
+  formula.replace(" ", "")
+      .replace("-", "−")
+      .replace("*", "·")
+      .replace(binary_operator1_regex, " \\1 ")
+      .replace(binary_operator2_regex, " \\1 ")
+      .replace(",", ", ")
+      .replace(pi_regex, "π")
+      .replace(sqrt_regex, "√")
+      .replace(Gamma_regex, "Γ")
+      .replace(gamma_regex, "γ")
+      .replace(leading_spaces_regex, "")
+      .replace(ending_spaces_regex, "")
+      .replace("  ", " ");
+  return formula;
+};
+
+
 QVariantList Calculator::getVariables() const {
   QVariantList list;
   for (const auto &x : m_variables) {
-    QString value_str{typeset(x.second)};
+    QString value_str{typeset_value(x.second)};
     QString name_str{x.first};
     if (name_str == "pi")
       name_str = "π";
@@ -139,7 +150,7 @@ QVariantList Calculator::getVariables() const {
 }
 
 
-QString Calculator::typeset(double x) {
+QString Calculator::typeset_value(double x) {
   static const QRegularExpression pos_exponent_regex{R"(e[+](\d+))"};
   static const QRegularExpression neg_exponent_regex{R"(e[-](\d+))"};
 
diff --git a/src/Calculator.hpp b/src/Calculator.hpp
index 508e9b4..02e5342 100644
--- a/src/Calculator.hpp
+++ b/src/Calculator.hpp
@@ -22,6 +22,7 @@ class Calculator : public QObject {
   Q_INVOKABLE QVariantMap calculate(QString formula);
   Q_INVOKABLE void removeVariable(int);
   Q_INVOKABLE void clear();
+  Q_INVOKABLE QString typeset(QString formula) const;
 
   Q_PROPERTY(QVariantList variables READ getVariables NOTIFY variablesChanged)
 
@@ -35,6 +36,6 @@ class Calculator : public QObject {
   math_parser::arithmetic_parser m_parser;
   math_parser::arithmetic_parser::var_map_t m_variables;
 
-  static QString typeset(double x);
+  static QString typeset_value(double x);
   static QString get_settings_path();
 };