X-Git-Url: https://git.donarmstrong.com/?p=org-ref.git;a=blobdiff_plain;f=org-ref.org;h=e963a94ddb10dd6944407a00aac6e6a4082f70be;hp=c9518c8865c0a02181fc9e67e9896a94826880c9;hb=0de59acd7db2b3b31967cbd78dceb1ef41cab1b1;hpb=b818d84987ee230c0d8186ddcf7ac4c5c836bcdf

diff --git a/org-ref.org b/org-ref.org
index c9518c8..e963a94 100644
--- a/org-ref.org
+++ b/org-ref.org
@@ -1944,7 +1944,25 @@ We will want to generate formatting functions for each citation type. The reason
 	 ;; bibtex format
        (concat "\\" ,type (when desc (org-ref-format-citation-description desc)) "{"
 	       (mapconcat (lambda (key) key) (org-ref-split-and-strip-string keyword) ",")
-	       "}"))))))
+	       "}")))
+      ;; for markdown we generate pandoc citations
+      ((eq format 'md)
+       (cond
+	(desc  ;; pre and or post text
+	 (let* ((text (split-string desc "::"))
+		(pre (car text))
+		(post (cadr text)))
+	   (concat
+	    (format "[@%s," keyword)
+	    (when pre (format " %s" pre))
+	    (when post (format ", %s" post))
+	    "]")))
+	(t
+	 (format "[%s]"
+		 (mapconcat
+		  (lambda (key) (concat "@" key))
+		  (org-ref-split-and-strip-string keyword)
+		  "; "))))))))
 #+END_SRC
 
 
@@ -2667,46 +2685,18 @@ Here we develop a similar idea, but instead of an org-buffer with links, we crea
     (org-element-map (org-element-parse-buffer) 'link
       (lambda (link)
 	(let ((plist (nth 1 link)))
-	  (when (-contains? org-ref-cite-types (plist-get plist ':type))
-	    (dolist (key (org-ref-split-and-strip-string (plist-get plist ':path)) )
+	  (when (-contains? org-ref-cite-types (plist-get plist :type))
+	    (dolist (key (org-ref-split-and-strip-string (plist-get plist :path)) )
 	      (when (not (index key bibtex-keys))
-		(goto-char (plist-get plist ':begin))
+		(goto-char (plist-get plist :begin))
 		(re-search-forward key)
 		(push (cons key (point-marker)) bad-citations)))
-	      ))))
+	    )))
+      ;; add with-affiliates to get cites in caption
+      nil nil nil t)
     (goto-char cp)
     bad-citations))
 
-;; It seems I forgot I already defined this earlier!
-;; (defun org-ref-get-labels ()
-;;   "Returns a list of known labels in the org document. These include label links, latex labels, label tags, and table names. The list contains all labels, not just unique ones.
-;; "
-;;   (let ((cp (point))
-;;	(labels '()))
-;;     (goto-char (point-min))
-;;     (while (re-search-forward "[^#+]label:\\(.*\\)\\s-" nil t)
-;;       (push  (match-string 1) labels))
-
-;;     (goto-char (point-min))
-;;     (while (re-search-forward "\\label{\\(.*\\)}\\s-?" nil t)
-;;       (push (match-string 1) labels))
-
-;;     (goto-char (point-min))
-;;     (while (re-search-forward "^#\\+label:\\s-*\\(.*\\)" nil t)
-;;       (push (match-string 1) labels))
-
-;;     (goto-char (point-min))
-;;     (while (re-search-forward "^#\\+tblname:\\s-*\\(.*\\)" nil t)
-;;       (push (match-string 1) labels))
-;;     ;; check for CUSTOM_ID
-;;     (org-map-entries
-;;      (lambda ()
-;;        (when (org-entry-get (point) "CUSTOM_ID")
-;;	 (push (org-entry-get (point) "CUSTOM_ID") labels))))
-;;     ;; return to original place
-;;     (goto-char cp)
-;;     labels))
-
 
 (defun org-ref-bad-ref-candidates ()
   "Returns a list of conses (ref . marker) where ref is a ref link that does not point to anything (i.e. a label)."
@@ -3348,8 +3338,7 @@ With two prefix args, insert a label link."
        helm-bibtex-fallback-options))
 
 (setq helm-bibtex-fallback-options
-      (-insert-at 1 '("Open Web of Science" . (lambda () (browse-url "http://apps.webofknowledge.com")))
-		  helm-bibtex-fallback-options))
+      (-insert-at 1 '("WOS" . "http://gateway.webofknowledge.com/gateway/Gateway.cgi?topic=%s&GWVersion=2&SrcApp=WEB&SrcAuth=HSB&DestApp=UA&DestLinkType=GeneralSearchSummary") helm-bibtex-fallback-options))
 #+END_SRC
 
 ** A helm click menu