diff options
Diffstat (limited to 'lisp/ox-beamer.el')
-rw-r--r-- | lisp/ox-beamer.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el index 485f098..f3a79d7 100644 --- a/lisp/ox-beamer.el +++ b/lisp/ox-beamer.el @@ -644,11 +644,11 @@ contextual information." (and (eq (org-element-type first-element) 'paragraph) (org-beamer--element-has-overlay-p first-element)))) (output (org-export-with-backend 'latex item contents info))) - (if (not action) output + (if (or (not action) (not (string-match "\\\\item" output))) output ;; If the item starts with a paragraph and that paragraph starts ;; with an export snippet specifying an overlay, insert it after ;; \item command. - (replace-regexp-in-string "\\\\item" (concat "\\\\item" action) output)))) + (replace-match (concat "\\\\item" action) nil nil output)))) ;;;; Keyword @@ -690,8 +690,9 @@ used as a communication channel." (when destination (format "\\hyperlink%s{%s}{%s}" (or (org-beamer--element-has-overlay-p link) "") - (org-export-solidify-link-text path) - (org-export-data (org-element-contents destination) info))))) + (org-export-solidify-link-text + (org-element-property :value destination)) + contents)))) ((and (member type '("custom-id" "fuzzy" "id")) (let ((destination (if (string= type "fuzzy") (org-export-resolve-fuzzy-link link info) @@ -1166,7 +1167,9 @@ Return output file name." ;; working directory and then moved to publishing directory. (org-publish-attachment plist - (org-latex-compile (org-publish-org-to 'beamer filename ".tex" plist)) + (org-latex-compile + (org-publish-org-to + 'beamer filename ".tex" plist (file-name-directory filename))) pub-dir)) |