[Emacs-diffs] trunk r113617: Move the documentation of Mayan calendar to cal-xtra.texi.

[Xue Fuqiao]

------------------------------------------------------------
revno: 113617
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Wed 2013-07-31 19:38:13 +0800
message:
  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.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/cal-xtra.texi        
calxtra.texi-20091113204419-o5vbwnq5f7feedwu-6236
  doc/emacs/calendar.texi        
calendar.texi-20091113204419-o5vbwnq5f7feedwu-6237
  doc/emacs/emacs.texi           emacs.texi-20091113204419-o5vbwnq5f7feedwu-6246

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-07-30 22:27:47 +0000
+++ b/doc/emacs/ChangeLog       2013-07-31 11:38:13 +0000
@@ -1,3 +1,9 @@
+2013-07-31  Xue Fuqiao  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs.texi (Top): Add menu entry.

=== modified file 'doc/emacs/cal-xtra.texi'
--- a/doc/emacs/cal-xtra.texi   2013-03-04 08:45:03 +0000
+++ b/doc/emacs/cal-xtra.texi   2013-07-31 11:38:13 +0000
@@ -17,6 +17,7 @@
 @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 @@
 (((6 4 2012) "Lunar Eclipse") ((11 13 2012) "Solar Eclipse") ... )
 @end smallexample
 
address@hidden Mayan Calendar
address@hidden Converting from the Mayan Calendar
address@hidden Mayan calendar
+
+  Here are the commands to select dates based on the Mayan calendar:
+
address@hidden @kbd
address@hidden g m l
+Move to a date specified by the long count calendar
+(@code{calendar-mayan-goto-long-count-date}).
address@hidden g m n t
+Move to the next occurrence of a place in the
+tzolkin calendar (@code{calendar-mayan-next-tzolkin-date}).
address@hidden g m p t
+Move to the previous occurrence of a place in the
+tzolkin calendar (@code{calendar-mayan-previous-tzolkin-date}).
address@hidden g m n h
+Move to the next occurrence of a place in the
+haab calendar (@code{calendar-mayan-next-haab-date}).
address@hidden g m p h
+Move to the previous occurrence of a place in the
+haab calendar (@code{calendar-mayan-previous-haab-date}).
address@hidden g m n c
+Move to the next occurrence of a place in the
+calendar round (@code{calendar-mayan-next-calendar-round-date}).
address@hidden g m p c
+Move to the previous occurrence of a place in the
+calendar round (@code{calendar-mayan-previous-calendar-round-date}).
address@hidden table
+
address@hidden 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:
+
address@hidden
+1 kin = 1 day@ @ @ 1 uinal = 20 kin@ @ @ 1 tun = 18 uinal
+1 katun = 20 tun@ @ @ 1 baktun = 20 katun
address@hidden display
+
address@hidden g m @r{(Calendar mode)}
address@hidden calendar-mayan-goto-long-count-date
address@hidden
+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
address@hidden m l} command, type the Mayan long count date with the baktun,
+katun, tun, uinal, and kin separated by periods.
+
address@hidden calendar-mayan-previous-tzolkin-date
address@hidden calendar-mayan-next-tzolkin-date
address@hidden 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.
+
address@hidden calendar-mayan-previous-haab-date
address@hidden calendar-mayan-next-haab-date
address@hidden 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
address@hidden 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.
+
address@hidden This is omitted because it is too long for smallbook format.
address@hidden @findex calendar-mayan-previous-calendar-round-date
address@hidden calendar-mayan-next-calendar-round-date
address@hidden 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
address@hidden 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
address@hidden
+(@pxref{Completion Exit,,, emacs, the Emacs Manual})
address@hidden iftex
address@hidden
+(@pxref{Completion Exit})
address@hidden 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

=== modified file 'doc/emacs/calendar.texi'
--- a/doc/emacs/calendar.texi   2013-05-04 23:55:57 +0000
+++ b/doc/emacs/calendar.texi   2013-07-31 11:38:13 +0000
@@ -678,7 +678,6 @@
                              (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 @@
 this command first asks you for the date of death and the range of
 years, and then displays the list of yahrzeit dates.
 
address@hidden FIXME move to emacs-xtra.
address@hidden Mayan Calendar
address@hidden Converting from the Mayan Calendar
-
-  Here are the commands to select dates based on the Mayan calendar:
-
address@hidden @kbd
address@hidden g m l
-Move to a date specified by the long count calendar
-(@code{calendar-mayan-goto-long-count-date}).
address@hidden g m n t
-Move to the next occurrence of a place in the
-tzolkin calendar (@code{calendar-mayan-next-tzolkin-date}).
address@hidden g m p t
-Move to the previous occurrence of a place in the
-tzolkin calendar (@code{calendar-mayan-previous-tzolkin-date}).
address@hidden g m n h
-Move to the next occurrence of a place in the
-haab calendar (@code{calendar-mayan-next-haab-date}).
address@hidden g m p h
-Move to the previous occurrence of a place in the
-haab calendar (@code{calendar-mayan-previous-haab-date}).
address@hidden g m n c
-Move to the next occurrence of a place in the
-calendar round (@code{calendar-mayan-next-calendar-round-date}).
address@hidden g m p c
-Move to the previous occurrence of a place in the
-calendar round (@code{calendar-mayan-previous-calendar-round-date}).
address@hidden table
-
address@hidden 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:
-
address@hidden
-1 kin = 1 day@ @ @ 1 uinal = 20 kin@ @ @ 1 tun = 18 uinal
-1 katun = 20 tun@ @ @ 1 baktun = 20 katun
address@hidden display
-
address@hidden g m @r{(Calendar mode)}
address@hidden calendar-mayan-goto-long-count-date
address@hidden
-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
address@hidden m l} command, type the Mayan long count date with the baktun,
-katun, tun, uinal, and kin separated by periods.
-
address@hidden calendar-mayan-previous-tzolkin-date
address@hidden calendar-mayan-next-tzolkin-date
address@hidden 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.
-
address@hidden calendar-mayan-previous-haab-date
address@hidden calendar-mayan-next-haab-date
address@hidden 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
address@hidden 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.
-
address@hidden This is omitted because it is too long for smallbook format.
address@hidden @findex calendar-mayan-previous-calendar-round-date
address@hidden calendar-mayan-next-calendar-round-date
address@hidden 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
address@hidden 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

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2013-07-30 22:27:47 +0000
+++ b/doc/emacs/emacs.texi      2013-07-31 11:38:13 +0000
@@ -957,7 +957,6 @@
                              (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 @@
 
 * 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.