Show
Ignore:
Timestamp:
04/04/08 22:04:40 (8 months ago)
Author:
miyoshi
Message:

Sync up with Emacs22.2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/man/calendar.texi

    r4204 r4220  
    11@c This is part of the Emacs manual. 
    22@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 
    3 @c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 
     3@c   2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 
    44@c See file emacs.texi for copying conditions. 
    55@node Calendar/Diary, Gnus, Dired, Top 
    …… 
    433433then the printed calendars show the holidays in @code{calendar-holidays}. 
    434434If the variable @code{cal-tex-diary} is non-@code{nil} (the default is 
    435 @code{nil}), diary entries are included also (in weekly and monthly 
    436 calendars only).  If the variable @code{cal-tex-rules} is non-@code{nil} 
    437 (the default is @code{nil}), the calendar displays ruled pages 
    438 in styles that have sufficient room.  You can use the variable 
    439 @code{cal-tex-preamble-extra} to insert extra La@TeX{} commands in the 
    440 preamble of the generated document if you need to. 
     435@code{nil}), diary entries are included also (in monthly, filofax, and 
     436iso-week calendars only).  If the variable @code{cal-tex-rules} is 
     437non-@code{nil} (the default is @code{nil}), the calendar displays ruled 
     438pages in styles that have sufficient room.  Consult the documentation of 
     439the individual cal-tex functions to see which calendars support which 
     440features. 
     441 
     442  You can use the variable @code{cal-tex-preamble-extra} to insert extra 
     443La@TeX{} commands in the preamble of the generated document if you need 
     444to. 
    441445 
    442446@node Holidays 
    …… 
    986990 
    987991  The name of the diary file is specified by the variable 
    988 @code{diary-file}; @file{~/diary} is the default.  A sample diary file 
    989 is (note that the file format is essentially the same as that used by 
    990 the external shell utility @samp{calendar}): 
     992@code{diary-file}; @file{~/diary} is the default.  Here's an example 
     993showing what that file looks like: 
    991994 
    992995@example 
    …… 
    10051008 
    10061009@noindent 
    1007 This example uses extra spaces to align the event descriptions of most 
    1008 of the entries.  Such formatting is purely a matter of taste. 
     1010This format is essentially the same as the one used by the system's 
     1011@command{calendar} utility.  This example uses extra spaces to align 
     1012the event descriptions of most of the entries.  Such formatting is 
     1013purely a matter of taste. 
    10091014 
    10101015  Although you probably will start by creating a diary manually, Emacs 
    …… 
    13931398weeks, and months.  It is comparable to a crontab entry interpreted by 
    13941399the @code{cron} utility.  Here is a nonmarking, floating diary entry 
    1395 that applies to the last Thursday in November: 
     1400that applies to the fourth Thursday in November: 
    13961401 
    13971402@findex diary-float 
    13981403@example 
    1399 &%%(diary-float 11 4 -1) American Thanksgiving 
     1404&%%(diary-float 11 4 4) American Thanksgiving 
    14001405@end example 
    14011406 
    …… 
    14031408The 11 specifies November (the eleventh month), the 4 specifies Thursday 
    14041409(the fourth day of the week, where Sunday is numbered zero), and the 
    1405 @minus{}1 specifies ``last'' (1 would mean ``first,'' 2 would mean 
    1406 ``second,'' @minus{}2 would mean ``second-to-last,'' and so on).  The 
    1407 month can be a single month or a list of months.  Thus you could change 
     1410second 4 specifies the fourth Thursday (1 would mean ``first,'' 2 would 
     1411mean ``second,'' @minus{}2 would mean ``second-to-last,'' and so on). 
     1412The month can be a single month or a list of months.  Thus you could change 
    14081413the 11 above to @samp{'(1 2 3)} and have the entry apply to the last 
    14091414Thursday of January, February, and March.  If the month is @code{t}, the