tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

org-element: Allow links in captions 

* lisp/org-element.el (org-element-object-restrictions): Allow links
  in caption. Also allow inline-src-blocks and inline-babel-calls.
* contrib/lisp/org-e-ascii.el (org-e-ascii--unique-links): Handle
  links in captions.
(org-e-ascii--describe-links): Small refactoring.
(org-e-ascii-template--document-title): Handle links in document
properties.
This commit is contained in:
Nicolas Goaziou 2012-09-30 23:56:00 +02:00
parent 3245619445
commit 934208ece1
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contrib/lisp/org-e-ascii.el
View File

@ -734,7 +734,12 @@ is a plist used as a communication channel."
(let ((footprint
(cons (org-element-property :raw-link link)
(org-element-contents link))))
(unless (member footprint seen)
;; Ignore LINK if it hasn't been translated already.
;; It can happen if it is located in an affiliated
;; keyword that was ignored.
(when (and (org-string-nw-p
(gethash link (plist-get info :exported-data)))
(not (member footprint seen)))
(push footprint seen) link)))))
;; If at a section, find parent headline, if any, in order to
;; count links that might be in the title.
@ -743,7 +748,7 @@ is a plist used as a communication channel."
(or (org-export-get-parent-headline element) element))))
;; Get all links in HEADLINE.
(org-element-map
headline 'link (lambda (link) (funcall unique-link-p link)) info)))
headline 'link (lambda (l) (funcall unique-link-p l)) info nil nil t)))
(defun org-e-ascii--describe-links (links width info)
"Return a string describing a list of links.
@ -756,8 +761,8 @@ channel."
(lambda (link)
(let ((type (org-element-property :type link))
(anchor (let ((desc (org-element-contents link)))
(if (not desc) (org-element-property :raw-link link)
(org-export-data desc info)))))
(if desc (org-export-data desc info)
(org-element-property :raw-link link)))))
(cond
;; Coderefs, radio links and fuzzy links are ignored.
((member type '("coderef" "radio" "fuzzy")) nil)
@ -803,14 +808,17 @@ INFO is a plist used as a communication channel."
(defun org-e-ascii-template--document-title (info)
"Return document title, as a string.
INFO is a plist used as a communication channel."
(let ((text-width org-e-ascii-text-width)
(title (org-export-data (plist-get info :title) info))
(author (and (plist-get info :with-author)
(let ((auth (plist-get info :author)))
(and auth (org-export-data auth info)))))
(email (and (plist-get info :with-email)
(org-export-data (plist-get info :email) info)))
(date (org-export-data (plist-get info :date) info)))
(let* ((text-width org-e-ascii-text-width)
;; Links in the title will not be resolved later, so we make
;; sure their path is located right after them.
(org-e-ascii-links-to-notes nil)
(title (org-export-data (plist-get info :title) info))
(author (and (plist-get info :with-author)
(let ((auth (plist-get info :author)))
(and auth (org-export-data auth info)))))
(email (and (plist-get info :with-email)
(org-export-data (plist-get info :email) info)))
(date (org-export-data (plist-get info :date) info)))
;; There are two types of title blocks depending on the presence
;; of a title to display.
(if (string= title "")

3
lisp/org-element.el
View File

@ -304,7 +304,8 @@ a secondary string.")
link radio-target sub/superscript target text-markup timestamp)
(item export-snippet footnote-reference inline-babel-call latex-or-entity
link macro radio-target sub/superscript target text-markup)
(keyword latex-or-entity macro sub/superscript text-markup)
(keyword inline-babel-call inline-src-block latex-or-entity link macro
sub/superscript text-markup)
(link export-snippet inline-babel-call inline-src-block latex-or-entity link
sub/superscript text-markup)
(paragraph export-snippet footnote-reference inline-babel-call