[nongnu] elpa/adoc-mode 601de95b01 062/199: modified regexp for xref for better find

[ELPA Syncer]

branch: elpa/adoc-mode
commit 601de95b01aff45ee01b5a875cc39b9aa7d03f7c
Author: Florian Kaufmann <sensor...@gmail.com>
Commit: Florian Kaufmann <sensor...@gmail.com>

    modified regexp for xref for better find
---
 adoc-mode-test.el |  2 +-
 adoc-mode.el      | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/adoc-mode-test.el b/adoc-mode-test.el
index c31212263b..55010d9e1a 100644
--- a/adoc-mode-test.el
+++ b/adoc-mode-test.el
@@ -549,7 +549,7 @@
   (unwind-protect
       (progn
        (set-buffer (get-buffer-create "adoc-test")) 
-       (insert "lorem ipsum <<foo,bla\nbli>> dolor")
+       (insert "lorem <<bogous1,caption>> ipsum <<foo,bla\nbli>> dolor 
<<bogous2>>")
        (re-search-backward "bli") ; move point within ref
        (should (equal (adoc-xref-id-at-point) "foo")))
     (kill-buffer "adoc-test")))
diff --git a/adoc-mode.el b/adoc-mode.el
index b50b786993..ab56976e83 100644
--- a/adoc-mode.el
+++ b/adoc-mode.el
@@ -670,6 +670,12 @@ Subgroups:
 3 attribute list, exclusive brackets []"
   (concat "^\\(" (or cmd-name "[a-zA-Z0-9_]+") "\\)::\\([^ 
\t\n]*?\\)\\[\\(.*?\\)\\][ \t]*$"))
 
+
+;; ?P<id>[\w\-_]+
+(defun adoc-re-id ()
+  "Returns a regexp matching an id used by anchors/xrefs"
+  "\\(?:[-a-zA-Z0-9_]+\\)")
+
 (defun adoc-re-anchor (&optional type id)
   "Returns a regexp matching an anchor.
 
@@ -682,7 +688,7 @@ this id. If ID is nil, the regexp matches any anchor."
    ((eq type 'block-id)
     ;; ^\[\[(?P<id>[\w\-_]+)(,(?P<reftext>.*?))?\]\]$
     (concat "^\\[\\["
-           "\\(" (if id (regexp-quote id) "[-a-zA-Z0-9_]+") "\\)"
+           "\\(" (if id (regexp-quote id) (adoc-re-id)) "\\)"
            "\\(?:,?\\(.*?\\)\\)?"
            "\\]\\][ \t]*$"))
 
@@ -710,23 +716,31 @@ this id. If ID is nil, the regexp matches any anchor."
    (t
     (error "Unknown type"))))
 
-(defun adoc-re-xref (&optional type)
-  "Returns a regexp matching a reference"
+(defun adoc-re-xref (&optional type for-kw)
+  "Returns a regexp matching a reference.
+
+If TYPE is nil, any type is matched. If FOR-KW is true, the
+regexp is intendet for a font lock keyword, which has to make
+further tests to find a proper xref."
   (cond
    ((eq type 'inline-special-with-caption)
     ;; (?su)[\\]?&lt;&lt;(?P<attrlist>[\w"].*?)&gt;&gt;=xref2
-    "\\(<<\\)\\([a-zA-Z0-9\"].*?\\)\\(,\\)\\(.*?\\(?:\n.*?\\)??\\)\\(>>\\)")
+    (if for-kw
+       "\\(<<\\)\\([a-zA-Z0-9\"].*?\\)\\(,\\)\\(.*?\\(?:\n.*?\\)??\\)\\(>>\\)"
+      (concat "\\(<<\\)\\(" (adoc-re-id) "[ 
\t\n]*\\)\\(,\\)\\([^>\n]*?\\(?:\n[^>\n]*?\\)??\\)\\(>>\\)")))
 
    ((eq type 'inline-special-no-caption)
     ;; asciidoc.conf uses the same regexp as for without caption
-    "\\(<<\\)\\([a-zA-Z0-9\"].*?\\(?:\n.*?\\)??\\)\\(>>\\)")
+    (if for-kw
+       "\\(<<\\)\\([a-zA-Z0-9\"].*?\\(?:\n.*?\\)??\\)\\(>>\\)"
+      (concat "\\(<<\\)\\(" (adoc-re-id) "[ \t\n]*\\)\\(>>\\)")))
 
    ((eq type 'inline-general-macro)
     (adoc-re-inline-macro "xref"))
 
    ((null type)
     (mapconcat
-     (lambda (x) (adoc-re-xref x))
+     (lambda (x) (adoc-re-xref x for-kw))
      '(inline-special-with-caption inline-special-no-caption 
inline-general-macro)
      "\\|"))
 
@@ -1645,14 +1659,14 @@ When LITERAL-P is non-nil, the contained text is 
literal text."
 
    ;; see also xref: within inline macros
    ;; reference with own/explicit caption
-   (list (adoc-re-xref 'inline-special-with-caption)
+   (list (adoc-re-xref 'inline-special-with-caption t)
          '(1 adoc-hide-delimiter)       ; <<
          '(2 adoc-delimiter)            ; anchor-id
          '(3 adoc-hide-delimiter)       ; ,
          '(4 adoc-reference)            ; link text
          '(5 adoc-hide-delimiter))      ; >>
    ;; reference without caption
-   (list (adoc-re-xref 'inline-special-no-caption)
+   (list (adoc-re-xref 'inline-special-no-caption t)
          '(1 adoc-hide-delimiter)       ; <<
          '(2 adoc-reference)            ; link text = anchor id
          '(3 adoc-hide-delimiter))      ; >>