remove empty links and doi

[org-ref.git] / org-ref.el

diff --git a/org-ref.el b/org-ref.el
index 7b2c096c0fd08daa65fb5ca0179e12bbf0567e37..cf279584d0a22b7fb1a085a03ffe6061cd2c2333 100644 (file)
--- a/org-ref.el
+++ b/org-ref.el
@@ -423,7 +423,6 @@ Beware that all this only works with BibTeX database files.  When
 citations are made from the \bibitems in an explicit thebibliography
 environment, only %l is available."
   ;; Format a citation from the info in the BibTeX ENTRY
-
   (unless (stringp format) (setq format "\\cite{%l}"))
 
   (if (and reftex-comment-citations
@@ -511,10 +510,14 @@ Format according to the type in `org-ref-bibliography-entry-format'."
       (insert-file-contents file)
       (bibtex-search-entry key nil 0)
       (setq bibtex-entry (bibtex-parse-entry))
+      ;; downcase field names so they work in the format-citation code
+      (dolist (cons-cell bibtex-entry)
+       (setf (car cons-cell) (downcase (car cons-cell))))
       (setq entry-type (downcase (cdr (assoc "=type=" bibtex-entry))))
       (setq format (cdr (assoc entry-type org-ref-bibliography-entry-format)))
       (if format
          (setq entry  (org-ref-reftex-format-citation bibtex-entry format))
+       ;; if no format, we use the bibtex entry itself as a fallback
        (save-restriction
          (bibtex-narrow-to-entry)
          (setq entry (buffer-string)))))
@@ -540,8 +543,19 @@ Format according to the type in `org-ref-bibliography-entry-format'."
 
 (defun org-ref-get-bibtex-entry-html (key)
   "Return an html string for the bibliography entry corresponding to KEY."
-
-  (format "<li><a id=\"%s\">[%s] %s</a></li>" key key (org-ref-get-bibtex-entry-citation key)))
+  (let ((output))
+    (setq output (org-ref-get-bibtex-entry-citation key))
+    ;; unescape the &
+    (setq output (replace-regexp-in-string "\\\\&" "&" output))
+    ;; hack to replace {} around text
+    (setq output (replace-regexp-in-string " {\\(.*\\)} " " \\1 " output))
+    ;; get rid of empty parens
+    (setq output (replace-regexp-in-string "()" "" output))
+    ;; get rid of empty link and doi
+    (setq output (replace-regexp-in-string " <a href=\"\">link</a>\\." "" output))
+    (setq output (replace-regexp-in-string " <a href=\"http://dx\\.doi\\.org/\">doi</a>\\." "" output))
+    (format "<li><a id=\"%s\">[%s] %s</a></li>"
+           key key output)))
 
 (defun org-ref-get-html-bibliography ()
   "Create an html bibliography when there are keys."
@@ -749,10 +763,10 @@ Format according to the type in `org-ref-bibliography-entry-format'."
                     (cond
                      ((eq format 'latex)
                       ;; write out the latex bibliography command
-                      (format "\\bibliographystyle{%s}" keyword)))
-                    ;; Other styles should not have an output for this
-                    (t
-                     "")))
+                      (format "\\bibliographystyle{%s}" keyword))
+                     ;; Other styles should not have an output for this
+                     (t
+                      ""))))
 
 
 (defun org-bibliographystyle-complete-link (&optional arg)
@@ -2094,7 +2108,6 @@ This assumes you are in an article."
 
 (defun org-ref-bib-html-citation ()
   "From a bibtex entry, create and return a simple citation with html links."
-
   (bibtex-beginning-of-entry)
   (let* ((cb (current-buffer))
         (bibtex-expand-strings t)
@@ -2108,14 +2121,13 @@ This assumes you are in an article."
         (volume (reftex-get-bib-field "volume" entry))
         (pages (reftex-get-bib-field "pages" entry))
         (doi (reftex-get-bib-field "doi" entry))
-        (url (reftex-get-bib-field "url" entry))
-        )
+        (url (reftex-get-bib-field "url" entry)))
     ;;authors, "title", Journal, vol(iss):pages (year).
     (concat (format "%s, \"%s\", %s, %s:%s (%s)."
                    author title journal  volume pages year)
            (when url (format " <a href=\"%s\">link</a>" url))
-           (when doi (format " <a href=\"http://dx.doi.org/%s\">doi</a>" doi)))
-    ))
+           (when doi
+             (format " <a href=\"http://dx.doi.org/%s\">doi</a>" doi)))))
 
 ;; ** Open pdf in bibtex entry
 (defun org-ref-open-bibtex-pdf ()