[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-tex.el,v
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-tex.el,v |
|
Date: |
Mon, 07 Apr 2008 01:59:39 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/07 01:59:37
Index: cal-tex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-tex.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- cal-tex.el 2 Apr 2008 03:16:47 -0000 1.41
+++ cal-tex.el 7 Apr 2008 01:59:36 -0000 1.42
@@ -97,7 +97,7 @@
:group 'calendar-tex)
(defcustom cal-tex-daily-string
- '(let* ((year (extract-calendar-year date))
+ '(let* ((year (calendar-extract-year date))
(day (calendar-day-number date))
(days-remaining (- (calendar-day-number (list 12 31 year)) day)))
(format "%d/%d" day days-remaining))
@@ -242,20 +242,20 @@
(defun cal-tex-list-holidays (d1 d2)
"Generate a list of all holidays from absolute date D1 to D2."
(let* ((start (calendar-gregorian-from-absolute d1))
- (displayed-month (extract-calendar-month start))
- (displayed-year (extract-calendar-year start))
+ (displayed-month (calendar-extract-month start))
+ (displayed-year (calendar-extract-year start))
(end (calendar-gregorian-from-absolute d2))
- (end-month (extract-calendar-month end))
- (end-year (extract-calendar-year end))
+ (end-month (calendar-extract-month end))
+ (end-year (calendar-extract-year end))
(number-of-intervals
(1+ (/ (calendar-interval displayed-month displayed-year
end-month end-year)
3)))
holidays in-range a)
- (increment-calendar-month displayed-month displayed-year 1)
+ (calendar-increment-month displayed-month displayed-year 1)
(dotimes (idummy number-of-intervals)
(setq holidays (append holidays (calendar-holiday-list)))
- (increment-calendar-month displayed-month displayed-year 3))
+ (calendar-increment-month displayed-month displayed-year 3))
(dolist (hol holidays)
(and (car hol)
(setq a (calendar-absolute-from-gregorian (car hol)))
@@ -317,7 +317,7 @@
"Make a buffer with LaTeX commands for the year cursor is on.
Optional prefix argument ARG specifies number of years."
(interactive "p")
- (cal-tex-year (extract-calendar-year (calendar-cursor-to-date t))
+ (cal-tex-year (calendar-extract-year (calendar-cursor-to-date t))
(or arg 1)))
;;;###cal-autoload
@@ -325,7 +325,7 @@
"Make a buffer with LaTeX commands for the year cursor is on.
Optional prefix argument ARG specifies number of years."
(interactive "p")
- (cal-tex-year (extract-calendar-year (calendar-cursor-to-date t))
+ (cal-tex-year (calendar-extract-year (calendar-cursor-to-date t))
(or arg 1) t))
(defun cal-tex-year (year n &optional landscape)
@@ -370,7 +370,7 @@
Optional prefix argument ARG specifies number of years."
(interactive "p")
(let ((n (or arg 1))
- (year (extract-calendar-year (calendar-cursor-to-date t))))
+ (year (calendar-extract-year (calendar-cursor-to-date t))))
(cal-tex-preamble "twoside")
(cal-tex-cmd "\\textwidth 3.25in")
(cal-tex-cmd "\\textheight 6.5in")
@@ -427,8 +427,8 @@
(interactive "p")
(let* ((n (or arg 1))
(date (calendar-cursor-to-date t))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
(end-month month)
(end-year year)
(cal-tex-which-days '(0 1 2 3 4 5 6))
@@ -438,7 +438,7 @@
(calendar-last-day-of-month end-month end-year)
end-year)))
(diary-list (progn
- (increment-calendar-month end-month end-year (1- n))
+ (calendar-increment-month end-month end-year (1- n))
(if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
(holidays (if cal-tex-holidays (cal-tex-list-holidays d1 d2)))
other-month other-year small-months-at-start)
@@ -447,10 +447,10 @@
(dotimes (i n)
(setq other-month month
other-year year)
- (increment-calendar-month other-month other-year -1)
+ (calendar-increment-month other-month other-year -1)
(insert (cal-tex-mini-calendar other-month other-year "lastmonth"
"\\cellwidth" "\\cellheight"))
- (increment-calendar-month other-month other-year 2)
+ (calendar-increment-month other-month other-year 2)
(insert (cal-tex-mini-calendar other-month other-year "nextmonth"
"\\cellwidth" "\\cellheight"))
(cal-tex-insert-month-header 1 month year month year)
@@ -478,7 +478,7 @@
(unless (= i (1- n))
(run-hooks 'cal-tex-month-hook)
(cal-tex-newpage)
- (increment-calendar-month month year 1)
+ (calendar-increment-month month year 1)
(cal-tex-vspace "-2cm")
(cal-tex-insert-preamble
(cal-tex-number-weeks month year 1) t "12pt" t))))
@@ -495,8 +495,8 @@
(interactive "p")
(let* ((n (or arg 1))
(date (calendar-cursor-to-date t))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
(end-month month)
(end-year year)
(d1 (calendar-absolute-from-gregorian (list month 1 year)))
@@ -505,7 +505,7 @@
(calendar-last-day-of-month end-month end-year)
end-year)))
(diary-list (progn
- (increment-calendar-month end-month end-year (1- n))
+ (calendar-increment-month end-month end-year (1- n))
(if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
(holidays (if cal-tex-holidays (cal-tex-list-holidays d1 d2)))
other-month other-year)
@@ -528,7 +528,7 @@
7)) ; last day of month was Saturday
(cal-tex-hfill)
(cal-tex-nl))
- (increment-calendar-month month year 1))
+ (calendar-increment-month month year 1))
(cal-tex-insert-blank-days-at-end end-month end-year cal-tex-day-prefix))
(cal-tex-end-document)
(run-hooks 'cal-tex-hook))
@@ -650,7 +650,7 @@
and lasting N months, including only the days in WHICH-DAYS. As it stands,
this is only an upper bound."
(let ((d (list month 1 year)))
- (increment-calendar-month month year (1- n))
+ (calendar-increment-month month year (1- n))
(/ (- (calendar-dayname-on-or-before
calendar-week-start-day
(+ 7 (calendar-absolute-from-gregorian
@@ -685,8 +685,8 @@
calendar-week-start-day
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
(d1 (calendar-absolute-from-gregorian date))
(d2 (+ (* 7 n) d1))
(holidays (if cal-tex-holidays
@@ -714,8 +714,8 @@
(cal-tex-week-hours date holidays "3.1")
(setq date (cal-tex-incr-date date)))
(cal-tex-e-parbox)
- (setq month (extract-calendar-month date)
- year (extract-calendar-year date))
+ (setq month (calendar-extract-month date)
+ year (calendar-extract-year date))
(unless (= i (1- n))
(run-hooks 'cal-tex-week-hook)
(cal-tex-newpage)))
@@ -738,8 +738,8 @@
calendar-week-start-day
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
(d date)
(d1 (calendar-absolute-from-gregorian date))
(d2 (+ (* 7 n) d1))
@@ -770,16 +770,16 @@
(cal-tex-e-parbox)
(cal-tex-nl)
(insert (cal-tex-mini-calendar
- (extract-calendar-month (cal-tex-previous-month date))
- (extract-calendar-year (cal-tex-previous-month date))
+ (calendar-extract-month (cal-tex-previous-month date))
+ (calendar-extract-year (cal-tex-previous-month date))
"lastmonth" "1.1in" "1in"))
(insert (cal-tex-mini-calendar
- (extract-calendar-month date)
- (extract-calendar-year date)
+ (calendar-extract-month date)
+ (calendar-extract-year date)
"thismonth" "1.1in" "1in"))
(insert (cal-tex-mini-calendar
- (extract-calendar-month (cal-tex-next-month date))
- (extract-calendar-year (cal-tex-next-month date))
+ (calendar-extract-month (cal-tex-next-month date))
+ (calendar-extract-year (cal-tex-next-month date))
"nextmonth" "1.1in" "1in"))
(insert "\\hbox to \\textwidth{")
(cal-tex-hfill)
@@ -796,8 +796,8 @@
(cal-tex-week-hours date holidays "5")
(setq date (cal-tex-incr-date date)))
(cal-tex-e-parbox)
- (setq month (extract-calendar-month date)
- year (extract-calendar-year date))
+ (setq month (calendar-extract-month date)
+ year (calendar-extract-year date))
(unless (= i (1- n))
(run-hooks 'cal-tex-week-hook)
(cal-tex-newpage)))
@@ -820,9 +820,9 @@
1
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
- (day (extract-calendar-day date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
+ (day (calendar-extract-day date))
(d1 (calendar-absolute-from-gregorian date))
(d2 (+ (* 7 n) d1))
(holidays (if cal-tex-holidays
@@ -847,8 +847,8 @@
(let ((d (calendar-iso-from-absolute
(calendar-absolute-from-gregorian date))))
(format "Week %d of %d"
- (extract-calendar-month d)
- (extract-calendar-year d))))
+ (calendar-extract-month d)
+ (calendar-extract-year d))))
(cal-tex-nl ".5cm")
(cal-tex-e-center)
(cal-tex-b-parbox "l" "\\textwidth")
@@ -881,13 +881,13 @@
(cal-tex-e-parbox)
(cal-tex-nl)
(setq date (cal-tex-incr-date date)
- month (extract-calendar-month date)
- day (extract-calendar-day date))
+ month (calendar-extract-month date)
+ day (calendar-extract-day date))
(cal-tex-e-parbox)
(cal-tex-e-parbox "2cm")
(cal-tex-nl)
- (setq month (extract-calendar-month date)
- year (extract-calendar-year date)))
+ (setq month (calendar-extract-month date)
+ year (calendar-extract-year date)))
(cal-tex-e-parbox)
(unless (= i (1- n))
(run-hooks 'cal-tex-week-hook)
@@ -901,9 +901,9 @@
"Insert hourly entries for DATE with HOLIDAYS, with line height HEIGHT.
Uses the 24-hour clock if `cal-tex-24' is non-nil. Note that the hours
shown are hard-coded to 8-12, 13-17."
- (let ((month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date))
+ (let ((month (calendar-extract-month date))
+ (day (calendar-extract-day date))
+ (year (calendar-extract-year date))
morning afternoon s)
(cal-tex-comment "begin cal-tex-week-hours")
(cal-tex-cmd "\\ \\\\[-.2cm]")
@@ -983,14 +983,14 @@
"Make one box for DATE, different if WEEKEND.
Uses the 24-hour clock if `cal-tex-24' is non-nil. Note that the hours
shown are hard-coded to 8-12, 13-17."
- (let* ((day (extract-calendar-day date))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
+ (let* ((day (calendar-extract-day date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
(dayname (cal-tex-LaTeXify-string (calendar-day-name date)))
(date1 (cal-tex-incr-date date))
- (day1 (extract-calendar-day date1))
- (month1 (extract-calendar-month date1))
- (year1 (extract-calendar-year date1))
+ (day1 (calendar-extract-day date1))
+ (month1 (calendar-extract-month date1))
+ (year1 (calendar-extract-year date1))
(dayname1 (cal-tex-LaTeXify-string (calendar-day-name date1))))
(cal-tex-b-framebox "8cm" "l")
(cal-tex-b-parbox "b" "7.5cm")
@@ -1032,9 +1032,9 @@
calendar-week-start-day
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
- (day (extract-calendar-day date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
+ (day (calendar-extract-day date))
(d1 (calendar-absolute-from-gregorian date))
(d2 (+ (* 7 n) d1))
(holidays (if cal-tex-holidays
@@ -1080,29 +1080,29 @@
(insert "\\lefthead"))
(cal-tex-arg
(let ((d (cal-tex-incr-date date 6)))
- (if (= (extract-calendar-month date)
- (extract-calendar-month d))
+ (if (= (calendar-extract-month date)
+ (calendar-extract-month d))
(format "%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (extract-calendar-year date))
- (if (= (extract-calendar-year date)
- (extract-calendar-year d))
+ (cal-tex-month-name (calendar-extract-month date))
+ (calendar-extract-year date))
+ (if (= (calendar-extract-year date)
+ (calendar-extract-year d))
(format "%s---%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (cal-tex-month-name (extract-calendar-month d))
- (extract-calendar-year date))
+ (cal-tex-month-name (calendar-extract-month date))
+ (cal-tex-month-name (calendar-extract-month d))
+ (calendar-extract-year date))
(format "%s %s---%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (extract-calendar-year date)
- (cal-tex-month-name (extract-calendar-month d))
- (extract-calendar-year d))))))
+ (cal-tex-month-name (calendar-extract-month date))
+ (calendar-extract-year date)
+ (cal-tex-month-name (calendar-extract-month d))
+ (calendar-extract-year d))))))
(insert "%\n")
(dotimes (jdummy 7)
(if (zerop (mod i 2))
(insert "\\rightday")
(insert "\\leftday"))
(cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
- (cal-tex-arg (int-to-string (extract-calendar-day date)))
+ (cal-tex-arg (int-to-string (calendar-extract-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
(cal-tex-arg (eval cal-tex-daily-string))
@@ -1127,9 +1127,9 @@
1
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
- (day (extract-calendar-day date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
+ (day (calendar-extract-day date))
(d1 (calendar-absolute-from-gregorian date))
(d2 (+ (* 7 n) d1))
(holidays (if cal-tex-holidays
@@ -1182,27 +1182,27 @@
(insert "\\lefthead")
(cal-tex-arg
(let ((d (cal-tex-incr-date date 2)))
- (if (= (extract-calendar-month date)
- (extract-calendar-month d))
+ (if (= (calendar-extract-month date)
+ (calendar-extract-month d))
(format "%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (extract-calendar-year date))
- (if (= (extract-calendar-year date)
- (extract-calendar-year d))
+ (cal-tex-month-name (calendar-extract-month date))
+ (calendar-extract-year date))
+ (if (= (calendar-extract-year date)
+ (calendar-extract-year d))
(format "%s---%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (cal-tex-month-name (extract-calendar-month d))
- (extract-calendar-year date))
+ (cal-tex-month-name (calendar-extract-month date))
+ (cal-tex-month-name (calendar-extract-month d))
+ (calendar-extract-year date))
(format "%s %s---%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (extract-calendar-year date)
- (cal-tex-month-name (extract-calendar-month d))
- (extract-calendar-year d))))))
+ (cal-tex-month-name (calendar-extract-month date))
+ (calendar-extract-year date)
+ (cal-tex-month-name (calendar-extract-month d))
+ (calendar-extract-year d))))))
(insert "%\n")
(dotimes (jdummy 3)
(insert "\\leftday")
(cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
- (cal-tex-arg (int-to-string (extract-calendar-day date)))
+ (cal-tex-arg (int-to-string (calendar-extract-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
(cal-tex-arg (eval cal-tex-daily-string))
@@ -1213,27 +1213,27 @@
(insert "\\righthead")
(cal-tex-arg
(let ((d (cal-tex-incr-date date 3)))
- (if (= (extract-calendar-month date)
- (extract-calendar-month d))
+ (if (= (calendar-extract-month date)
+ (calendar-extract-month d))
(format "%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (extract-calendar-year date))
- (if (= (extract-calendar-year date)
- (extract-calendar-year d))
+ (cal-tex-month-name (calendar-extract-month date))
+ (calendar-extract-year date))
+ (if (= (calendar-extract-year date)
+ (calendar-extract-year d))
(format "%s---%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (cal-tex-month-name (extract-calendar-month d))
- (extract-calendar-year date))
+ (cal-tex-month-name (calendar-extract-month date))
+ (cal-tex-month-name (calendar-extract-month d))
+ (calendar-extract-year date))
(format "%s %s---%s %s"
- (cal-tex-month-name (extract-calendar-month date))
- (extract-calendar-year date)
- (cal-tex-month-name (extract-calendar-month d))
- (extract-calendar-year d))))))
+ (cal-tex-month-name (calendar-extract-month date))
+ (calendar-extract-year date)
+ (cal-tex-month-name (calendar-extract-month d))
+ (calendar-extract-year d))))))
(insert "%\n")
(dotimes (jdummy 2)
(insert "\\rightday")
(cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
- (cal-tex-arg (int-to-string (extract-calendar-day date)))
+ (cal-tex-arg (int-to-string (calendar-extract-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
(cal-tex-arg (eval cal-tex-daily-string))
@@ -1242,7 +1242,7 @@
(dotimes (jdummy 2)
(insert "\\weekend")
(cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
- (cal-tex-arg (int-to-string (extract-calendar-day date)))
+ (cal-tex-arg (int-to-string (calendar-extract-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
(cal-tex-arg (eval cal-tex-daily-string))
@@ -1268,9 +1268,9 @@
1
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date))
- (day (extract-calendar-day date))
+ (month (calendar-extract-month date))
+ (year (calendar-extract-year date))
+ (day (calendar-extract-day date))
(d1 (calendar-absolute-from-gregorian date))
(d2 (+ (* 7 n) d1))
(holidays (if cal-tex-holidays
@@ -1397,14 +1397,14 @@
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 ((month-name (cal-tex-month-name (extract-calendar-month date)))
+ (let ((month-name (cal-tex-month-name (calendar-extract-month date)))
(i (1- cal-tex-daily-start))
hour)
(cal-tex-banner "cal-tex-daily-page")
(cal-tex-b-makebox "4cm" "l")
(cal-tex-b-parbox "b" "3.8cm")
(cal-tex-rule "0mm" "0mm" "2cm")
- (cal-tex-Huge (number-to-string (extract-calendar-day date)))
+ (cal-tex-Huge (number-to-string (calendar-extract-day date)))
(cal-tex-nl ".5cm")
(cal-tex-bf month-name )
(cal-tex-e-parbox)
@@ -1438,16 +1438,16 @@
(cal-tex-nl ".2cm"))
(cal-tex-hfill)
(insert (cal-tex-mini-calendar
- (extract-calendar-month (cal-tex-previous-month date))
- (extract-calendar-year (cal-tex-previous-month date))
+ (calendar-extract-month (cal-tex-previous-month date))
+ (calendar-extract-year (cal-tex-previous-month date))
"lastmonth" "1.1in" "1in"))
(insert (cal-tex-mini-calendar
- (extract-calendar-month date)
- (extract-calendar-year date)
+ (calendar-extract-month date)
+ (calendar-extract-year date)
"thismonth" "1.1in" "1in"))
(insert (cal-tex-mini-calendar
- (extract-calendar-month (cal-tex-next-month date))
- (extract-calendar-year (cal-tex-next-month date))
+ (calendar-extract-month (cal-tex-next-month date))
+ (calendar-extract-year (cal-tex-next-month date))
"nextmonth" "1.1in" "1in"))
(insert "\\hbox to \\textwidth{")
(cal-tex-hfill)
@@ -1544,16 +1544,16 @@
(defun cal-tex-previous-month (date)
"Return the date of the first day in the month previous to DATE."
- (let ((month (extract-calendar-month date))
- (year (extract-calendar-year date)))
- (increment-calendar-month month year -1)
+ (let ((month (calendar-extract-month date))
+ (year (calendar-extract-year date)))
+ (calendar-increment-month month year -1)
(list month 1 year)))
(defun cal-tex-next-month (date)
"Return the date of the first day in the month following DATE."
- (let ((month (extract-calendar-month date))
- (year (extract-calendar-year date)))
- (increment-calendar-month month year 1)
+ (let ((month (calendar-extract-month date))
+ (year (calendar-extract-year date)))
+ (calendar-increment-month month year 1)
(list month 1 year)))
;;;