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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2014-03-20 18:22:39 +01:00
parent 0e3b49e3e1 a97959984a
commit 625397177d
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/org-element.el
View File

@ -3059,12 +3059,9 @@ Assume point is at the beginning of the link."
;; Type 1: Text targeted from a radio target.
((and org-target-link-regexp (looking-at org-target-link-regexp))
(setq type "radio"
contents-begin (match-beginning 0)
contents-end (match-end 0)
link-end contents-end
raw-link (org-match-string-no-properties 0)
path (downcase raw-link)))
;; Type 2: Standard link, e.g. [[http://orgmode.org][homepage]]
link-end (match-end 0)
path (org-match-string-no-properties 0)))
;; Type 2: Standard link, i.e. [[http://orgmode.org][homepage]]
((looking-at org-bracket-link-regexp)
(setq contents-begin (match-beginning 3)
contents-end (match-end 3)
@ -3232,8 +3229,8 @@ beginning position."
"Parse radio target at point.
Return a list whose CAR is `radio-target' and CDR a plist with
`:value', `:raw-value', `:begin', `:end', `:contents-begin',
`:contents-end', and `:post-blank' as keywords.
`:begin', `:end', `:contents-begin', `:contents-end', `:value'
and `:post-blank' as keywords.
Assume point is at the radio target."
(save-excursion
@ -3241,18 +3238,17 @@ Assume point is at the radio target."
(let ((begin (point))
(contents-begin (match-beginning 1))
(contents-end (match-end 1))
(raw-value (org-match-string-no-properties 1))
(value (org-match-string-no-properties 1))
(post-blank (progn (goto-char (match-end 0))
(skip-chars-forward " \t")))
(end (point)))
(list 'radio-target
(list :value (downcase raw-value)
:raw-value raw-value
:begin begin
(list :begin begin
:end end
:contents-begin contents-begin
:contents-end contents-end
:post-blank post-blank)))))
:post-blank post-blank
:value value)))))
(defun org-element-radio-target-interpreter (target contents)
"Interpret TARGET object as Org syntax.

8
lisp/ox-ascii.el
View File

@ -1386,8 +1386,12 @@ INFO is a plist holding contextual information."
(let ((ref (org-element-property :path link)))
(format (org-export-get-coderef-format ref desc)
(org-export-resolve-coderef ref info))))
;; Do not apply a special syntax on radio links.
((string= type "radio") desc)
;; Do not apply a special syntax on radio links. Though, use
;; transcoded target's contents as output.
((string= type "radio")
(let ((destination (org-export-resolve-radio-link link info)))
(when destination
(org-export-data (org-element-contents destination) info))))
;; Do not apply a special syntax on fuzzy links pointing to
;; targets.
((string= type "fuzzy")