aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger <[email protected]>2013-01-01 20:54:33 -0600
committerJay Belanger <[email protected]>2013-01-01 20:54:33 -0600
commit87e65f9680dd7c944d8c2bfac87d82db098740a6 (patch)
tree4a4460448d8a51d9aaf2726724c5a69e0e023cb1
parenta616be859b10c79aa7a2dcfdf246b07d68a3cb23 (diff)
* doc/misc/calc.texi (Free-Form Dates): Expand on the date reading
algorithm. * lisp/calc/README: Mention ISO 8601 week-numbering dates.
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/calc.texi16
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calc/README1
4 files changed, 21 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ce556568c5..eafa4668c2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-02 Jay Belanger <[email protected]>
+
+ * calc.texi (Free-Form Dates): Expand on the date reading
+ algorithm.
+
2012-12-27 Glenn Morris <[email protected]>
* viper.texi (Rudimentary Changes, Key Bindings, Key Bindings):
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index a59ce3744b..2bf130fce0 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -13717,15 +13717,21 @@ abbreviated to one letter, and the alternate forms @samp{a.m.},
@samp{p.m.}, and @samp{mid} are also understood. Obviously
@samp{noon} and @samp{midnight} are allowed only on 12:00:00.
The words @samp{noon}, @samp{mid}, and @samp{midnight} are also
-recognized with no number attached.
+recognized with no number attached. Midnight will represent the
+beginning of a day.
If there is no AM/PM indicator, the time is interpreted in 24-hour
format.
-To read the date portion, all words and numbers are isolated
-from the string; other characters are ignored. All words must
-be either month names or day-of-week names (the latter of which
-are ignored). Names can be written in full or as three-letter
+When reading the date portion, Calc first checks to see if it is an
+ISO 8601 week-numbering date; if the string contains an integer
+representing the year, a ``W'' followed by two digits for the week
+number, and an integer from 1 to 7 representing the weekday (in that
+order), then all other characters are ignored and this information
+determines the date. Otherwise, all words and numbers are isolated
+from the string; other characters are ignored. All words must be
+either month names or day-of-week names (the latter of which are
+ignored). Names can be written in full or as three-letter
abbreviations.
Large numbers, or numbers with @samp{+} or @samp{-} signs,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4ecda0d78..f3a84967aa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-02 Jay Belanger <[email protected]>
+
+ * calc/README: Mention ISO 8601 week-numbering dates.
+
2013-01-01 Martin Rudalics <[email protected]>
* view.el (view-mode-enable): New argument run-view-mode-hook.
diff --git a/lisp/calc/README b/lisp/calc/README
index 638b482a60..d72b9ef054 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -77,6 +77,7 @@ Emacs 24.4
dates.) This can be configured with the customizable variable
`calc-gregorian-switch'.
+* Support for ISO 8601 dates added.
Emacs 24.3
* Algebraic simplification mode is now the default.