From: Ihor Radchenko <yantar92@gmail.com>
To: Kyle Meyer <kyle@kyleam.com>
Cc: emacs-orgmode@gnu.org
Subject: [PATCH] Re: Bug: Plain https links with brackets are not recognised [9.4.4 (release_9.4.4-625-g763c7a @ /home/yantar92/.emacs.d/straight/build/org/)]
Date: Sat, 13 Mar 2021 13:21:29 +0800 [thread overview]
Message-ID: <87k0qbk4rq.fsf@localhost> (raw)
In-Reply-To: <87sg4zu47p.fsf@kyleam.com>
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
Kyle Meyer <kyle@kyleam.com> writes:
> This case was discussed at
> <https://orgmode.org/list/5faf0bd7-b114-9723-773e-7f3da16604a0@grinta.net/T/#u>.
> There's mention of an improved regexp that might be worth trying.
The improved regexp appears to work for me. I tried my best to transform
the regexp provided in the link to rx notation. The patch is attached.
Best,
Ihor
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Improve-org-link-plain-re.patch --]
[-- Type: text/x-diff, Size: 2368 bytes --]
From 79eaa3b5b71f2aba02d4f17b860f67a6a77255fc Mon Sep 17 00:00:00 2001
From: Ihor Radchenko <yantar92@gmail.com>
Date: Sat, 13 Mar 2021 13:16:06 +0800
Subject: [PATCH] Improve org-link-plain-re
* lisp/ol.el (org-link-make-regexps): Allow URLs with up to two levels
of nested brackets. Now, URLs like [1] can be matched. The new
regexp is taken from [2].
[1] https://doi.org/10.1016/0160-791x(79)90023-x
[2] https://daringfireball.net/2010/07/improved_regex_for_matching_urls
---
lisp/ol.el | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/lisp/ol.el b/lisp/ol.el
index 8b9755b51..0e166de38 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -829,15 +829,27 @@ This should be called after the variable `org-link-parameters' has changed."
(format "<%s:\\([^>\n]*\\(?:\n[ \t]*[^> \t\n][^>\n]*\\)*\\)>"
types-re)
org-link-plain-re
- (concat
- "\\<" types-re ":"
- "\\([^][ \t\n()<>]+\\(?:([[:word:]0-9_]+)\\|\\([^[:punct:] \t\n]\\|/\\)\\)\\)")
- ;; "\\([^]\t\n\r<>() ]+[^]\t\n\r<>,.;() ]\\)")
- org-link-bracket-re
- (rx (seq "[["
- ;; URI part: match group 1.
- (group
- (one-or-more
+ (let ((non-space-bracket "[^][ \t\n()<>]+"))
+ ;; Heiristics for an URL link. Source:
+ ;; https://daringfireball.net/2010/07/improved_regex_for_matching_urls
+ (rx-to-string
+ `(seq (regexp "\\<")
+ (regexp ,types-re)
+ ":"
+ (1+ (or (regex ,non-space-bracket)
+ (seq "("
+ (* (or (regex ,non-space-bracket)
+ (seq "("
+ (regex ,non-space-bracket)
+ ")")))
+ ")")))
+ (or (seq "("
+ (* (or (regex ,non-space-bracket)
+ (seq "("
+ (regex ,non-space-bracket)
+ ")")))
+ ")")
+ (regexp "\\([^[:punct:] \t\n]\\|/\\)")))))
(or (not (any "[]\\"))
(and "\\" (zero-or-more "\\\\") (any "[]"))
(and (one-or-more "\\") (not (any "[]"))))))
--
2.26.2
next prev parent reply other threads:[~2021-03-13 5:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-13 2:56 Bug: Plain https links with brackets are not recognised [9.4.4 (release_9.4.4-625-g763c7a @ /home/yantar92/.emacs.d/straight/build/org/)] Ihor Radchenko
2021-03-13 3:23 ` Kyle Meyer
2021-03-13 5:21 ` Ihor Radchenko [this message]
2021-03-13 5:24 ` [PATCH] " Ihor Radchenko
2021-03-15 11:54 ` Maxim Nikulin
2021-03-16 12:35 ` Ihor Radchenko
2021-03-17 14:59 ` Maxim Nikulin
2021-03-19 15:07 ` Ihor Radchenko
2021-03-24 12:31 ` Maxim Nikulin
2021-03-24 14:11 ` Ihor Radchenko
2021-03-19 12:10 ` Maxim Nikulin
2021-03-19 15:40 ` Ihor Radchenko
2021-03-24 12:51 ` Nicolas Goaziou
2021-03-24 13:10 ` Ihor Radchenko
2021-03-24 14:13 ` Ihor Radchenko
2021-05-15 8:34 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k0qbk4rq.fsf@localhost \
--to=yantar92@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=kyle@kyleam.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).