Add paren around negativ numbers and mulitple interms around an integ…

…rand.
soegaard · Oct 3, 2023 · 331c211 · 331c211
1 parent f5cced2
commit 331c211
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/racket-cas/format.rkt b/racket-cas/format.rkt
@@ -689,7 +689,16 @@
         [(list 'bar u) (~a "\\bar{" (v~ u) "}")]            ; TODO: only for TeX 
         [(list* 'braces  us) (apply ~a (append (list "\\{") (add-between (map v~ us) ",") (list "\\}")))] ; TODO: only for TeX 
         [(list* 'bracket us) (apply ~a (append (list   "[") (add-between (map v~ us) ",") (list "]")))] ; TODO: only for TeX 
-        [(list 'int u v)   (~a "\\int " (v~ u) "\\ \\textrm{d}" (v~ v))] ; TODO: only for TeX
+
+        [(list 'int u v)   (cond
+                             [(or (and (number? u) (negative? u))
+                                  (match u
+                                    [(list '* u0 ...) (and (number? u0) (negative? u0))]
+                                    [(list (or '+ '-) _ ...)  #t]
+                                    [_ #f]))
+                              (~a "\\int " (v~ `(paren ,u)) "\\ \\textrm{d}" (v~ v))]
+                             [else
+                              (~a "\\int " (v~ u) "\\ \\textrm{d}" (v~ v))])] ; TODO: only for TeX
 
         ; applications
         [(app: f us) (let ()
@@ -963,7 +972,15 @@
       [(list 'bar u)      (~a "\\bar{" (v~ u) "}")]            ; TODO: only for TeX
       [(list 'where u v)  (~a (v~ u) " | " (v~ v))]        ; TODO: only for TeX
 
-      [(list 'int u v)   (~a "\\int " (v~ u) "\\ \\textrm{d}" (v~ v))] ; TODO: only for TeX
+        [(list 'int u v)   (cond
+                             [(or (and (number? u) (negative? u))
+                                  (match u
+                                    [(list '* u0 ...) (and (number? u0) (negative? u0))]
+                                    [(list (or '+ '-) _ ...)  #t]
+                                    [_ #f]))
+                              (~a "\\int " (v~ `(paren ,u)) "\\ \\textrm{d}" (v~ v))]
+                             [else
+                              (~a "\\int " (v~ u) "\\ \\textrm{d}" (v~ v))])] ; TODO: only for TeX
 
       [(list* 'braces  us) (apply ~a (append (list "\\{") (add-between (map v~ us) ",") (list "\\}")))] ; TODO: only for TeX 
       [(list* 'bracket us) (apply ~a (append (list   "[") (add-between (map v~ us) ",") (list "]")))] ; TODO: only for TeX