Replace remaining htmlp and latexp conditions.

This commit is contained in:
Bastien Guerry 2011-02-18 09:49:12 +01:00
parent 373caa4d1c
commit 68114fb650
1 changed files with 6 additions and 15 deletions

View File

@ -72,13 +72,12 @@
(opt (org-exp-bibtex-options-to-plist (match-string 3)))) (opt (org-exp-bibtex-options-to-plist (match-string 3))))
(replace-match (replace-match
(cond (cond
(htmlp ;; We are exporting to HTML ((eq backend 'html) ;; We are exporting to HTML
(let (extra-args cite-list end-hook tmp-files) (let (extra-args cite-list end-hook tmp-files)
(dolist (elt opt) (dolist (elt opt)
(when (equal "option" (car elt)) (when (equal "option" (car elt))
(setq extra-args (cons (cdr elt) extra-args)))) (setq extra-args (cons (cdr elt) extra-args))))
(when (assoc "limit" opt) ;; Limit is true - collect references (when (assoc "limit" opt) ;; Limit is true - collect references
(org-exp-bibtex-docites (lambda () (org-exp-bibtex-docites (lambda ()
(dolist (c (org-split-string (match-string 1) ",")) (dolist (c (org-split-string (match-string 1) ","))
@ -107,13 +106,12 @@
(while (re-search-forward "<hr>" nil t) (while (re-search-forward "<hr>" nil t)
(replace-match "<hr/>" t t)) (replace-match "<hr/>" t t))
(concat "\n#+BEGIN_HTML\n<div id=\"bibliography\">\n" (buffer-string) "\n</div>\n#+END_HTML\n")))) (concat "\n#+BEGIN_HTML\n<div id=\"bibliography\">\n" (buffer-string) "\n</div>\n#+END_HTML\n"))))
(latexp ;; Latex export ((eq backend 'latex) ;; Latex export
(concat "\n#+LATEX: \\bibliographystyle{" style "}" (concat "\n#+LATEX: \\bibliographystyle{" style "}"
"\n#+LATEX: \\bibliography{" file "}\n"))) t t))) "\n#+LATEX: \\bibliography{" file "}\n"))) t t)))
;; Convert cites to links in html ;; Convert cites to links in html
(when htmlp (when (eq backend 'html)
;; Split citation commands with multiple keys ;; Split citation commands with multiple keys
(org-exp-bibtex-docites (org-exp-bibtex-docites
(lambda () (lambda ()
@ -126,28 +124,21 @@
(lambda () (let* ((cn (match-string 1)) (lambda () (let* ((cn (match-string 1))
(cv (assoc cn oebp-cite-plist))) (cv (assoc cn oebp-cite-plist)))
;; (message "L: %s" (concat "\[_{}[[" cn "][" (if cv (cdr cv) cn) "]]\]")) ;; (message "L: %s" (concat "\[_{}[[" cn "][" (if cv (cdr cv) cn) "]]\]"))
(replace-match (concat "\[_{}[[#" cn "][" (if cv (cdr cv) cn) "]]\]")) t t)))) (replace-match (concat "\[_{}[[#" cn "][" (if cv (cdr cv) cn) "]]\]")) t t))))))
))
(defun org-exp-bibtex-docites (fun) (defun org-exp-bibtex-docites (fun)
(save-excursion (save-excursion
(save-match-data (save-match-data
(goto-char (point-min)) (goto-char (point-min))
(when htmlp (when (eq backend 'html)
(while (re-search-forward "\\\\cite{\\([^}\n]+\\)}" nil t) (while (re-search-forward "\\\\cite{\\([^}\n]+\\)}" nil t)
(apply fun nil)))))) (apply fun nil))))))
(defun org-exp-bibtex-options-to-plist (options) (defun org-exp-bibtex-options-to-plist (options)
(save-match-data (save-match-data
(flet ((f (o) (let ((s (split-string o ":"))) (cons (nth 0 s) (nth 1 s))))) (flet ((f (o) (let ((s (split-string o ":"))) (cons (nth 0 s) (nth 1 s)))))
(mapcar 'f (split-string options nil t))))) (mapcar 'f (split-string options nil t)))))
(add-hook 'org-export-preprocess-hook 'org-export-bibtex-preprocess) (add-hook 'org-export-preprocess-hook 'org-export-bibtex-preprocess)
(provide 'org-exp-bibtex) (provide 'org-exp-bibtex)