[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] radio links in middle of words.
From: |
Nicolas Goaziou |
Subject: |
Re: [O] radio links in middle of words. |
Date: |
Thu, 10 Apr 2014 23:43:41 +0200 |
Hello,
Daniel Clemente <address@hidden> writes:
> I propose: radio links should be delimited by characters that don't match
> [:alpha:] in emacs' regular expression syntax.
> Letters (like: aá書ĉ) match, and delimiters (like: -'"/) don't.
>
> Test it with:
> : (string-match-p "[[:alpha:]]" "á")
> : (string-match-p "[[:alpha:]]" "書")
> : (string-match-p "[[:alpha:]]" "ĉ")
>
> : (string-match-p "[[:alpha:]]" "'")
> : (string-match-p "[[:alpha:]]" "-")
>
> And the opposite: check for non-letterness:
> : (string-match-p "[^[:alpha:]]" "-")
> : (string-match-p "[^[:alpha:]]" "á")
>
>
> So a radio link with LINK_TEXT should not only be a match of the
> regexp "LINK_TEXT" but of "[^[:alpha:]]LINK_TEXT[^[:alpha:]]" (well,
> make it something like "(^|non-letter)LINK_TEXT($|non-text)".
>
> I think that's better than the current solution and stills allows
> for radio links which contain non-letters, like <<<o'clock>>>. What
> do you think?
It could work. But I think [:alnum:] is needed instead of [:alpha:].
Here's a patch implementing it.
Regards,
--
Nicolas Goaziou
>From 581e68fda98e737043fce479e6eb0cf2b3599c9b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <address@hidden>
Date: Thu, 10 Apr 2014 22:23:27 +0200
Subject: [PATCH] No alphanumeric characters around radio links
* lisp/org.el (org-make-target-link-regexp): Change regexp so
alphanumeric characters cannot be found next to a radio link.
(org-activate-target-links): Apply changes to radio link regexp.
* lisp/org-element.el (org-element--object-lex,
org-element-link-parser): Apply changes to radio link regexp.
* testing/lisp/test-org-element.el (test-org-element/link-parser):
Update test.
Patch suggested by Daniel Clemente.
http://permalink.gmane.org/gmane.emacs.orgmode/84461
---
lisp/org-element.el | 15 +++++++++------
lisp/org.el | 10 +++++-----
testing/lisp/test-org-element.el | 7 +++----
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 06cce47..13837e9 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -2943,12 +2943,14 @@ Assume point is at the beginning of the link."
raw-link link search-option application)
(cond
;; Type 1: Text targeted from a radio target.
- ((and org-target-link-regexp (looking-at org-target-link-regexp))
+ ((and org-target-link-regexp
+ (save-excursion (or (bolp) (backward-char))
+ (looking-at org-target-link-regexp)))
(setq type "radio"
- link-end (match-end 0)
- path (org-match-string-no-properties 0)
- contents-begin (match-beginning 0)
- contents-end (match-end 0)))
+ link-end (match-end 1)
+ path (org-match-string-no-properties 1)
+ contents-begin (match-beginning 1)
+ contents-end (match-end 1)))
;; Type 2: Standard link, i.e. [[http://orgmode.org][homepage]]
((looking-at org-bracket-link-regexp)
(setq contents-begin (match-beginning 3)
@@ -4184,8 +4186,9 @@ to an appropriate container (e.g., a paragraph)."
(save-excursion
(let ((limit (and org-target-link-regexp
(save-excursion
+ (or (bolp) (backward-char))
(re-search-forward org-target-link-regexp nil t))
- (match-beginning 0)))
+ (match-beginning 1)))
found)
(while (and (not found)
(re-search-forward org-element--object-regexp limit t))
diff --git a/lisp/org.el b/lisp/org.el
index aa86a3c..321eb71 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6091,13 +6091,13 @@ by a #."
(let ((case-fold-search t))
(if (re-search-forward org-target-link-regexp limit t)
(progn
- (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
- (add-text-properties (match-beginning 0) (match-end 0)
+ (org-remove-flyspell-overlays-in (match-beginning 1) (match-end 1))
+ (add-text-properties (match-beginning 1) (match-end 1)
(list 'mouse-face 'highlight
'keymap org-mouse-map
'help-echo "Radio target link"
'org-linked-text t))
- (org-rear-nonsticky-at (match-end 0))
+ (org-rear-nonsticky-at (match-end 1))
t)))))
(defun org-update-radio-target-regexp ()
@@ -6192,13 +6192,13 @@ targets."
The regular expression finds the targets also if there is a line break
between words."
(and targets
- (concat "\\("
+ (concat "\\(?:^\\|[^[:alnum:]]\\)\\("
(mapconcat
(lambda (x)
(replace-regexp-in-string " +" "\\s-+" (regexp-quote x) t t))
targets
"\\|")
- "\\)")))
+ "\\)\\(?:$\\|[^[:alnum:]]\\)")))
(defun org-activate-tags (limit)
(if (re-search-forward (org-re "^\\*+.*[
\t]\\(:[[:alnum:address@hidden:]+:\\)[ \r\n]") limit t)
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 4eccb69..0f81a79 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1336,12 +1336,11 @@ e^{i\\pi}+1=0
(should
(equal
"radio"
- (org-test-with-temp-text "A radio link"
+ (org-test-with-temp-text "<<<radio>>>A radio link"
+ (org-update-radio-target-regexp)
(org-element-property
:type
- (org-element-map
- (let ((org-target-link-regexp "radio")) (org-element-parse-buffer))
- 'link 'identity nil t)))))
+ (org-element-map (org-element-parse-buffer) 'link #'identity nil t)))))
;; Standard link.
;;
;; ... with description.
--
1.9.2
- [O] <<< >>> radio links should not match empty text, Daniel Clemente, 2014/04/01
- Re: [O] <<< >>> radio links should not match empty text, Nicolas Goaziou, 2014/04/02
- [O] radio links in middle of words. (was: Re: <<< >>> radio links should not match empty text), Daniel Clemente, 2014/04/02
- Re: [O] radio links in middle of words., Nicolas Goaziou, 2014/04/02
- Re: [O] radio links in middle of words., Daniel Clemente, 2014/04/04
- Re: [O] radio links in middle of words., Nicolas Goaziou, 2014/04/04
- Re: [O] radio links in middle of words., Daniel Clemente, 2014/04/10
- Re: [O] radio links in middle of words.,
Nicolas Goaziou <=
- Re: [O] radio links in middle of words., Bastien, 2014/04/11
- Re: [O] radio links in middle of words., Nicolas Goaziou, 2014/04/11
- Re: [O] radio links in middle of words., Daniel Clemente, 2014/04/15