aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-12-16 14:51:03 -0800
committerPaul Eggert2012-12-16 14:51:03 -0800
commitd2435ab9f399bba51dba6f9564882a3a5341efbc (patch)
tree70a3ea29ed432f629617fa5e07d634a6f17b0d39
parent7c3d167f48d6262ee4e5512aa50a07ee96bc1509 (diff)
downloademacs-d2435ab9f399bba51dba6f9564882a3a5341efbc.tar.gz
emacs-d2435ab9f399bba51dba6f9564882a3a5341efbc.zip
* calc.texi (ISO 8601): Rename from ISO-8601,
as it's typically spelled without a hyphen.
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/calc.texi40
2 files changed, 25 insertions, 20 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 1ca638bb7fe..e8036dd69e1 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12012-12-16 Paul Eggert <eggert@cs.ucla.edu>
2
3 * calc.texi (ISO 8601): Rename from ISO-8601,
4 as it's typically spelled without a hyphen.
5
12012-12-16 Jay Belanger <jay.p.belanger@gmail.com> 62012-12-16 Jay Belanger <jay.p.belanger@gmail.com>
2 7
3 * calc.texi (ISO-8601): New section. 8 * calc.texi (ISO-8601): New section.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 71a90e1a3b3..e233c29a925 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -13417,27 +13417,27 @@ dates. @xref{Specifying Operators}. To avoid confusion with nameless
13417functions, your date formats should avoid using the @samp{#} character. 13417functions, your date formats should avoid using the @samp{#} character.
13418 13418
13419@menu 13419@menu
13420* ISO-8601:: 13420* ISO 8601::
13421* Date Formatting Codes:: 13421* Date Formatting Codes::
13422* Free-Form Dates:: 13422* Free-Form Dates::
13423* Standard Date Formats:: 13423* Standard Date Formats::
13424@end menu 13424@end menu
13425 13425
13426@node ISO-8601, Date Formatting Codes, Date Formats, Date Formats 13426@node ISO 8601, Date Formatting Codes, Date Formats, Date Formats
13427@subsubsection ISO-8601 13427@subsubsection ISO 8601
13428 13428
13429@noindent 13429@noindent
13430@cindex ISO-8601 13430@cindex ISO 8601
13431The same date can be written down in different formats and Calc tries 13431The same date can be written down in different formats and Calc tries
13432to allow you to choose your preferred format. Some common formats are 13432to allow you to choose your preferred format. Some common formats are
13433ambiguous, however; for example, 10/11/2012 means October 11, 13433ambiguous, however; for example, 10/11/2012 means October 11,
134342012 in the United States but it means November 10, 2012 in 134342012 in the United States but it means November 10, 2012 in
13435Europe. To help avoid such ambiguities, the International Organization 13435Europe. To help avoid such ambiguities, the International Organization
13436for Standardization (ISO) provides the ISO-8601 standard, which 13436for Standardization (ISO) provides the ISO 8601 standard, which
13437provides three different but easily distinguishable and unambiguous 13437provides three different but easily distinguishable and unambiguous
13438ways to represent a date. 13438ways to represent a date.
13439 13439
13440The ISO-8601 calendar date representation is 13440The ISO 8601 calendar date representation is
13441 13441
13442@example 13442@example
13443 @var{YYYY}-@var{MM}-@var{DD} 13443 @var{YYYY}-@var{MM}-@var{DD}
@@ -13452,9 +13452,9 @@ later.) The year, which should be padded with zeros to ensure it has at
13452least four digits, is the Gregorian year, except that the year before 13452least four digits, is the Gregorian year, except that the year before
134530001 (1 AD) is the year 0000 (1 BC). The date October 11, 2012 is 134530001 (1 AD) is the year 0000 (1 BC). The date October 11, 2012 is
13454written 2012-10-11 in this representation and November 10, 2012 is 13454written 2012-10-11 in this representation and November 10, 2012 is
13455written 2012-11-10. 13455written 2012-11-10.
13456 13456
13457The ISO-8601 ordinal date representation is 13457The ISO 8601 ordinal date representation is
13458 13458
13459@example 13459@example
13460 @var{YYYY}-@var{DDD} 13460 @var{YYYY}-@var{DDD}
@@ -13463,9 +13463,9 @@ The ISO-8601 ordinal date representation is
13463@noindent 13463@noindent
13464where @var{YYYY} is the year, as above, and @var{DDD} is the day of the year. 13464where @var{YYYY} is the year, as above, and @var{DDD} is the day of the year.
13465The date December 31, 2011 is written 2011-365 in this representation 13465The date December 31, 2011 is written 2011-365 in this representation
13466and January 1, 2012 is written 2012-001. 13466and January 1, 2012 is written 2012-001.
13467 13467
13468The ISO-8601 week date representation is 13468The ISO 8601 week date representation is
13469 13469
13470@example 13470@example
13471 @var{YYYY}-W@var{ww}-@var{D} 13471 @var{YYYY}-W@var{ww}-@var{D}
@@ -13476,32 +13476,32 @@ where @var{YYYY} is the ISO week-numbering year, @var{ww} is the two
13476digit week number (preceded by a literal ``W''), and @var{D} is the day 13476digit week number (preceded by a literal ``W''), and @var{D} is the day
13477of the week (1 for Monday through 7 for Sunday). The ISO week-numbering 13477of the week (1 for Monday through 7 for Sunday). The ISO week-numbering
13478year is based on the Gregorian year but can differ slightly. The first 13478year is based on the Gregorian year but can differ slightly. The first
13479week of an ISO week-numbering year is the week with the Gregorian year's 13479week of an ISO week-numbering year is the week with the Gregorian year's
13480first Thursday in it (equivalently, the week containing January 4); 13480first Thursday in it (equivalently, the week containing January 4);
13481any day of that week (Monday through Sunday) is part of the same ISO 13481any day of that week (Monday through Sunday) is part of the same ISO
13482week-numbering year, any day from the previous week is part of the 13482week-numbering year, any day from the previous week is part of the
13483previous year. For example, January 4, 2013 is on a Friday, and so 13483previous year. For example, January 4, 2013 is on a Friday, and so
13484the first week for the ISO week-numbering year 2013 starts on 13484the first week for the ISO week-numbering year 2013 starts on
13485Monday, December 31, 2012. The day December 31, 2012 is then part of the 13485Monday, December 31, 2012. The day December 31, 2012 is then part of the
13486Gregorian year 2012 but ISO week-numbering year 2013. In the week 13486Gregorian year 2012 but ISO week-numbering year 2013. In the week
13487date representation, this week goes from 2013-W01-1 (December 31, 13487date representation, this week goes from 2013-W01-1 (December 31,
134882012) to 2013-W01-7 (January 6, 2013). 134882012) to 2013-W01-7 (January 6, 2013).
13489 13489
13490All three ISO-8601 representations arrange the numbers from most 13490All three ISO 8601 representations arrange the numbers from most
13491significant to least significant; as well as being unambiguous 13491significant to least significant; as well as being unambiguous
13492representations, they are easy to sort since chronological order in 13492representations, they are easy to sort since chronological order in
13493this formats corresponds to lexicographical order. The hyphens are 13493this formats corresponds to lexicographical order. The hyphens are
13494sometimes omitted. 13494sometimes omitted.
13495 13495
13496The ISO-8601 standard uses a 24 hour clock; a particular time is 13496The ISO 8601 standard uses a 24 hour clock; a particular time is
13497represented by @var{hh}:@var{mm}:@var{ss} where @var{hh} is the 13497represented by @var{hh}:@var{mm}:@var{ss} where @var{hh} is the
13498two-digit hour (from 00 to 24), @var{mm} is the two-digit minute (from 13498two-digit hour (from 00 to 24), @var{mm} is the two-digit minute (from
1349900 to 59) and @var{ss} is the two-digit second. The seconds or minutes 1349900 to 59) and @var{ss} is the two-digit second. The seconds or minutes
13500and seconds can be omitted, and decimals can be added. If a date with a 13500and seconds can be omitted, and decimals can be added. If a date with a
13501time is represented, they should be separated by a literal ``T'', so noon 13501time is represented, they should be separated by a literal ``T'', so noon
13502on December 13, 2012 can be represented as 2012-12-13T12:00 13502on December 13, 2012 can be represented as 2012-12-13T12:00.
13503 13503
13504@node Date Formatting Codes, Free-Form Dates, ISO-8601, Date Formats 13504@node Date Formatting Codes, Free-Form Dates, ISO 8601, Date Formats
13505@subsubsection Date Formatting Codes 13505@subsubsection Date Formatting Codes
13506 13506
13507@noindent 13507@noindent
@@ -13543,9 +13543,9 @@ Year: ``1991'' for 1991, ``23'' for 23 AD.
13543@item YYYY 13543@item YYYY
13544Year: ``1991'' for 1991, ``+23'' for 23 AD. 13544Year: ``1991'' for 1991, ``+23'' for 23 AD.
13545@item ZYYY 13545@item ZYYY
13546Year: ``1991'' for 1991, ``0023'' for 23 AD., ``0000'' for 1 BC. 13546Year: ``1991'' for 1991, ``0023'' for 23 AD, ``0000'' for 1 BC.
13547@item IYYY 13547@item IYYY
13548Year: ISO-8601 week-numbering year. 13548Year: ISO 8601 week-numbering year.
13549@item aa 13549@item aa
13550Year: ``ad'' or blank. 13550Year: ``ad'' or blank.
13551@item AA 13551@item AA
@@ -13607,7 +13607,7 @@ Weekday: ``SUNDAY'' for Sunday.
13607@item Wwww 13607@item Wwww
13608Weekday: ``Sunday'' for Sunday. 13608Weekday: ``Sunday'' for Sunday.
13609@item Iww 13609@item Iww
13610Week number: ISO-8601 week number, ``W01'' for week 1. 13610Week number: ISO 8601 week number, ``W01'' for week 1.
13611@item d 13611@item d
13612Day of year: ``34'' for Feb. 3. 13612Day of year: ``34'' for Feb. 3.
13613@item ddd 13613@item ddd
@@ -13792,7 +13792,7 @@ command (@pxref{Mode Settings}).
13792@item 10 13792@item 10
13793@samp{ZYYY-MM-DD Www< hh:mm>} (Org mode format) 13793@samp{ZYYY-MM-DD Www< hh:mm>} (Org mode format)
13794@item 11 13794@item 11
13795@samp{IYYY-Iww-w<Thh:mm:ss>} (ISO-8601 week numbering format) 13795@samp{IYYY-Iww-w<Thh:mm:ss>} (ISO 8601 week numbering format)
13796@end table 13796@end table
13797 13797
13798@node Truncating the Stack, Justification, Date Formats, Display Modes 13798@node Truncating the Stack, Justification, Date Formats, Display Modes