string-to-int is a obsoleted function

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

diff --git a/jmax-bibtex.el b/jmax-bibtex.el
index 2216ee5250236cd42f9df160c9cd0666fc6858d1..066c406f4114eb3f3ee5338b418739caa24b4bc9 100644 (file)
--- a/jmax-bibtex.el
+++ b/jmax-bibtex.el
@@ -57,6 +57,7 @@
 (require 'key-chord)
 
 ;;; Code:
+;; * Custom variables
 (defgroup jmax-bibtex nil
   "Customization group for jmax-bibtex.")
 
@@ -76,7 +77,7 @@ I like \C-cj."
   :type 'string
   :group 'jmax-bibtex)
 
-
+;; * Journal abbreviations
 (defvar jmax-bibtex-journal-abbreviations
   '(("ACAT" "ACS Catalysis" "ACS Catal.")
     ("AM" "Acta Materialia" "Acta Mater.")
@@ -228,6 +229,7 @@ This is defined in `jmax-bibtex-journal-abbreviations'."
     (bibtex-fill-entry)
     (bibtex-clean-entry)))
 
+;; * Non-ascii character replacement
 ;; see https://github.com/fxcoudert/tools/blob/master/doi2bib for more replacements
 (defvar jmax-nonascii-latex-replacements
   '()
@@ -282,6 +284,7 @@ This is defined in `jmax-bibtex-journal-abbreviations'."
        ("—" . "-")
        ("‘" . "'")
        ("’" . "'")
+       ("’" . "'")
        ("“" . "\"")
        ("’" . "'")
        ("”" . "\"")))
@@ -301,7 +304,7 @@ This is defined in `jmax-bibtex-journal-abbreviations'."
 
 (add-hook 'org-ref-clean-bibtex-entry-hook 'jmax-replace-nonascii)
 
-
+;; * Title case transformations
 (defvar jmax-lower-case-words
   '("a" "an" "on" "and" "for"
     "the" "of" "in")
@@ -403,7 +406,7 @@ all the title entries in articles."
       (bibtex-clean-entry)
       (bibtex-fill-entry))))
 
-
+;; * Navigation in bibtex file
 (defun jmax-bibtex-next-entry (&optional n)
   "Jump to the beginning of the next bibtex entry.
 N is a prefix argument.  If it is numeric, jump that many entries
@@ -441,7 +444,7 @@ N is a prefix argument.  If it is numeric, jump that many entries back."
 ;; add to bibtex-mode-hook
 (add-hook 'bibtex-mode-hook 'jmax-bibtex-mode-keys)
 
-
+;; * Functions to act on an entry with a doi
 (defun jmax-bibtex-entry-doi ()
   "Get doi from entry at point."
   (interactive)
@@ -500,22 +503,24 @@ functions with a DOI argument."
   (org-ref-open-bibtex-pdf))
 
 
+;; * Hydra menus
+;; ** Hydra menu for bibtex entries
 ;; hydra menu for actions on bibtex entries
 (defhydra jmax-bibtex-hydra (:color blue)
    "
 _p_: Open pdf     _y_: Copy key               _n_: New entry     _w_: WOS
 _b_: Open url     _f_: Copy formatted entry   _o_: Copy entry    _c_: WOS citing
-_r_: Refile entry _k_: Add keywords           _d_: delete entry  _r_: WOS related
+_r_: Refile entry _k_: Add keywords           _d_: delete entry  _a_: WOS related
 _e_: Email entry  _K_: Edit keywords          _L_: clean entry   _P_: Pubmed
 _U_: Update entry _N_: Open notes             _R_: Crossref      _g_: Google Scholar
 _s_: Sort entry   _a_: Remove nonascii        _h_: helm-bibtex   _q_: quit
-_u_: Update field _f_: file funcs
+_u_: Update field _F_: file funcs
 "
    ("p" org-ref-open-bibtex-pdf)
    ("P" jmax-bibtex-pubmed)
    ("w" jmax-bibtex-wos)
    ("c" jmax-bibtex-wos-citing)
-   ("r" jmax-bibtex-wos-related)
+   ("a" jmax-bibtex-wos-related)
    ("R" jmax-bibtex-crossref)
    ("g" jmax-bibtex-google-scholar)
    ("n" jmax-bibtex-new-entry/body)
@@ -529,8 +534,8 @@ _u_: Update field _f_: file funcs
    ("K" (lambda ()
          (interactive)
          (org-ref-set-bibtex-keywords
-          (read-input "Keywords: "
-                      (bibtex-autokey-get-field "keywords"))
+          (read-string "Keywords: "
+                       (bibtex-autokey-get-field "keywords"))
           t)))
    ("b" org-ref-open-in-browser)
    ("r" (lambda () (interactive)
@@ -546,7 +551,7 @@ _u_: Update field _f_: file funcs
    ("e" email-bibtex-entry)
    ("U" (doi-utils-update-bibtex-entry-from-doi (jmax-bibtex-entry-doi)))
    ("u" doi-utils-update-field)
-   ("f" jmax-bibtex-file/body)
+   ("F" jmax-bibtex-file/body)
    ("h" helm-bibtex)
    ("a" jmax-replace-nonascii)
    ("s" org-ref-sort-bibtex-entry)
@@ -562,7 +567,7 @@ _u_: Update field _f_: file funcs
 (when jmax-bibtex-hydra-key-binding
   (global-set-key jmax-bibtex-hydra-key-binding 'jmax-bibtex-hydra/body))
 
-
+;; ** Hydra menu for new bibtex entries
 ;; A hydra for adding new bibtex entries.
 (defhydra jmax-bibtex-new-entry (:color blue)
   "New Bibtex entry:"
@@ -582,7 +587,7 @@ _u_: Update field _f_: file funcs
   ("q" nil "quit"))
 
 
-;; a hydra menu of functions to act on a bibtex file.
+;; ** Hydra menu of functions to act on a bibtex file.
 (defhydra jmax-bibtex-file (:color blue)
   "Bibtex file functions: "
   ("v" bibtex-validate "Validate entries")
@@ -592,6 +597,7 @@ _u_: Update field _f_: file funcs
   ("p" org-ref-build-full-bibliography "PDF bibliography"))
 
 
+;; * DEPRECATED bibtex menu
 (defvar jmax-bibtex-menu-funcs '()
  "Functions to run in doi menu.
 Each entry is a list of (key menu-name function).  The function
@@ -637,6 +643,7 @@ entry having a doi."
 
 (defalias 'jb 'jmax-bibtex)
 
+;; * The end
 (provide 'jmax-bibtex)
 
 ;;; jmax-bibtex.el ends here