X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/6ed1b26ad20632cb62071ba056fc656bdbdd6253..fbc946b7cb685bb47268f036e7fb4ed58ad19cbe:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 0e93221..17ca3bb 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -470,20 +470,40 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'."
 	(dolist (key replacements)
 	  (define-key keymap key binding))))))
 
-(eval-after-load "org-latex"
-  '(progn
-     (push '("strayman"
-	     "\\documentclass{strayman}
+(defvar mdw-org-latex-defs
+  '(("strayman"
+     "\\documentclass{strayman}
 \\usepackage[utf8]{inputenc}
 \\usepackage[palatino, helvetica, courier, maths=cmr]{mdwfonts}
-\\usepackage[T1]{fontenc}
 \\usepackage{graphicx, tikz, mdwtab, mdwmath, crypto, longtable}"
-	     ("\\section{%s}" . "\\section*{%s}")
-	     ("\\subsection{%s}" . "\\subsection*{%s}")
-	     ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
-	     ("\\paragraph{%s}" . "\\paragraph*{%s}")
-	     ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
-	   org-export-latex-classes)))
+     ("\\section{%s}" . "\\section*{%s}")
+     ("\\subsection{%s}" . "\\subsection*{%s}")
+     ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+     ("\\paragraph{%s}" . "\\paragraph*{%s}")
+     ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))))
+
+(eval-after-load "org-latex"
+  '(setq org-export-latex-classes
+	 (append mdw-org-latex-defs org-export-latex-classes)))
+
+(eval-after-load "ox-latex"
+  '(setq org-latex-classes (append mdw-org-latex-defs org-latex-classes)
+	 org-latex-default-packages-alist '(("AUTO" "inputenc" t)
+					    ("T1" "fontenc" t)
+					    ("" "fixltx2e" nil)
+					    ("" "graphicx" t)
+					    ("" "longtable" nil)
+					    ("" "float" nil)
+					    ("" "wrapfig" nil)
+					    ("" "rotating" nil)
+					    ("normalem" "ulem" t)
+					    ("" "textcomp" t)
+					    ("" "marvosym" t)
+					    ("" "wasysym" t)
+					    ("" "amssymb" t)
+					    ("" "hyperref" nil)
+					    "\\tolerance=1000")))
+
 
 (setq org-export-docbook-xslt-proc-command "xsltproc --output %o %s %i"
       org-export-docbook-xsl-fo-proc-command "fop %i.safe %o"
@@ -730,7 +750,7 @@ Use this to arrange for per-server settings.")
     proc))
 
 (eval-after-load "erc"
-    '(load "~/.ercrc.el"))
+  '(load "~/.ercrc.el"))
 
 ;;;--------------------------------------------------------------------------
 ;;; Utility functions.
@@ -920,7 +940,8 @@ If NEW-SESSION-P, start a new session."
 	(select-window window)))))
 
 (defvar mdw-good-url-browsers
-  '(browse-url-mozilla
+  '(browse-url-chromium
+    browse-url-mozilla
     browse-url-generic
     (w3m . mdw-w3m-browse-url)
     browse-url-w3)
@@ -1009,10 +1030,6 @@ It in turn is a list of things:
   "*Standard regexp matching parts of a hanging indent.
 This is mainly useful in `auto-fill-mode'.")
 
-;; Setting things up.
-
-(fset 'mdw-do-auto-fill (symbol-function 'do-auto-fill))
-
 ;; Utility functions.
 
 (defun mdw-maybe-tabify (s)
@@ -1068,11 +1085,11 @@ See `mdw-fill-prefix' for details."
 	     (save-match-data
 	       (mdw-examine-fill-prefixes mdw-fill-prefix))))))
 
-(defun do-auto-fill ()
+(defadvice do-auto-fill (around mdw-dynamic-fill-prefix () activate compile)
   "Handle auto-filling, working out a dynamic fill prefix in the
 case where there isn't a sensible static one."
   (let ((fill-prefix (mdw-choose-dynamic-fill-prefix)))
-    (mdw-do-auto-fill)))
+    ad-do-it))
 
 (defun mdw-fill-paragraph ()
   "Fill paragraph, getting a dynamic fill prefix."
@@ -3378,6 +3395,9 @@ strip numbers instead."
 	   (unless modified
 	     (restore-buffer-modified-p nil)))))))
 
+(setq LaTeX-syntactic-comments nil
+      LaTeX-fill-break-at-separators '(\\\[))
+
 ;;;--------------------------------------------------------------------------
 ;;; SGML hacking.