From 2b3f77c6edcdc9ae182c0a95b259b34d24ffd46b Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sun, 3 Jul 2022 14:49:32 +0100 Subject: [PATCH] dot/emacs-calc: Reformat some more definitions. --- dot/emacs-calc | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/dot/emacs-calc b/dot/emacs-calc index 36c12e9..4754b4c 100644 --- a/dot/emacs-calc +++ b/dot/emacs-calc @@ -79,33 +79,42 @@ constant bounds." (setq calc-group-char " ") (setq calc-frac-format '("/" nil)) (setq calc-date-format '(Www " " D " " Mmmm " " YYYY (", " h ":" mm ":" ss))) -(setq calc-standard-date-formats '("N" "Www Mmm D, YYYY" "YYYY-MM-DD< hh:mm:ss>" "Www Mmm BD< hh:mm:ss> YYYY" "Www D Mmmm YYYY<, h:mm:ss>" "D.M.Y< h:mm:SS>" "M-D-Y< H:mm:SSpp>" "D-M-Y< h:mmCSS>" "j<, h:mm:SS>" "YYddd< hh:mm:ss>")) +(setq calc-standard-date-formats '("N" + "Www Mmm D, YYYY" + "YYYY-MM-DD< hh:mm:ss>" + "Www Mmm BD< hh:mm:ss> YYYY" + "Www D Mmmm YYYY<, h:mm:ss>" + "D.M.Y< h:mm:SS>" + "M-D-Y< H:mm:SSpp>" + "D-M-Y< h:mmCSS>" + "j<, h:mm:SS>" + "YYddd< hh:mm:ss>")) (setq calc-complex-format 'i) (setq calc-previous-modulo '(bigpos 296 967 294 4)) (setq calc-angle-mode 'rad) ;;; End of mode settings ;;; Custom units stored by Calc on Thu Mar 18 19:02:50 1999 -(setq math-additional-units '( - (EB "1024 * PB" "Exabyte") - (PB "1024 * TB" "Petabyte") - (TB "1024 * GB" "Terabyte") - (gig "GB" "Gigabyte") - (GB "1024 * MB" "Gigabyte") - (meg "MB" "Megabyte") - (MB "1024 * kB" "Megabyte") - (KB "kB" "Kilobyte") - (kB "1024 * byte" "Kilobyte") - (Eb "1024 * Pb" "Exabit") - (Pb "1024 * Tb" "Petabit") - (Tb "1024 * Gb" "Teraabit") - (Gb "1024 * Mb" "Gigabit") - (Mb "1024 * kb" "Megabit") - (Kb "kb" "Kilobit") - (kb "1024 * bit" "Kilobit") - (byte "octet" "Byte") - (octet "8 * bit" "Octet") - (bit nil "Bit"))) +(setq math-additional-units + '((EB "1024 * PB" "Exabyte") + (PB "1024 * TB" "Petabyte") + (TB "1024 * GB" "Terabyte") + (gig "GB" "Gigabyte") + (GB "1024 * MB" "Gigabyte") + (meg "MB" "Megabyte") + (MB "1024 * kB" "Megabyte") + (KB "kB" "Kilobyte") + (kB "1024 * byte" "Kilobyte") + (Eb "1024 * Pb" "Exabit") + (Pb "1024 * Tb" "Petabit") + (Tb "1024 * Gb" "Teraabit") + (Gb "1024 * Mb" "Gigabit") + (Mb "1024 * kb" "Megabit") + (Kb "kb" "Kilobit") + (kb "1024 * bit" "Kilobit") + (byte "octet" "Byte") + (octet "8 * bit" "Octet") + (bit nil "Bit"))) ;;; End of custom units ;;; Variable "var-AlgSimpRules" stored by Calc on Thu Jan 6 21:04:23 2000 -- 2.11.0