mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-03 18:41:25 -08:00
Move the documentation of Mayan calendar to cal-xtra.texi.
* doc/emacs/cal-xtra.texi (Advanced Calendar/Diary Usage): Update menu. (Mayan Calendar): Move here from calendar.texi. * doc/emacs/emacs.texi (Top): Update menu.
This commit is contained in:
Xue Fuqiao
parent
6c8a6e149b
commit
65b36413e6
4 changed files with 101 additions and 89 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2013-07-31 Xue Fuqiao <xfq.free@gmail.com>
|
||||
|
||||
* cal-xtra.texi (Advanced Calendar/Diary Usage): Update menu.
|
||||
(Mayan Calendar): Move here from calendar.texi.
|
||||
* emacs.texi (Top): Update menu.
|
||||
|
||||
2013-07-30 Xue Fuqiao <xfq.free@gmail.com>
|
||||
|
||||
* emacs.texi (Top): Add menu entry.
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ your personal tastes.
|
|||
@menu
|
||||
* Calendar Customizing:: Calendar layout and hooks.
|
||||
* Holiday Customizing:: Defining your own holidays.
|
||||
* Mayan Calendar:: Moving to a date specified in a Mayan calendar.
|
||||
* Date Display Format:: Changing the format.
|
||||
* Time Display Format:: Changing the format.
|
||||
* Diary Customizing:: Defaults you can set.
|
||||
|
|
@ -260,6 +261,99 @@ visible in the calendar window, with descriptive strings, like this:
|
|||
(((6 4 2012) "Lunar Eclipse") ((11 13 2012) "Solar Eclipse") ... )
|
||||
@end smallexample
|
||||
|
||||
@node Mayan Calendar
|
||||
@subsection Converting from the Mayan Calendar
|
||||
@cindex Mayan calendar
|
||||
|
||||
Here are the commands to select dates based on the Mayan calendar:
|
||||
|
||||
@table @kbd
|
||||
@item g m l
|
||||
Move to a date specified by the long count calendar
|
||||
(@code{calendar-mayan-goto-long-count-date}).
|
||||
@item g m n t
|
||||
Move to the next occurrence of a place in the
|
||||
tzolkin calendar (@code{calendar-mayan-next-tzolkin-date}).
|
||||
@item g m p t
|
||||
Move to the previous occurrence of a place in the
|
||||
tzolkin calendar (@code{calendar-mayan-previous-tzolkin-date}).
|
||||
@item g m n h
|
||||
Move to the next occurrence of a place in the
|
||||
haab calendar (@code{calendar-mayan-next-haab-date}).
|
||||
@item g m p h
|
||||
Move to the previous occurrence of a place in the
|
||||
haab calendar (@code{calendar-mayan-previous-haab-date}).
|
||||
@item g m n c
|
||||
Move to the next occurrence of a place in the
|
||||
calendar round (@code{calendar-mayan-next-calendar-round-date}).
|
||||
@item g m p c
|
||||
Move to the previous occurrence of a place in the
|
||||
calendar round (@code{calendar-mayan-previous-calendar-round-date}).
|
||||
@end table
|
||||
|
||||
@cindex Mayan long count
|
||||
To understand these commands, you need to understand the Mayan calendars.
|
||||
The @dfn{long count} is a counting of days with these units:
|
||||
|
||||
@display
|
||||
1 kin = 1 day@ @ @ 1 uinal = 20 kin@ @ @ 1 tun = 18 uinal
|
||||
1 katun = 20 tun@ @ @ 1 baktun = 20 katun
|
||||
@end display
|
||||
|
||||
@kindex g m @r{(Calendar mode)}
|
||||
@findex calendar-mayan-goto-long-count-date
|
||||
@noindent
|
||||
Thus, the long count date 12.16.11.16.6 means 12 baktun, 16 katun, 11
|
||||
tun, 16 uinal, and 6 kin. The Emacs calendar can handle Mayan long
|
||||
count dates as early as 7.17.18.13.3, but no earlier. When you use the
|
||||
@kbd{g m l} command, type the Mayan long count date with the baktun,
|
||||
katun, tun, uinal, and kin separated by periods.
|
||||
|
||||
@findex calendar-mayan-previous-tzolkin-date
|
||||
@findex calendar-mayan-next-tzolkin-date
|
||||
@cindex Mayan tzolkin calendar
|
||||
The Mayan tzolkin calendar is a cycle of 260 days formed by a pair of
|
||||
independent cycles of 13 and 20 days. Since this cycle repeats
|
||||
endlessly, Emacs provides commands to move backward and forward to the
|
||||
previous or next point in the cycle. Type @kbd{g m p t} to go to the
|
||||
previous tzolkin date; Emacs asks you for a tzolkin date and moves point
|
||||
to the previous occurrence of that date. Similarly, type @kbd{g m n t}
|
||||
to go to the next occurrence of a tzolkin date.
|
||||
|
||||
@findex calendar-mayan-previous-haab-date
|
||||
@findex calendar-mayan-next-haab-date
|
||||
@cindex Mayan haab calendar
|
||||
The Mayan haab calendar is a cycle of 365 days arranged as 18 months
|
||||
of 20 days each, followed by a 5-day monthless period. Like the tzolkin
|
||||
cycle, this cycle repeats endlessly, and there are commands to move
|
||||
backward and forward to the previous or next point in the cycle. Type
|
||||
@kbd{g m p h} to go to the previous haab date; Emacs asks you for a haab
|
||||
date and moves point to the previous occurrence of that date.
|
||||
Similarly, type @kbd{g m n h} to go to the next occurrence of a haab
|
||||
date.
|
||||
|
||||
@c This is omitted because it is too long for smallbook format.
|
||||
@c @findex calendar-mayan-previous-calendar-round-date
|
||||
@findex calendar-mayan-next-calendar-round-date
|
||||
@cindex Mayan calendar round
|
||||
The Maya also used the combination of the tzolkin date and the haab
|
||||
date. This combination is a cycle of about 52 years called a
|
||||
@emph{calendar round}. If you type @kbd{g m p c}, Emacs asks you for
|
||||
both a haab and a tzolkin date and then moves point to the previous
|
||||
occurrence of that combination. Use @kbd{g m n c} to move point to the
|
||||
next occurrence of a combination. These commands signal an error if the
|
||||
haab/tzolkin date combination you have typed is impossible.
|
||||
|
||||
Emacs uses strict completion
|
||||
@iftex
|
||||
(@pxref{Completion Exit,,, emacs, the Emacs Manual})
|
||||
@end iftex
|
||||
@ifnottex
|
||||
(@pxref{Completion Exit})
|
||||
@end ifnottex
|
||||
whenever it asks you to type a Mayan name, so you don't have to worry
|
||||
about spelling.
|
||||
|
||||
@node Date Display Format
|
||||
@subsection Date Display Format
|
||||
@vindex calendar-date-display-form
|
||||
|
|
|
|||
|
|
@ -678,7 +678,6 @@ and from several other calendars.
|
|||
(aside from Gregorian).
|
||||
* To Other Calendar:: Converting the selected date to various calendars.
|
||||
* From Other Calendar:: Moving to a date specified in another calendar.
|
||||
* Mayan Calendar:: Moving to a date specified in a Mayan calendar.
|
||||
@end menu
|
||||
|
||||
@c FIXME perhaps most of the details should be moved to cal-xtra.
|
||||
|
|
@ -913,93 +912,6 @@ years for the date given by point. If you are not in the calendar,
|
|||
this command first asks you for the date of death and the range of
|
||||
years, and then displays the list of yahrzeit dates.
|
||||
|
||||
@c FIXME move to emacs-xtra.
|
||||
@node Mayan Calendar
|
||||
@subsection Converting from the Mayan Calendar
|
||||
|
||||
Here are the commands to select dates based on the Mayan calendar:
|
||||
|
||||
@table @kbd
|
||||
@item g m l
|
||||
Move to a date specified by the long count calendar
|
||||
(@code{calendar-mayan-goto-long-count-date}).
|
||||
@item g m n t
|
||||
Move to the next occurrence of a place in the
|
||||
tzolkin calendar (@code{calendar-mayan-next-tzolkin-date}).
|
||||
@item g m p t
|
||||
Move to the previous occurrence of a place in the
|
||||
tzolkin calendar (@code{calendar-mayan-previous-tzolkin-date}).
|
||||
@item g m n h
|
||||
Move to the next occurrence of a place in the
|
||||
haab calendar (@code{calendar-mayan-next-haab-date}).
|
||||
@item g m p h
|
||||
Move to the previous occurrence of a place in the
|
||||
haab calendar (@code{calendar-mayan-previous-haab-date}).
|
||||
@item g m n c
|
||||
Move to the next occurrence of a place in the
|
||||
calendar round (@code{calendar-mayan-next-calendar-round-date}).
|
||||
@item g m p c
|
||||
Move to the previous occurrence of a place in the
|
||||
calendar round (@code{calendar-mayan-previous-calendar-round-date}).
|
||||
@end table
|
||||
|
||||
@cindex Mayan long count
|
||||
To understand these commands, you need to understand the Mayan calendars.
|
||||
The @dfn{long count} is a counting of days with these units:
|
||||
|
||||
@display
|
||||
1 kin = 1 day@ @ @ 1 uinal = 20 kin@ @ @ 1 tun = 18 uinal
|
||||
1 katun = 20 tun@ @ @ 1 baktun = 20 katun
|
||||
@end display
|
||||
|
||||
@kindex g m @r{(Calendar mode)}
|
||||
@findex calendar-mayan-goto-long-count-date
|
||||
@noindent
|
||||
Thus, the long count date 12.16.11.16.6 means 12 baktun, 16 katun, 11
|
||||
tun, 16 uinal, and 6 kin. The Emacs calendar can handle Mayan long
|
||||
count dates as early as 7.17.18.13.3, but no earlier. When you use the
|
||||
@kbd{g m l} command, type the Mayan long count date with the baktun,
|
||||
katun, tun, uinal, and kin separated by periods.
|
||||
|
||||
@findex calendar-mayan-previous-tzolkin-date
|
||||
@findex calendar-mayan-next-tzolkin-date
|
||||
@cindex Mayan tzolkin calendar
|
||||
The Mayan tzolkin calendar is a cycle of 260 days formed by a pair of
|
||||
independent cycles of 13 and 20 days. Since this cycle repeats
|
||||
endlessly, Emacs provides commands to move backward and forward to the
|
||||
previous or next point in the cycle. Type @kbd{g m p t} to go to the
|
||||
previous tzolkin date; Emacs asks you for a tzolkin date and moves point
|
||||
to the previous occurrence of that date. Similarly, type @kbd{g m n t}
|
||||
to go to the next occurrence of a tzolkin date.
|
||||
|
||||
@findex calendar-mayan-previous-haab-date
|
||||
@findex calendar-mayan-next-haab-date
|
||||
@cindex Mayan haab calendar
|
||||
The Mayan haab calendar is a cycle of 365 days arranged as 18 months
|
||||
of 20 days each, followed by a 5-day monthless period. Like the tzolkin
|
||||
cycle, this cycle repeats endlessly, and there are commands to move
|
||||
backward and forward to the previous or next point in the cycle. Type
|
||||
@kbd{g m p h} to go to the previous haab date; Emacs asks you for a haab
|
||||
date and moves point to the previous occurrence of that date.
|
||||
Similarly, type @kbd{g m n h} to go to the next occurrence of a haab
|
||||
date.
|
||||
|
||||
@c This is omitted because it is too long for smallbook format.
|
||||
@c @findex calendar-mayan-previous-calendar-round-date
|
||||
@findex calendar-mayan-next-calendar-round-date
|
||||
@cindex Mayan calendar round
|
||||
The Maya also used the combination of the tzolkin date and the haab
|
||||
date. This combination is a cycle of about 52 years called a
|
||||
@emph{calendar round}. If you type @kbd{g m p c}, Emacs asks you for
|
||||
both a haab and a tzolkin date and then moves point to the previous
|
||||
occurrence of that combination. Use @kbd{g m n c} to move point to the
|
||||
next occurrence of a combination. These commands signal an error if the
|
||||
haab/tzolkin date combination you have typed is impossible.
|
||||
|
||||
Emacs uses strict completion (@pxref{Completion Exit}) whenever it
|
||||
asks you to type a Mayan name, so you don't have to worry about
|
||||
spelling.
|
||||
|
||||
@node Diary
|
||||
@section The Diary
|
||||
@cindex diary
|
||||
|
|
|
|||
|
|
@ -957,7 +957,6 @@ Conversion To and From Other Calendars
|
|||
(aside from Gregorian).
|
||||
* To Other Calendar:: Converting the selected date to various calendars.
|
||||
* From Other Calendar:: Moving to a date specified in another calendar.
|
||||
* Mayan Calendar:: Moving to a date specified in a Mayan calendar.
|
||||
|
||||
The Diary
|
||||
|
||||
|
|
@ -972,6 +971,7 @@ More advanced features of the Calendar and Diary
|
|||
|
||||
* Calendar Customizing:: Calendar layout and hooks.
|
||||
* Holiday Customizing:: Defining your own holidays.
|
||||
* Mayan Calendar:: Moving to a date specified in a Mayan calendar.
|
||||
* Date Display Format:: Changing the format.
|
||||
* Time Display Format:: Changing the format.
|
||||
* Diary Customizing:: Defaults you can set.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue