From 493b2fa1914fff5e5eaf7875f1489e996efb92ca Mon Sep 17 00:00:00 2001 From: Philipp Kroos Date: Sat, 15 Sep 2012 14:58:49 +0200 Subject: [PATCH] org-e-latex: Introduced org-e-latex-known-errors * contrib/lisp/org-e-latex.el: new customizable org-e-latex-known-errors is an alist of possible errors, taken from org-e-latex--collect-errors * contrib/lisp/org-e-latex.el (org-e-latex--collect-errors): More concise code. The previous explicit search for errors is replaced by an iteration over the alist org-e-latex-known-errors. --- contrib/lisp/org-e-latex.el | 36 ++++++++++++++++++++---------------- 1 Datei geändert, 20 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) diff --git a/contrib/lisp/org-e-latex.el b/contrib/lisp/org-e-latex.el index 458579c..66a4d9d 100644 --- a/contrib/lisp/org-e-latex.el +++ b/contrib/lisp/org-e-latex.el @@ -820,6 +820,21 @@ These are the .aux, .log, .out, and .toc files." :group 'org-export-e-latex :type 'boolean) +(defcustom org-e-latex-known-errors + '(("Reference.*?undefined" . "[undefined reference]") + ("Citation.*?undefined" . "[undefined citation]") + ("Undefined control sequence" . "[undefined control sequence]") + ("^! LaTeX.*?Error" . "[LaTeX error]") + ("^! Package.*?Error" . "[package error]") + ("Runaway argument" . "Runaway argument")) + "Alist of regular expressions and associated messages for the user. + The regular expressions are used to find possible errors in + the log of a latex-run." + :group 'org-export-e-latex + :type '(repeat + (cons + (string :tag "Regexp") + (string :tag "Message")))) ;;; Internal Functions @@ -2709,24 +2724,13 @@ none." (save-excursion (goto-char (point-max)) ;; Find final "pdflatex" run. - (when (re-search-backward "^[ \t]*This is pdf.*?TeX.*?Version" nil t) + (when (re-search-backward "^[ \t]*This is .*?TeX.*?Version" nil t) (let ((case-fold-search t) (errors "")) - (when (save-excursion - (re-search-forward "Reference.*?undefined" nil t)) - (setq errors (concat errors " [undefined reference]"))) - (when (save-excursion - (re-search-forward "Citation.*?undefined" nil t)) - (setq errors (concat errors " [undefined citation]"))) - (when (save-excursion - (re-search-forward "Undefined control sequence" nil t)) - (setq errors (concat errors " [undefined control sequence]"))) - (when (save-excursion - (re-search-forward "^! LaTeX.*?Error" nil t)) - (setq errors (concat errors " [LaTeX error]"))) - (when (save-excursion - (re-search-forward "^! Package.*?Error" nil t)) - (setq errors (concat errors " [package error]"))) + (dolist (latex-error org-e-latex-known-errors) + (when (save-excursion + (re-search-forward (car latex-error) nil t)) + (setq errors (concat errors " " (cdr latex-error))))) (and (org-string-nw-p errors) (org-trim errors))))))) -- 1.7.12