X-Git-Url: https://git.donarmstrong.com/?p=org-ref.git;a=blobdiff_plain;f=org-ref.org;h=dbaf75be246913a0f9625ea94c7573a77ec7fb69;hp=04746fe9c643408730cdf07700fb42264061a121;hb=3044d6641e83953951a3a576abde2cc7e51dc553;hpb=828c6fdc6640c263e054136431ce74680970da11

diff --git a/org-ref.org b/org-ref.org
index 04746fe..dbaf75b 100644
--- a/org-ref.org
+++ b/org-ref.org
@@ -12,6 +12,19 @@ This document is an experiment at creating a literate program to provide similar
 4. Exportable links to LaTeX
 5. Utility functions for dealing with bibtex files and org-files
 
+1. Get minibuffer messages for the cite/ref/label link under point
+
+With helm integration (default) you can:
+
+1. C-c ] to insert a citation link
+  in helm-bibtex
+   - Enter to insert or append citation(s)
+   - C-u Enter to insert an alternative cite link
+   - C-u C-u Enter to replace the citation at point
+2. C-u C-c ] to insert a ref link with helm completion
+3. C-u C-u C-c ] to insert a label with completion
+4. M-x org-ref to get a helm completion buffer with link checks, utilities and export options
+
 ** Header
 #+BEGIN_SRC emacs-lisp :tangle org-ref.el
 ;;; org-ref.el --- setup bibliography, cite, ref and label org-mode links.
@@ -917,17 +930,17 @@ The label link provides a way to create labels in org-mode. We make it clickable
 #+BEGIN_SRC emacs-lisp  :tangle org-ref.el
 (defun org-ref-count-labels (label)
   "Counts number of matches for label in the document"
-  (+ (count-matches (format "label:%s\\b[^-:]" label) (point-min) (point-max) t)
+  (+ (count-matches (format "label:%s\\b[^-:]" label) (point-min) (point-max))
      ;; for tblname, it is not enough to get word boundary
      ;; tab-little and tab-little-2 match then.
-     (count-matches (format "^#\\+tblname:\\s-*%s\\b[^-:]" label) (point-min) (point-max) t)
-     (count-matches (format "\\label{%s}\\b" label) (point-min) (point-max) t)
+     (count-matches (format "^#\\+tblname:\\s-*%s\\b[^-:]" label) (point-min) (point-max))
+     (count-matches (format "\\label{%s}\\b" label) (point-min) (point-max))
      ;; this is the org-format #+label:
-     (count-matches (format "^#\\+label:\\s-*%s\\b[^-:]" label) (point-min) (point-max) t)
+     (count-matches (format "^#\\+label:\\s-*%s\\b[^-:]" label) (point-min) (point-max))
      (let ((custom-id-count 0))
        (org-map-entries
 	(lambda ()
-	  (when (string= label  (org-entry-get (point) "CUSTOM_ID"))
+	  (when (string= label (org-entry-get (point) "CUSTOM_ID"))
 	    (setq custom-id-count (+ 1 custom-id-count)))))
        custom-id-count)))
 
@@ -935,7 +948,14 @@ The label link provides a way to create labels in org-mode. We make it clickable
  "label"
  (lambda (label)
    "on clicking count the number of label tags used in the buffer. A number greater than one means multiple labels!"
-   (message (format "%s occurences" (org-ref-count-labels label))))
+   (let ((count (org-ref-count-labels label)))
+   (message (format "%s occurence%s"
+		    count
+		    (if (or (= count 0)
+			      (> count 1))
+			"s"
+		      ""))
+		    (org-ref-count-labels label))))
  (lambda (keyword desc format)
    (cond
     ((eq format 'html) (format "(<label>%s</label>)" path))
@@ -3069,13 +3089,6 @@ To get a lighter weight message about the label, ref and cite links, we define a
 			(progn
 			  (forward-line 4)
 			  (point)))))
-
-      ;; maybe we have a CUSTOM-ID
-      (org-map-entries
-       (lambda () (when (string=
-			 label
-			 (org-entry-get (point) "CUSTOM_ID"))
-		    (throw 'result (org-get-heading)))))
       (beep)
       (throw 'result "!!! NO CONTEXT FOUND !!!"))))
 
@@ -3114,6 +3127,12 @@ To get a lighter weight message about the label, ref and cite links, we define a
 				(> count 1))
 			"s")))))
 
+	 ((string= type "custom-id")
+	  (save-excursion
+	    (org-open-link-from-string
+	     (format "[[#%s]]" (org-element-property :path object)))
+	    (message "%s" (org-get-heading))))
+
          ;; check if the bibliography files exist.
 	 ((string= type "bibliography")
 	  (let* ((bibfile)
@@ -3122,13 +3141,16 @@ To get a lighter weight message about the label, ref and cite links, we define a
 		 (link-string (org-element-property :path object))
 		 (link-string-beginning)
 		 (link-string-end))
-
 	    (save-excursion
 	      (goto-char (org-element-property :begin object))
 	      (search-forward link-string nil nil 1)
 	      (setq link-string-beginning (match-beginning 0))
 	      (setq link-string-end (match-end 0)))
 
+	     ;; make sure we are in link and not before the :
+	    (when (> link-string-beginning (point))
+	      (goto-char link-string-beginning))
+
 	    ;; now if we have comma separated bibliographies
 	    ;; we find the one clicked on. we want to
 	    ;; search forward to next comma from point
@@ -3136,6 +3158,7 @@ To get a lighter weight message about the label, ref and cite links, we define a
 	      (if (search-forward "," link-string-end 1 1)
 		  (setq key-end (- (match-end 0) 1)) ; we found a match
 		(setq key-end (point)))) ; no comma found so take the point
+
 	    ;; and backward to previous comma from point
 	    (save-excursion
 	      (if (search-backward "," link-string-beginning 1 1)