From 1941e1344e7c7e8f49a48faefba55e5c23c08448 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 20 Aug 2012 21:32:26 -0400 Subject: [PATCH] cal-tex-cursor-week-at-a-glance small fixes * lisp/calendar/cal-tex.el (cal-tex-cursor-week-at-a-glance): Add autoload cookie. For now at least, don't use color, since no other cal-tex function does. --- lisp/ChangeLog | 4 ++++ lisp/calendar/cal-tex.el | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3efc458149..b4ce13b3cdd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2012-08-21 Glenn Morris + * calendar/cal-tex.el (cal-tex-cursor-week-at-a-glance): + Add autoload cookie. For now at least, don't use color, since + no other cal-tex function does. + * calendar/cal-tex.el (cal-tex-cursor-week-iso) (cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week) (cal-tex-cursor-filofax-daily): Correct start date for diary entries. diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index 3063c657b93..cab3951673e 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el @@ -1006,12 +1006,13 @@ shown are hard-coded to 8-12, 13-17." (cal-tex-e-framebox) (cal-tex-hspace "1cm"))) +;;;###cal-autoload (defun cal-tex-cursor-week-at-a-glance (&optional n event) "One-week-at-a-glance full page calendar for week indicated by cursor. Optional prefix argument N 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. -It does not show hours of the day. Optional EVENT indicates a buffer +It does not show hours of the day. Optional EVENT indicates a buffer position to use instead of point." (interactive (list (prefix-numeric-value current-prefix-arg) last-nonmenu-event)) @@ -1031,7 +1032,6 @@ position to use instead of point." (diary-list (if cal-tex-diary (cal-tex-list-diary-entries d1 d2)))) (cal-tex-preamble "twoside,12pt") - (cal-tex-cmd "\\usepackage{color}") (cal-tex-cmd "\\textwidth 7in") (cal-tex-cmd "\\textheight 10.5in") (cal-tex-cmd "\\oddsidemargin 0in") @@ -1047,16 +1047,16 @@ position to use instead of point." \\vbox to 2.75in{% \\vspace*{2pt}% \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}% - \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em \\textcolor{red}{#4}}}% - \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize \\textcolor{blue}{#3}}}}}\\\\} + \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em #4}}% + \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #3}}}}\\\\} \\long\\def\\weekend#1#2#3#4#5{% \\rule{\\textwidth}{0.3pt}\\\\% \\hbox to \\textwidth{% \\vbox to 1.8in{% \\vspace*{2pt}% \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}% - \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em \\textcolor{red}{#4}}}% - \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize \\textcolor{blue}{#3}}}}}\\\\} + \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em #4}}% + \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #3}}}}\\\\} \\def\\lefthead#1{\\noindent {\\normalsize \\bf #1}\\hfill\\\\[-6pt]} \\long\\def\\leftday#1#2#3#4#5{% \\rule{\\textwidth}{0.3pt}\\\\% @@ -1064,8 +1064,8 @@ position to use instead of point." \\vbox to 2.75in{% \\vspace*{2pt}% \\hbox to \\textwidth{\\noindent {\\normalsize \\bf #2} \\small #1 \\hfill #5}% - \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize \\em \\textcolor{red}{#4}}}% - \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize \\textcolor{blue}{#3}}}}}\\\\} + \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize \\em #4}}% + \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #3}}}}\\\\} ") (cal-tex-b-document) (cal-tex-cmd "\\pagestyle{empty}\\ ") -- 2.39.5