X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=org-ref.el;h=6905efe9cad4855405032ff614f5ebd1553bafa8;hb=4b6fd70d429fd8d3268bd7ce05a84864af098c74;hp=9f02da885ecc678a09fdd4fd2b0d10c122fe3ca8;hpb=656caabced9e4d5b2b046f5229ecc6d1de4afc1f;p=org-ref.git diff --git a/org-ref.el b/org-ref.el index 9f02da8..6905efe 100644 --- a/org-ref.el +++ b/org-ref.el @@ -89,6 +89,12 @@ You should use full-paths for each file." :type 'string :group 'org-ref) +(defcustom org-ref-note-title-format + "** TODO %y - %t" + "String to format the title of a note. See the `org-ref-reftex-format-citation' docstring for the escape codes." + :type 'string + :group 'org-ref) + (defcustom org-ref-open-notes-function (lambda () (org-show-entry) @@ -442,10 +448,14 @@ environment, only %l is available." (if reftex-comment-citations reftex-cite-comment-format ""))) - ((= l ?a) (reftex-format-names - (reftex-get-bib-names "author" entry) - (or n 2))) - ((= l ?A) (car (reftex-get-bib-names "author" entry))) + ((= l ?a) (replace-regexp-in-string + "\n\\|\t\\|\s+" " " + (reftex-format-names + (reftex-get-bib-names "author" entry) + (or n 2)))) + ((= l ?A) (replace-regexp-in-string + "\n\\|\t\\|\s+" " " + (car (reftex-get-bib-names "author" entry)))) ((= l ?b) (org-ref-reftex-get-bib-field "booktitle" entry "in: %s")) ((= l ?B) (reftex-abbreviate-title (org-ref-reftex-get-bib-field "booktitle" entry "in: %s"))) @@ -458,8 +468,11 @@ environment, only %l is available." ((= l ?E) (car (reftex-get-bib-names "editor" entry))) ((= l ?h) (org-ref-reftex-get-bib-field "howpublished" entry)) ((= l ?i) (org-ref-reftex-get-bib-field "institution" entry)) - ((= l ?j) (org-ref-reftex-get-bib-field "journal" entry)) - ((= l ?k) (org-ref-reftex-get-bib-field "key" entry)) + ((= l ?j) (let ((jt (reftex-get-bib-field "journal" entry))) + (if (string= "" jt) + (reftex-get-bib-field "journaltitle" entry) + jt))) + ((= l ?k) (org-ref-reftex-get-bib-field "=key=" entry)) ((= l ?m) (org-ref-reftex-get-bib-field "month" entry)) ((= l ?n) (org-ref-reftex-get-bib-field "number" entry)) ((= l ?o) (org-ref-reftex-get-bib-field "organization" entry)) @@ -473,9 +486,13 @@ environment, only %l is available." ((= l ?U) (org-ref-reftex-get-bib-field "url" entry)) ((= l ?r) (org-ref-reftex-get-bib-field "address" entry)) ;; strip enclosing brackets from title if they are there - ((= l ?t) (org-ref-reftex-get-bib-field "title" entry)) - ((= l ?T) (reftex-abbreviate-title + ((= l ?t) (replace-regexp-in-string + "\n\\|\t\\|\s+" " " (org-ref-reftex-get-bib-field "title" entry))) + ((= l ?T) (reftex-abbreviate-title + ((replace-regexp-in-string + "\n\\|\t\\|\s+" " " + (org-ref-reftex-get-bib-field "title" entry))))) ((= l ?v) (org-ref-reftex-get-bib-field "volume" entry)) ((= l ?y) (org-ref-reftex-get-bib-field "year" entry))))) @@ -487,8 +504,6 @@ environment, only %l is available." (setq format (replace-match "%" t t format))) (while (string-match "[ ,.;:]*%<" format) (setq format (replace-match "" t t format))) - ;; also replace carriage returns, tabs, and multiple whitespaces - (setq format (replace-regexp-in-string "\n\\|\t\\|\s+" " " format)) format) (defun org-ref-get-bibtex-entry-citation (key) @@ -974,7 +989,7 @@ ARG does nothing." (org-ref-count-labels label)))) (lambda (keyword desc format) (cond - ((eq format 'html) (format "()" keyword)) + ((eq format 'html) (format "