Fixed calc to eqn conversion

3 files changed, 23 insertions, 15 deletions

diff --git a/README.md b/README.md
index 71657b8..258ad95 100644
--- a/README.md
+++ b/README.md
@@ -214,7 +214,7 @@ format.
     ;; Author: Ian Martins <ianxm@jhu.edu>
     ;; Keywords: tools, education, math
     ;; Homepage: https://gitlab.com/ianxm/mathsheet
-    ;; Version: 1.1
+    ;; Version: 1.2
     ;; Package-Requires: ((peg "1.0")
     ;;                    (emacs "28.1"))
     
@@ -923,10 +923,12 @@ Calc already knows how to convert between formats, so we let it do it.
     
       EXPR should be in normal calc format.  The result is the same
       expression (not simplified) but in eqn format for groff."
-      (let ((current-language calc-language))
+      (let ((current-language calc-language)
+            calc-expr)
+        (calc-set-language nil)
+        (setq calc-expr (math-read-expr expr))
         (calc-set-language 'eqn)
-        (let* ((calc-expr (math-read-expr expr))
-               (eqn-expr (math-format-stack-value (list calc-expr 1 nil)))
+        (let* ((eqn-expr (math-format-stack-value (list calc-expr 1 nil)))
                (eqn-expr-cleaned (replace-regexp-in-string (rx "1:" (* space)) "" eqn-expr)))
           (calc-set-language current-language)
           eqn-expr-cleaned)))
@@ -936,10 +938,12 @@ Calc already knows how to convert between formats, so we let it do it.
     
       EXPR should be in normal calc format.  The result is the same
       expression (not simplified) but in eqn format for groff."
-      (let ((current-language calc-language))
+      (let ((current-language calc-language)
+            calc-expr)
+        (calc-set-language nil)
+        (setq calc-expr (math-read-expr expr))
         (calc-set-language 'eqn)
-        (let* ((calc-expr (math-read-expr expr))
-               (eqn-expr (math-format-stack-value (list calc-expr 1 nil)))
+        (let* ((eqn-expr (math-format-stack-value (list calc-expr 1 nil)))
                (eqn-expr-cleaned (replace-regexp-in-string (rx "1:" (* space)) "" eqn-expr)))
           (calc-set-language current-language)
           eqn-expr-cleaned)))
diff --git a/mathsheet.el b/mathsheet.el
index 7b75541..3584995 100644
--- a/mathsheet.el
+++ b/mathsheet.el
@@ -5,7 +5,7 @@
 ;; Author: Ian Martins <ianxm@jhu.edu>
 ;; Keywords: tools, education, math
 ;; Homepage: https://gitlab.com/ianxm/mathsheet
-;; Version: 1.1
+;; Version: 1.2
 ;; Package-Requires: ((peg "1.0")
 ;;                    (emacs "28.1"))
 
@@ -521,10 +521,12 @@ ordered."
 
   EXPR should be in normal calc format.  The result is the same
   expression (not simplified) but in eqn format for groff."
-  (let ((current-language calc-language))
+  (let ((current-language calc-language)
+        calc-expr)
+    (calc-set-language nil)
+    (setq calc-expr (math-read-expr expr))
     (calc-set-language 'eqn)
-    (let* ((calc-expr (math-read-expr expr))
-           (eqn-expr (math-format-stack-value (list calc-expr 1 nil)))
+    (let* ((eqn-expr (math-format-stack-value (list calc-expr 1 nil)))
            (eqn-expr-cleaned (replace-regexp-in-string (rx "1:" (* space)) "" eqn-expr)))
       (calc-set-language current-language)
       eqn-expr-cleaned)))
diff --git a/mathsheet.org b/mathsheet.org
index d38e451..b971a77 100644
--- a/mathsheet.org
+++ b/mathsheet.org
@@ -204,7 +204,7 @@ format.
   ;; Author: Ian Martins <ianxm@jhu.edu>
   ;; Keywords: tools, education, math
   ;; Homepage: https://gitlab.com/ianxm/mathsheet
-  ;; Version: 1.1
+  ;; Version: 1.2
   ;; Package-Requires: ((peg "1.0")
   ;;                    (emacs "28.1"))
 
@@ -982,10 +982,12 @@ Calc already knows how to convert between formats, so we let it do it.
 
     EXPR should be in normal calc format.  The result is the same
     expression (not simplified) but in eqn format for groff."
-    (let ((current-language calc-language))
+    (let ((current-language calc-language)
+          calc-expr)
+      (calc-set-language nil)
+      (setq calc-expr (math-read-expr expr))
       (calc-set-language 'eqn)
-      (let* ((calc-expr (math-read-expr expr))
-             (eqn-expr (math-format-stack-value (list calc-expr 1 nil)))
+      (let* ((eqn-expr (math-format-stack-value (list calc-expr 1 nil)))
              (eqn-expr-cleaned (replace-regexp-in-string (rx "1:" (* space)) "" eqn-expr)))
         (calc-set-language current-language)
         eqn-expr-cleaned)))