From 43c0ae945efd51cd1517960834dd4dfa7b9ace8d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 30 Aug 2012 15:54:33 +0200 Subject: [PATCH] org-e-latex/org-e-beamer: Allow inserting class option when there was none * contrib/lisp/org-e-beamer.el (org-e-beamer-template): Allow inserting class option when there was none. * contrib/lisp/org-e-latex.el (org-e-latex-template): Allow inserting class option when there was none. Thanks to Fabrice Popineau for suggesting this. --- contrib/lisp/org-e-beamer.el | 9 ++++----- contrib/lisp/org-e-latex.el | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/contrib/lisp/org-e-beamer.el b/contrib/lisp/org-e-beamer.el index 85a04821c..9c4251886 100644 --- a/contrib/lisp/org-e-beamer.el +++ b/contrib/lisp/org-e-beamer.el @@ -743,11 +743,10 @@ holding export options." (let* ((header (nth 1 (assoc class org-e-latex-classes))) (document-class-string (and (stringp header) - (if class-options - (replace-regexp-in-string - "^[ \t]*\\\\documentclass\\(\\[.*?\\]\\)" - class-options header t nil 1) - header)))) + (if (not class-options) header + (replace-regexp-in-string + "^[ \t]*\\\\documentclass\\(\\(\\[.*\\]\\)?\\)" + class-options header t nil 1))))) (when document-class-string (org-e-latex--guess-babel-language (org-e-latex--guess-inputenc diff --git a/contrib/lisp/org-e-latex.el b/contrib/lisp/org-e-latex.el index f67b523e8..88ffe54e2 100644 --- a/contrib/lisp/org-e-latex.el +++ b/contrib/lisp/org-e-latex.el @@ -1009,11 +1009,10 @@ holding export options." (let* ((header (nth 1 (assoc class org-e-latex-classes))) (document-class-string (and (stringp header) - (if class-options - (replace-regexp-in-string - "^[ \t]*\\\\documentclass\\(\\[.*?\\]\\)" - class-options header t nil 1) - header)))) + (if (not class-options) header + (replace-regexp-in-string + "^[ \t]*\\\\documentclass\\(\\(\\[.*\\]\\)?\\)" + class-options header t nil 1))))) (when document-class-string (org-e-latex--guess-babel-language (org-e-latex--guess-inputenc -- 2.11.4.GIT