1.1--- a/lisp/lib/organ/object/timestamp.lisp Tue Aug 13 22:05:23 2024 -0400
1.2+++ b/lisp/lib/organ/object/timestamp.lisp Wed Aug 14 21:49:56 2024 -0400
1.3@@ -22,28 +22,6 @@
1.4 ;;; Code:
1.5 (in-package :organ)
1.6
1.7-(defvar *org-duration-hmm-rx* (create-scanner "\\`[ \t]*[0-9]+\\(?::[0-9]\\{2\\}\\)\\{1,2\\}[ \t]*\\'")
1.8- "Regexp matching a duration expressed with H:MM or H:MM:SS format.
1.9-See *org-duration-hmmss-rx* to only match the latter. Hours
1.10-can use any number of digits.")
1.11-
1.12-(defvar *org-duration-hmmss-rx* (create-scanner "\\`[ \t]*[0-9]+\\(?::[0-9]\\{2\\}\\)\\{2\\}[ \t]*\\'")
1.13- "Regexp matching a duration expressed H:MM:SS format.
1.14-See *org-duration-hmm-rx* to also support H:MM format. Hours
1.15-can use any number of digits.")
1.16-
1.17-(defvar *org-duration-full-rx*
1.18- (create-scanner "\\`\\(?:[ ]*\\([0-9]+\\(?:\\.[0-9]*\\)?\\)[ ]*\\(min\\|[dhmwy]\\)\\)+[ ]*\\'")
1.19- "Regexp matching a duration expressed with units.")
1.20-
1.21-(defvar *org-duration-mixed-rx*
1.22- (create-scanner "\\`\\(?1:\\([ ]*\\([0-9]+\\(?:\\.[0-9]*\\)?\\)[ ]*\\(min\\|[dhmwy]\\)\\)+\\)[ ]*\\(?2:[0-9]+\\(?::[0-9][0-9]\\)\\{1,2\\}\\)[ ]*\\'")
1.23- "Regexp matching a duration with units and H:MM or H:MM:SS format.")
1.24-
1.25-(defvar *org-duration-units*
1.26- '(("min" . 1) ("h" . 60) ("d" . 1440) ("w" . 10080) ("m" . 43200)
1.27- ("y" . 525960.0)))
1.28-
1.29 (define-org-object active-timestamp (date time mod))
1.30 (define-org-object active-timestamp-range (ts1 ts2))
1.31 (define-org-object inactive-timestamp (date time mod))