diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-03-10 10:11:24 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-03-10 10:11:24 +0100 |
commit | 0b59a5994ed170e1f17e13e09fd34aeba6da4ae9 (patch) | |
tree | 1bec82afa7494a2a47390bf4bf30ebe81ced2054 | |
parent | d5a603db1f7b2f59e7a635649ede12aac68cf63f (diff) | |
parent | 5a735b0b8045966fab57f035a694a65209d3bd80 (diff) | |
download | org-mode-0b59a5994ed170e1f17e13e09fd34aeba6da4ae9.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ox.el | 6 | ||||
-rw-r--r-- | testing/lisp/test-ox.el | 15 |
2 files changed, 20 insertions, 1 deletions
@@ -5229,7 +5229,11 @@ INFO is the current export state, as a plist." (value (gethash parent cache 'missing-data))) (if (not (eq value 'missing-data)) (cdr (assq s value)) (let (level1-open full-status) - (org-element-map parent 'plain-text + (org-element-map + (let ((secondary (org-element-secondary-p s))) + (if secondary (org-element-property secondary parent) + (org-element-contents parent))) + 'plain-text (lambda (text) (let ((start 0) current-status) (while (setq start (string-match "['\"]" text start)) diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el index a15e111..43fa092 100644 --- a/testing/lisp/test-ox.el +++ b/testing/lisp/test-ox.el @@ -3069,6 +3069,21 @@ Another text. (ref:text) (org-test-with-parsed-data "#+CAPTION: \"$x$\"\nParagraph" (org-element-map tree 'plain-text (lambda (s) (org-export-activate-smart-quotes s :html info)) + info nil nil t))))) + ;; Smart quotes within objects. + (should + (equal '("“foo”") + (let ((org-export-default-language "en")) + (org-test-with-parsed-data "*\"foo\"*" + (org-element-map tree 'plain-text + (lambda (s) (org-export-activate-smart-quotes s :html info)) + info nil nil t))))) + (should + (equal '("“foo”") + (let ((org-export-default-language "en")) + (org-test-with-parsed-data "| \"foo\" |" + (org-element-map tree 'plain-text + (lambda (s) (org-export-activate-smart-quotes s :html info)) info nil nil t)))))) |