Small cal-tex fix.

* lisp/calendar/cal-tex.el (cal-tex-end-document):
Try to automatically use latin1 input if needed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1007b146fcb205cbc3a6f4e59338f078fc989de..b5309f2a3ed8635ceac6b2d76589a5ea932a9361 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-12  Glenn Morris  <rgm@gnu.org>
 
+       * calendar/cal-tex.el (cal-tex-end-document):
+       Try to automatically use latin1 input if needed.
+
        * calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh):
        Don't try to cons a mark onto an empty element.
 

diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index a3f71107854a0add2b1b217145346e5631a07671..2fc215c06c47e96f126a42ac39a0c6214477d8a0 100644 (file)
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1587,6 +1587,16 @@ FINAL-SEPARATOR is non-nil."
 Insert the trailer to LaTeX document, pop to LaTeX buffer, add
 informative header, and run HOOK."
   (cal-tex-e-document)
+  (or (and cal-tex-preamble-extra
+           (string-match "inputenc" cal-tex-preamble-extra))
+      (not (re-search-backward "[^[:ascii:]]" nil 'move))
+      (progn
+        (goto-char (point-min))
+        (when (search-forward "documentclass" nil t)
+          (forward-line 1)
+          ;; Eg for some Bahai holidays.
+          ;; FIXME latin1 might not always be right.
+          (insert "\\usepackage[latin1]{inputenc}\n"))))
   (latex-mode)
   (pop-to-buffer cal-tex-buffer)
   (goto-char (point-min))