[Emacs-diffs] Changes to emacs/lisp/calendar/cal-tex.el, v [EMACS_22_BASE]

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       07/07/24 02:40:06

Index: cal-tex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-tex.el,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -b -r1.30 -r1.30.2.1
--- cal-tex.el  21 Jan 2007 02:38:24 -0000      1.30
+++ cal-tex.el  24 Jul 2007 02:40:06 -0000      1.30.2.1
@@ -65,18 +65,21 @@
   :group 'calendar-tex)
 
 (defcustom cal-tex-holidays t
-  "*If t (default), then the holidays are also printed.
+  "Non-nil means holidays are printed in the LaTeX calendars that support it.
 If finding the holidays is too slow, set this to nil."
   :type 'boolean
   :group 'calendar-tex)
 
 (defcustom cal-tex-diary nil
-  "*If t, the diary entries are printed in the calendar."
+  "Non-nil means diary entries are printed in LaTeX calendars that support it.
+At present, this only affects the monthly, filofax, and iso-week
+calendars (i.e. not the yearly, plain weekly, or daily calendars)."
   :type 'boolean
   :group 'calendar-tex)
 
 (defcustom cal-tex-rules nil
-  "*If t, pages will be ruled in some styles."
+  "Non-nil means pages will be ruled in some LaTeX calendar styles.
+At present, this only affects the daily filofax calendar."
   :type 'boolean
   :group 'calendar-tex)
 
@@ -102,12 +105,12 @@
   :group 'calendar-tex)
 
 (defcustom cal-tex-buffer "calendar.tex"
-  "*The name for the tex-ed calendar."
+  "The name for the output LaTeX calendar buffer."
   :type 'string
   :group 'calendar-tex)
 
 (defcustom cal-tex-24 nil
-  "*If t, use a 24 hour clock in the daily calendar."
+  "Non-nil means use a 24 hour clock in the daily calendar."
   :type 'boolean
   :group 'calendar-tex)
 
@@ -376,7 +379,7 @@
                                            (aref month-names (1- i))
                                            "1in" ".9in" "tiny" "0.6mm"))))
        (insert
-"\\noindent\\fbox{\\January}\\fbox{\\February}\\fbox{\\March}\\\\
+       "\\noindent\\fbox{\\January}\\fbox{\\February}\\fbox{\\March}\\\\
 \\noindent\\fbox{\\April}\\fbox{\\May}\\fbox{\\June}\\\\
 \\noindent\\fbox{\\July}\\fbox{\\August}\\fbox{\\September}\\\\
 \\noindent\\fbox{\\October}\\fbox{\\November}\\fbox{\\December}
@@ -396,9 +399,12 @@
 ;;;
 
 (defun cal-tex-cursor-month-landscape (&optional arg)
-  "Make a buffer with LaTeX commands for the month cursor is on.
-Optional prefix argument specifies number of months to be produced.
-The output is in landscape format, one month to a page."
+  "Make a LaTeX calendar buffer for the month the cursor is on.
+Optional prefix argument specifies number of months to be
+produced (default 1).  The output is in landscape format, one
+month to a page.  It shows holiday and diary entries if
+`cal-tex-holidays' and `cal-tex-diary', respectively, are
+non-nil."
   (interactive "p")
   (let* ((n (if arg arg 1))
          (date (calendar-cursor-to-date t))
@@ -474,9 +480,11 @@
       (run-hooks 'cal-tex-hook))))
 
 (defun cal-tex-cursor-month (arg)
-  "Make a buffer with LaTeX commands for the month cursor is on.
-Optional prefix argument specifies number of months to be produced.
-Calendar is condensed onto one page."
+  "Make a LaTeX calendar buffer for the month the cursor is on.
+Optional prefix argument specifies number of months to be
+produced (default 1).  The calendar is condensed onto one page.
+It shows holiday and diary entries if `cal-tex-holidays' and
+`cal-tex-diary', respectively, are non-nil."
   (interactive "p")
   (let* ((date (calendar-cursor-to-date t))
          (month (extract-calendar-month date))
@@ -534,8 +542,8 @@
 (defun cal-tex-insert-days (month year diary-list holidays day-format)
   "Insert LaTeX commands for a range of days in monthly calendars.
 LaTeX commands are inserted for the days of the MONTH in YEAR.
-Diary entries on DIARY-LIST are included. Holidays on HOLIDAYS are included.
-Each day is formatted using format DAY-FORMAT."
+Diary entries on DIARY-LIST are included.  Holidays on HOLIDAYS
+are included.  Each day is formatted using format DAY-FORMAT."
   (let* ((blank-days;; at start of month
           (mod
            (- (calendar-day-of-week (list month 1 year))
@@ -668,11 +676,13 @@
 {\\makebox[2em]{\\rule{0cm}{#2ex}#1}\\rule{3in}{.15mm}}\n"
   "One hour and a line on the right.")
 
+;; TODO cal-tex-diary-support.
 (defun cal-tex-cursor-week (&optional arg)
-  "Make a buffer with LaTeX commands for a two-page one-week calendar.
-It applies to the week that point is in.
-Optional prefix argument specifies number of weeks.
-Holidays are included if `cal-tex-holidays' is t."
+  "Make a LaTeX calendar buffer for a two-page one-week calendar.
+It applies to the week that point is in.  The optional prefix
+argument specifies the number of weeks (default 1).  The calendar
+shows holidays if `cal-tex-holidays' is t (note that diary
+entries are not shown)."
   (interactive "p")
   (let* ((n (if arg arg 1))
          (date (calendar-gregorian-from-absolute
@@ -719,11 +729,13 @@
     (cal-tex-end-document)
     (run-hooks 'cal-tex-hook)))
 
+;; TODO cal-tex-diary support.
 (defun cal-tex-cursor-week2 (&optional arg)
-  "Make a buffer with LaTeX commands for a two-page one-week calendar.
-It applies to the week that point is in.
-Optional prefix argument specifies number of weeks.
-Holidays are included if `cal-tex-holidays' is t."
+  "Make a LaTeX calendar buffer for a two-page one-week calendar.
+It applies to the week that point is in.  Optional prefix
+argument specifies number of weeks (default 1).  The calendar
+shows holidays if `cal-tex-holidays' is non-nil (note that diary
+entries are not shown)."
   (interactive "p")
   (let* ((n (if arg arg 1))
          (date (calendar-gregorian-from-absolute
@@ -800,10 +812,10 @@
     (run-hooks 'cal-tex-hook)))
 
 (defun cal-tex-cursor-week-iso (&optional arg)
-  "Make a buffer with LaTeX commands for a one page ISO-style weekly calendar.
-Optional prefix argument specifies number of weeks.
-Diary entries are included if `cal-tex-diary' is t.
-Holidays are included if `cal-tex-holidays' is t."
+  "Make a LaTeX calendar buffer for a one page ISO-style weekly calendar.
+Optional prefix argument specifies number of weeks (default 1).
+The calendar shows holiday and diary entries if
+`cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil."
   (interactive "p")
   (let* ((n (if arg arg 1))
          (date (calendar-gregorian-from-absolute
@@ -890,7 +902,8 @@
     (run-hooks 'cal-tex-hook)))
 
 (defun cal-tex-week-hours (date holidays height)
-  "Insert hourly entries for DATE with HOLIDAYS, with line height HEIGHT."
+  "Insert hourly entries for DATE with HOLIDAYS, with line height HEIGHT.
+Uses the 24-hour clock if `cal-tex-24' is non-nil."
   (let ((month (extract-calendar-month date))
         (day   (extract-calendar-day date))
         (year  (extract-calendar-year date))
@@ -925,11 +938,13 @@
      (cal-tex-arg height)
      (cal-tex-nl))))
 
+;; TODO cal-tex-diary support.
 (defun cal-tex-cursor-week-monday (&optional arg)
-  "Make a buffer with LaTeX commands for a two-page one-week calendar.
+  "Make a LaTeX calendar buffer for a two-page one-week calendar.
 It applies to the week that point is in, and starts on Monday.
-Optional prefix argument specifies number of weeks.
-Holidays are included if `cal-tex-holidays' is t."
+Optional prefix argument specifies number of weeks (default 1).
+The calendar shows holidays if `cal-tex-holidays' is
+non-nil (note that diary entries are not shown)."
   (interactive "p")
   (let* ((n (if arg arg 1))
          (date (calendar-gregorian-from-absolute
@@ -963,7 +978,8 @@
     (run-hooks 'cal-tex-hook)))
 
 (defun cal-tex-weekly4-box (date weekend)
-  "Make one box for DATE, different if WEEKEND."
+  "Make one box for DATE, different if WEEKEND.
+Uses the 24-hour clock if `cal-tex-24' is non-nil."
   (let* (
        (day (extract-calendar-day date))
        (month (extract-calendar-month date))
@@ -1002,10 +1018,10 @@
      (cal-tex-hspace "1cm")))
 
 (defun cal-tex-cursor-filofax-2week (&optional arg)
-  "Two-weeks-at-a-glance Filofax style calendar for week indicated by cursor.
-Optional prefix argument specifies number of weeks.
-Diary entries are included if `cal-tex-diary' is t.
-Holidays are included if `cal-tex-holidays' is t."
+  "Two-weeks-at-a-glance Filofax style calendar for week cursor is in.
+Optional prefix argument specifies number of weeks (default 1).
+The calendar shows holiday and diary entries if
+`cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil."
   (interactive "p")
   (let* ((n (if arg arg 1))
          (date (calendar-gregorian-from-absolute
@@ -1104,10 +1120,9 @@
 
 (defun cal-tex-cursor-filofax-week (&optional arg)
   "One-week-at-a-glance Filofax style calendar for week indicated by cursor.
-Optional prefix argument specifies number of weeks.
-Weeks start on Monday.
-Diary entries are included if `cal-tex-diary' is t.
-Holidays are included if `cal-tex-holidays' is t."
+Optional prefix argument specifies number of weeks (default 1),
+starting on Mondays.  The calendar shows holiday and diary entries
+if `cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil."
   (interactive "p")
   (let* ((n (if arg arg 1))
          (date (calendar-gregorian-from-absolute
@@ -1255,10 +1270,10 @@
 
 (defun cal-tex-cursor-filofax-daily (&optional arg)
   "Day-per-page Filofax style calendar for week indicated by cursor.
-Optional prefix argument specifies number of weeks.  Weeks start on Monday.
-Diary entries are included if `cal-tex-diary' is t.
-Holidays are included if `cal-tex-holidays' is t.
-Pages are ruled if `cal-tex-rules' is t."
+Optional prefix argument specifies number of weeks (default 1),
+starting on Mondays.  The calendar shows holiday and diary
+entries if `cal-tex-holidays' and `cal-tex-diary', respectively,
+are non-nil.  Pages are ruled if `cal-tex-rules' is non-nil."
   (interactive "p")
   (let* ((n (if arg arg 1))
          (date (calendar-gregorian-from-absolute
@@ -1388,7 +1403,10 @@
     (run-hooks 'cal-tex-hook)))
 
 (defun cal-tex-daily-page (date)
-  "Make a calendar page for Gregorian DATE on 8.5 by 11 paper."
+  "Make a calendar page for Gregorian DATE on 8.5 by 11 paper.
+Uses the 24-hour clock if `cal-tex-24' is non-nil.  Produces
+hourly sections for the period specified by `cal-tex-daily-start'
+and `cal-tex-daily-end'."
   (let* ((hour)
          (month-name (cal-tex-month-name (extract-calendar-month date))))
     (cal-tex-banner "cal-tex-daily-page")