diff options
| author | Jay Belanger | 2013-01-01 20:54:33 -0600 |
|---|---|---|
| committer | Jay Belanger | 2013-01-01 20:54:33 -0600 |
| commit | 87e65f9680dd7c944d8c2bfac87d82db098740a6 (patch) | |
| tree | 4a4460448d8a51d9aaf2726724c5a69e0e023cb1 /doc | |
| parent | a616be859b10c79aa7a2dcfdf246b07d68a3cb23 (diff) | |
| download | emacs-87e65f9680dd7c944d8c2bfac87d82db098740a6.tar.gz emacs-87e65f9680dd7c944d8c2bfac87d82db098740a6.zip | |
* doc/misc/calc.texi (Free-Form Dates): Expand on the date reading
algorithm.
* lisp/calc/README: Mention ISO 8601 week-numbering dates.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/calc.texi | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index ce556568c56..eafa4668c24 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-01-02 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc.texi (Free-Form Dates): Expand on the date reading | ||
| 4 | algorithm. | ||
| 5 | |||
| 1 | 2012-12-27 Glenn Morris <rgm@gnu.org> | 6 | 2012-12-27 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * viper.texi (Rudimentary Changes, Key Bindings, Key Bindings): | 8 | * viper.texi (Rudimentary Changes, Key Bindings, Key Bindings): |
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index a59ce3744bc..2bf130fce04 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.}, | |||
| 13717 | @samp{p.m.}, and @samp{mid} are also understood. Obviously | 13717 | @samp{p.m.}, and @samp{mid} are also understood. Obviously |
| 13718 | @samp{noon} and @samp{midnight} are allowed only on 12:00:00. | 13718 | @samp{noon} and @samp{midnight} are allowed only on 12:00:00. |
| 13719 | The words @samp{noon}, @samp{mid}, and @samp{midnight} are also | 13719 | The words @samp{noon}, @samp{mid}, and @samp{midnight} are also |
| 13720 | recognized with no number attached. | 13720 | recognized with no number attached. Midnight will represent the |
| 13721 | beginning of a day. | ||
| 13721 | 13722 | ||
| 13722 | If there is no AM/PM indicator, the time is interpreted in 24-hour | 13723 | If there is no AM/PM indicator, the time is interpreted in 24-hour |
| 13723 | format. | 13724 | format. |
| 13724 | 13725 | ||
| 13725 | To read the date portion, all words and numbers are isolated | 13726 | When reading the date portion, Calc first checks to see if it is an |
| 13726 | from the string; other characters are ignored. All words must | 13727 | ISO 8601 week-numbering date; if the string contains an integer |
| 13727 | be either month names or day-of-week names (the latter of which | 13728 | representing the year, a ``W'' followed by two digits for the week |
| 13728 | are ignored). Names can be written in full or as three-letter | 13729 | number, and an integer from 1 to 7 representing the weekday (in that |
| 13730 | order), then all other characters are ignored and this information | ||
| 13731 | determines the date. Otherwise, all words and numbers are isolated | ||
| 13732 | from the string; other characters are ignored. All words must be | ||
| 13733 | either month names or day-of-week names (the latter of which are | ||
| 13734 | ignored). Names can be written in full or as three-letter | ||
| 13729 | abbreviations. | 13735 | abbreviations. |
| 13730 | 13736 | ||
| 13731 | Large numbers, or numbers with @samp{+} or @samp{-} signs, | 13737 | Large numbers, or numbers with @samp{+} or @samp{-} signs, |