small layout changes, fixed bug in bibliographystyle link

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

diff --git a/org-ref.el b/org-ref.el
index aec69c79a3bbfe9390018725ddcebde8034919af..6c7c4377eed69fe353c0599e6379e011c3bf3841 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
@@ -540,8 +539,8 @@ 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)))
+  (format "<li><a id=\"%s\">[%s] %s</a></li>"
+         key key (org-ref-get-bibtex-entry-citation key)))
 
 (defun org-ref-get-html-bibliography ()
   "Create an html bibliography when there are keys."
@@ -626,6 +625,7 @@ Format according to the type in `org-ref-bibliography-entry-format'."
                       (setq link-string-beginning (match-beginning 0))
                       (setq link-string-end (match-end 0)))
 
+                    ;; Make sure point is in the link-path.
                     (if (< cp link-string-beginning)
                         (goto-char link-string-beginning))
                     ;; We set the reftex-default-bibliography
@@ -726,20 +726,11 @@ Format according to the type in `org-ref-bibliography-entry-format'."
                      ((eq format 'html) (org-ref-get-html-bibliography))
                      ((eq format 'latex)
                       ;; write out the latex bibliography command
-
-;                     (format "{\\setbox0\\vbox{\\bibliography{%s}}}"
-;                             (replace-regexp-in-string  "\\.bib" "" (mapconcat 'identity
-;                                                                               (mapcar 'expand-file-name
-;                                                                                       (split-string keyword ","))
-;                                                                               ",")))
-
                       (format "\\nobibliography{%s}"
                               (replace-regexp-in-string  "\\.bib" "" (mapconcat 'identity
                                                                                 (mapcar 'expand-file-name
                                                                                         (split-string keyword ","))
-                                                                                ",")))
-
-                      ))))
+                                                                                ",")))))))
 
 (org-add-link-type "printbibliography"
                   (lambda (arg) (message "Nothing implemented for clicking here."))
@@ -749,8 +740,7 @@ Format according to the type in `org-ref-bibliography-entry-format'."
                       ((eq format 'html) (org-ref-get-html-bibliography))
                      ((eq format 'latex)
                       ;; write out the biblatex bibliography command
-                      "\\printbibliography"))
-))
+                      "\\printbibliography"))))
 
 (org-add-link-type "bibliographystyle"
                   (lambda (arg) (message "Nothing implemented for clicking here."))
@@ -758,7 +748,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)))))
+                      (format "\\bibliographystyle{%s}" keyword))
+                     ;; Other styles should not have an output for this
+                     (t
+                      ""))))
 
 
 (defun org-bibliographystyle-complete-link (&optional arg)
@@ -2100,7 +2093,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)
@@ -2114,14 +2106,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 ()
@@ -3072,7 +3063,7 @@ first key that partially matches.  This version avoids that."
 User is prompted for tags.  This function is called from `helm-bibtex'.
 Argument CANDIDATES helm candidates."
   (message "")
-  (let ((keywords (read-input "Keywords (comma separated): ")))
+  (let ((keywords (read-string "Keywords (comma separated): ")))
     (loop for key in (helm-marked-candidates)
          do
          (save-window-excursion
@@ -3110,11 +3101,13 @@ In the helm-bibtex buffer, C-u will give you a helm menu to select a new link ty
 C-u C-u will change the key at point to the selected keys."
   (let* ((object (org-element-context))
         (last-char (save-excursion
-                     (goto-char (org-element-property :end object))
-                     (backward-char)
-                     (if (looking-at " ")
-                         " "
-                       ""))))
+                     (when (org-element-property :end object)
+                       (goto-char (org-element-property :end object))
+                       (unless (bobp)
+                         (backward-char))
+                       (if (looking-at " ")
+                           " "
+                         "")))))
     (cond
      ;; case where we are in a link
      ((and (equal (org-element-type object) 'link)
@@ -3148,7 +3141,7 @@ C-u C-u will change the key at point to the selected keys."
      ;; We are next to a link, and we want to append
      ;; next to a link means one character back is on a link.
      ((save-excursion
-       (backward-char)
+       (unless (bobp) (backward-char))
        (and (equal (org-element-type (org-element-context)) 'link)
             (-contains?
              org-ref-cite-types