ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Eric Schulte 2011-03-01 10:42:59 -07:00
parent cfb06bc70b 87b73ad271
commit 9652e5f64e
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/org-exp.el
View File

@ -1197,23 +1197,11 @@ on this string to produce the exported version."
;; Another hook ;; Another hook
(run-hooks 'org-export-preprocess-before-backend-specifics-hook) (run-hooks 'org-export-preprocess-before-backend-specifics-hook)
;; LaTeX-specific preprocessing ;; Backend-specific preprocessing
(when (eq backend 'latex) (let* ((backend-name (symbol-name backend))
(require 'org-latex nil) (f (intern (format "org-export-%s-preprocess" backend-name))))
(org-export-latex-preprocess parameters)) (require (intern (concat "org-" backend-name)) nil)
(funcall f parameters))
;; ASCII-specific preprocessing
(when (eq backend 'ascii)
(org-export-ascii-preprocess parameters))
;; HTML-specific preprocessing
(when (eq backend 'html)
(org-export-html-preprocess parameters))
;; DocBook-specific preprocessing
(when (eq backend 'docbook)
(require 'org-docbook nil)
(org-export-docbook-preprocess parameters))
;; Remove or replace comments ;; Remove or replace comments
(org-export-handle-comments (plist-get parameters :comments)) (org-export-handle-comments (plist-get parameters :comments))

11
lisp/org-latex.el
View File

@ -1334,8 +1334,10 @@ OPT-PLIST is the options plist for current buffer."
(let ((toc (plist-get opt-plist :table-of-contents)) (let ((toc (plist-get opt-plist :table-of-contents))
(author (org-export-apply-macros-in-string (author (org-export-apply-macros-in-string
(plist-get opt-plist :author))) (plist-get opt-plist :author)))
(email (org-export-apply-macros-in-string (email (replace-regexp-in-string
(plist-get opt-plist :email)))) "_" "\\\\_"
(org-export-apply-macros-in-string
(plist-get opt-plist :email)))))
(concat (concat
(if (plist-get opt-plist :time-stamp-file) (if (plist-get opt-plist :time-stamp-file)
(format-time-string "%% Created %Y-%m-%d %a %H:%M\n")) (format-time-string "%% Created %Y-%m-%d %a %H:%M\n"))
@ -1361,11 +1363,10 @@ OPT-PLIST is the options plist for current buffer."
(if (plist-get opt-plist :author-info) (if (plist-get opt-plist :author-info)
(format "\\author{%s%s}\n" (format "\\author{%s%s}\n"
(org-export-latex-fontify-headline (or author user-full-name)) (org-export-latex-fontify-headline (or author user-full-name))
(org-export-latex-fontify-headline (if (and (plist-get opt-plist :email-info) email
(if (and (plist-get opt-plist :email-info) email
(string-match "\\S-" email)) (string-match "\\S-" email))
(format "\\thanks{%s}" email) (format "\\thanks{%s}" email)
""))) ""))
(format "%%\\author{%s}\n" (format "%%\\author{%s}\n"
(org-export-latex-fontify-headline (or author user-full-name)))) (org-export-latex-fontify-headline (or author user-full-name))))
;; insert the date ;; insert the date