Show
Ignore:
Timestamp:
05/03/06 18:37:43 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk

    • Property svn:ignore changed from
      bin
      to
      bin
      site-lisp
  • trunk/lisp/calendar/cal-tex.el

    r4037 r4073  
    4646(require 'calendar) 
    4747 
    48 (autoload 'list-diary-entries "diary-lib" nil t) 
     48(autoload 'diary-list-entries "diary-lib" nil t) 
    4949(autoload 'calendar-holiday-list "holidays" nil t) 
    5050(autoload 'calendar-iso-from-absolute "cal-iso" nil t) 
     
    121121  :type 'integer 
    122122  :group 'calendar-tex) 
     123 
     124(defcustom cal-tex-preamble-extra nil 
     125  "A string giving extra LaTeX commands to insert in the calendar preamble. 
     126For example, to include extra packages: 
     127\"\\\\usepackage{foo}\\n\\\\usepackage{bar}\\n\"." 
     128  :type 'string 
     129  :group 'calendar-tex 
     130  :version "22.1") 
    123131 
    124132(defcustom cal-tex-hook nil 
     
    241249  (let ((diary-list-include-blanks nil) 
    242250        (diary-display-hook 'ignore)) 
    243     (list-diary-entries 
     251    (diary-list-entries 
    244252     (calendar-gregorian-from-absolute d1) 
    245253     (1+ (- d2 d1))))) 
     
    254262  (if args 
    255263      (insert "[" args "]")) 
    256   (insert "{article}\n" 
    257           "\\hbadness 20000 
     264  (insert "{article}\n") 
     265  (if (stringp cal-tex-preamble-extra) 
     266      (insert cal-tex-preamble-extra "\n")) 
     267  (insert "\\hbadness 20000 
    258268\\hfuzz=1000pt 
    259269\\vbadness 20000 
     
    358368       (cal-tex-nl) 
    359369       (let ((month-names; don't use default in case user changed it 
     370              ;; These are only used to define the command names, not 
     371              ;; the names of the months they insert. 
    360372              ["January" "February" "March" "April" "May" "June" 
    361373               "July" "August" "September" "October" "November" "December"]))