Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New caching and formatting functionality #634

Merged
merged 79 commits into from
Jul 4, 2022
Merged
Show file tree
Hide file tree
Changes from 77 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
fee49a8
Small tweaks to the Eldev and GitHub CI configuration
roshanshariff Jun 19, 2022
bdbd046
refactor: split caches, make API key-focused
bdarcus Jun 7, 2022
cc498e3
Add citar--bibliography-files
bdarcus Jun 10, 2022
4960ed9
Add citar-prefilter-entries
bdarcus Jun 10, 2022
59d067c
Add implementation of cache and new formatting functions.
roshanshariff Jun 10, 2022
5821b67
Move cache and formatting functions into new files
roshanshariff Jun 13, 2022
39ea73a
Remove citar-get-data-entries and citar-all-keys.
roshanshariff Jun 13, 2022
7b0c825
Update CONTRIBUTING.org
bdarcus Jun 14, 2022
40fae07
Update citar-capf.el for new API; still doesn't work for some reason.
roshanshariff Jun 14, 2022
2af3c95
Fix `citar-open-entry`
roshanshariff Jun 14, 2022
04f7e77
Fix missing closing paren
roshanshariff Jun 14, 2022
64abfdd
Improve the performance of formatting functions.
roshanshariff Jun 14, 2022
2d4e19b
Use `map-merge` to merge hash tables
roshanshariff Jun 17, 2022
86b1dba
WIP: Speed up has-file indicator
roshanshariff Jun 18, 2022
f6a0d96
Fix compilation errors, indenting
bdarcus Jun 23, 2022
62a6c49
Small tweaks to the Eldev and GitHub CI configuration
roshanshariff Jun 19, 2022
e4c79ad
refactor: split caches, make API key-focused
bdarcus Jun 7, 2022
a10bfa3
Add citar--bibliography-files
bdarcus Jun 10, 2022
9e432fd
Add citar-prefilter-entries
bdarcus Jun 10, 2022
6b6c9ae
Add implementation of cache and new formatting functions.
roshanshariff Jun 10, 2022
ca1b8bf
Move cache and formatting functions into new files
roshanshariff Jun 13, 2022
93c8452
Remove citar-get-data-entries and citar-all-keys.
roshanshariff Jun 13, 2022
9581206
Update CONTRIBUTING.org
bdarcus Jun 14, 2022
f9393df
Update citar-capf.el for new API; still doesn't work for some reason.
roshanshariff Jun 14, 2022
4ab1618
Fix `citar-open-entry`
roshanshariff Jun 14, 2022
073b8e8
Fix missing closing paren
roshanshariff Jun 14, 2022
243984c
Improve the performance of formatting functions.
roshanshariff Jun 14, 2022
da382a8
Use `map-merge` to merge hash tables
roshanshariff Jun 17, 2022
86eca4f
Refactor citar-key-finder
bdarcus Jun 23, 2022
8f58ad8
Speed up has-file indicator
roshanshariff Jun 18, 2022
3ae93f9
Move embark code to separate package
bdarcus Jun 23, 2022
c62e0cb
Make get-entry and get-value public (again)
bdarcus Jun 23, 2022
82dd0ca
Remove embark declarations
bdarcus Jun 23, 2022
0e618ca
declare embark variable
bdarcus Jun 23, 2022
2a22fcc
Move Embark integration to `citar-embark.el`
roshanshariff Jun 21, 2022
bd35c23
Small docstring tweaks; improve file outline headings
roshanshariff Jun 23, 2022
05418ae
Remove embark maps from main file
bdarcus Jun 23, 2022
10bfc0e
Update file and note handling
roshanshariff Jun 24, 2022
5946064
Finish implementing new API and modify other modules to match.
roshanshariff Jun 24, 2022
4a84e66
Fix filter handling in citar-select-refs
roshanshariff Jun 24, 2022
d615ae4
Mask out citar-filenotify.el in Eldev
roshanshariff Jun 24, 2022
6332748
Add `citar-key-at-point` and `citar-citation-at-point` functions.
roshanshariff Jun 24, 2022
55bc450
Update docstrings for new API; add missing docstrings.
roshanshariff Jun 24, 2022
d75732d
Manually merge changes by @bdarcus.
roshanshariff Jun 24, 2022
9023def
Merge remote-tracking branch 'fork/cache--api-refactor' into cache--a…
roshanshariff Jun 24, 2022
4093b7a
Fix docstring quoting style.
roshanshariff Jun 24, 2022
2938db1
Make `citar-clean-string` and `citar-shorten-names` private.
roshanshariff Jun 24, 2022
227abce
Update test script
bdarcus Jun 24, 2022
bc24dec
Update README to include citar-embark
bdarcus Jun 24, 2022
68636a7
Simplify open-note
bdarcus Jun 26, 2022
6f1ca21
Remove dependency on crm
roshanshariff Jun 26, 2022
4a1325e
Correct docstrings in citar.el.
roshanshariff Jun 26, 2022
c5e4455
citar-embark: Mark additional actions as multi-target
roshanshariff Jun 26, 2022
f8071fc
Set citar-library-file-extensions
bdarcus Jun 26, 2022
b7e4448
Replace cl-seq functions with seq equivalents.
roshanshariff Jun 28, 2022
5104ba6
Improve file parsing.
roshanshariff Jun 28, 2022
69ca063
Ignore CI errors on emacs 29 and don't fail on package-lint warnings
roshanshariff Jun 28, 2022
1ef0160
Revert removal of entry from create-note-function
bdarcus Jun 28, 2022
66f7b58
Add back entry to function call
bdarcus Jun 30, 2022
188f7cf
Add citar-cache-refresh
bdarcus Jul 1, 2022
40bc6bc
Refactor citar--select-resource
bdarcus Jul 1, 2022
e6f0b06
Change default note category to citar-note-file
bdarcus Jul 2, 2022
3d0299f
Add new notes defcustoms
bdarcus Jul 2, 2022
2e799f7
Modify embark config
bdarcus Jul 3, 2022
399bac8
Temporarily remove citar-filenotify.el
bdarcus Jul 3, 2022
1cb5936
Fix the citar-note-sources defcustom syntax
bdarcus Jul 3, 2022
df1b24e
Fix note config, add access function
bdarcus Jul 3, 2022
412f979
Remove legacy notes defcustoms
bdarcus Jul 3, 2022
cc22f01
Update citar-open-notes
bdarcus Jul 3, 2022
00b3279
Move citar-open-links
bdarcus Jul 3, 2022
a2679ba
Use note plist for citar--open-notes
bdarcus Jul 3, 2022
27e74c8
Remove citar--open-notes
bdarcus Jul 3, 2022
aa05050
More note tweaks
bdarcus Jul 3, 2022
27e7a08
README tweaks
bdarcus Jul 4, 2022
ec6856d
Improve bibliography cache invalidation logic.
roshanshariff Jun 26, 2022
7306769
Fix indentation to make elisp-lint happy.
roshanshariff Jul 4, 2022
57f2dbe
Remove rebuild hook; no longer needed
bdarcus Jul 4, 2022
521e7dc
Rename get-note-config
bdarcus Jul 4, 2022
a3bee3c
README tweaks
bdarcus Jul 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .dir-locals.el
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
((emacs-lisp-mode
(fill-column . 110)
(indent-tabs-mode . nil)
(elisp-lint-indent-specs . ((describe . 1)
(it . 1)
(thread-first . 0)
(cl-flet . 1)
(sentence-end-double-space . nil)
(cl-flet* . 1)))))
;;; Directory Local Variables
;;; For more information see (info "(emacs) Directory Variables")

((emacs-lisp-mode . ((sentence-end-double-space . nil)
(fill-column . 110)
(indent-tabs-mode . nil)
(elisp-lint-indent-specs . ((describe . 1)
(it . 1)
(thread-first . 0)
(cl-flet . 1)
(cl-flet* . 1))))))
7 changes: 6 additions & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
jobs:
check:
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.emacs_version == 'snapshot' }}
strategy:
fail-fast: false
matrix:
Expand All @@ -28,6 +29,9 @@ jobs:
- compile
- test
- lint
exclude:
- emacs_version: snapshot
action: compile
steps:
- name: Set up Emacs ${{matrix.emacs_version}}
uses: purcell/setup-emacs@master
Expand Down Expand Up @@ -63,5 +67,6 @@ jobs:
eldev --color lint re
- name: Lint package metadata
if: ${{ matrix.action == 'lint' }}
continue-on-error: true
run: |
eldev --color lint package || true
eldev --color lint package
45 changes: 31 additions & 14 deletions CONTRIBUTING.org
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,49 @@

If you would like to contribute, details:

- For more signifiant potential changes, file an issue first to get feedback on the basic idea.
- For more significant potential changes, file an issue first to get feedback on the basic idea.
- If you do submit a PR, follow the [[https://github.com/bbatsov/emacs-lisp-style-guide][elisp style guide]], and [[https://cbea.ms/git-commit/][these suggestions]] on git commit messages.
- For working on lists and such, we primarily use the =seq= functions, and occassionally ~dolist~.

** Basic Architecture

Citar uses a cache, which stores two hash tables for each bibliography file:

- entries :: as returned by =parsebib-parse=, keys are citekeys, values are alists of entry fields
- pre-formatted :: values are partially-formatted completion strings

The =citar--ref-completion-table= function returns a hash table from the bibliographic cache, and ~citar--get-entry~ and ~-citar--get-value~ provide access to those data.
Most user-accessible citar functions take an argument ~key~ or ~keys~.
Some functions also take an ~entry~ argument, and ~citar--get-value~ takes either.
When using these functions, you should keep in mind that unless you pass an entry alist to ~citar--get-value~, and instead use a key, each call to that function will query the cache.
This, therefore, is a better pattern to use:

#+begin_src emacs-lisp

(let* ((entry (citar--get-entry key))
(title (citar--get-value entry "title")))
(message title))

#+end_src


** Extending citar

Most user-accessible citar functions take an argument ~key-entry~ or ~keys-entries~.
These expect, respectively, a cons cell of a citation key (a string like "SmithWritingHistory1987") and the corresponding bibliography entry for that citation, or a list of such cons cells.
If you wish to extend citar at the user-action level, perhaps by adding a function to one of the embark keymaps, you will find it easiest to reproduce this pattern.
If you need to build the cons cells manually, this can be accomplished via ~citar--get-entry~.
So, for example, to insert the annotations from a pdf into a buffer, the following pair of functions might be used:
You can use ~citar-select-ref~ or ~citar-select-refs~ to write custom commands.
An example:

#+begin_src emacs-lisp


(defun my/citar-insert-annots (keys-entries)
(defun my/citar-insert-annots (keys)
"insert annotations as org text from KEYS-ENTRIES"
(interactive (list (citar-select-refs
:rebuild-cache current-prefix-arg)))
(interactive (list (citar-select-refs)))
(let* ((files
(seq-mapcat (lambda (key-entry)
(seq-mapcat (lambda (key)
(citar-file--files-for-entry
(car key-entry) (cdr key-entry)
key (citar--get-entry key)
'("/") '("pdf")))
keys-entries ))
keys ))
(output (seq-map
(lambda (file)
(pdf-annot-markups-as-org-text ;; you'll still need to write this function!
Expand All @@ -44,8 +62,7 @@ So, for example, to insert the annotations from a pdf into a buffer, the followi

(defun my/independent-insert-annots (key)
"helper function to insert annotations without the bibtex-actins apparatus"
(let ((key-entry (cons key (citar--get-entry key))))
(my/citar-insert-annots (list key-entry))))
(my/citar-insert-annots (list key)))


#+end_src
Expand Down
15 changes: 11 additions & 4 deletions Eldev
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@

(eldev-use-plugin 'autoloads)

(setf eldev-standard-excludes `(:or ,eldev-standard-excludes "./test/manual/" "./citar-capf.el"))
;; TODO what to do with these excluded files?
(setf eldev-standard-excludes `(:or ,eldev-standard-excludes "./test/manual/" "./citar-capf.el" "./citar-filenotify.el"))

;; (setf eldev-test-fileset '("./test/" "!./test/manual/"))
;; (eldev-add-extra-dependencies 'test 'embark 'consult 'marginalia 'vertico 'auctex)
(eldev-add-extra-dependencies '(build test lint) 'embark 'auctex)

;; allow to load test helpers
;; (eldev-add-loading-roots 'test "test/utils")

;;; Linting settings

;; Tell checkdoc not to demand two spaces after a period.
(setq sentence-end-double-space nil)

(setf eldev-lint-default '(elisp))
(setq eldev-lint-default '(elisp))
(setq eldev-lint-stop-mode 'linter)

(with-eval-after-load 'elisp-lint
;; Used eldev lint package | checkdoc
Expand All @@ -28,3 +31,7 @@
;; Emacs 29 snapshot has new indentation convention for cl-letf
(when (> emacs-major-version 28)
(push "indent" elisp-lint-ignored-validators)))

;; Currently, package-lint has no other way of ignoring checks.
;; See https://github.com/purcell/package-lint/issues/125
(advice-add #'package-lint--check-eval-after-load :override #'ignore)
75 changes: 17 additions & 58 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
:CUSTOM_ID: features
:END:

Note: this package was formerly called "bibtex-actions."

This package provides a completing-read front-end to browse and act on BibTeX, BibLaTeX, and CSL JSON bibliographic data, and LaTeX, markdown, and org-cite editing support.

When used with vertico, embark, and marginalia, it provides similar functionality to helm-bibtex and ivy-bibtex: quick filtering and selecting of bibliographic entries from the minibuffer, and the option to run different commands against them.
Expand Down Expand Up @@ -50,6 +48,8 @@ In addition, the following packages are strongly recommended for the best experi
3. [[https://github.com/oantolin/embark][Embark]] (contextual actions)
4. [[https://github.com/minad/marginalia][Marginalia]] (annotations, and also candidate classification for Embark)

We also recommend Emacs 28, as this package relies on two of its features, that greatly enhance the UI.

** Configuration
:PROPERTIES:
:CUSTOM_ID: configuration
Expand All @@ -73,9 +73,16 @@ This is the minimal configuration, and will work with any completing-read compli

*** Embark

Citar will automatically integrate with Embark if it is installed, offering contextual access to actions in the minibuffer and at-point.
The =citar-embark= package adds contextual access actions in the minibuffer and at-point via the ~citar-embark-mode~ minor mode.
When using Embark, the Citar actions are generic, and work the same across org, markdown, and latex modes.

#+BEGIN_SRC emacs-lisp
(use-package citar-embark
:after citar embark
:no-require
:config (citar-embark-mode))
#+END_SRC

*** Org-Cite

#+CAPTION: org-cite at-point integration with =embark-act=
Expand Down Expand Up @@ -216,65 +223,17 @@ You can save this history across sessions by adding =citar-history= to =savehist
:CUSTOM_ID: refreshing-the-library-display
:END:

=citar= uses two caches to speed up library display; one for the global bibliography, and another for local files specific to a buffer.
This is great for performance, but means the data can become stale if you modify it.

The =citar-refresh= command will reload the caches, and you can call this manually.
You can also call any of the =citar= commands with a prefix argument: =C-u M-x citar-insert-key=.

Although not default, =citar= also provides convenience functions for auto-refreshing cache when bib files change using filenotify.
The simplest use of this functionality is

#+BEGIN_SRC emacs-lisp
(citar-filenotify-setup '(LaTeX-mode-hook org-mode-hook))
#+END_SRC

This will add watches for the global bib files and in addition add a hook to =LaTeX-mode-hook= and =org-mode-hook= to add watches for local bibliographic files.
By default this will invalidate the cache if a bib file changes. If the bib files change rarely, a more suitable option is to refresh the cache.
This can be achieved by

#+BEGIN_SRC emacs-lisp
(setq citar-filenotify-callback 'refresh-cache)
#+END_SRC

The behavior can be tweaked more thoroughly by setting ~citar-filenotify-callback~ to a function.
See its documentation for details.
Watches can be also placed on additional files.
This is controlled by the variable ~citar-filenotify-files~.

Another option to make the completion interface more seamless is to add a hook which generates the cache after a buffer is opened.
This can be done when emacs has been idle (half a second in the example below) with something like this:

#+BEGIN_SRC emacs-lisp
(defun gen-bib-cache-idle ()
"Generate bib item caches with idle timer"
(run-with-idle-timer 0.5 nil #'citar-refresh))

(add-hook 'LaTeX-mode-hook #'gen-bib-cache-idle)
(add-hook 'org-mode-hook #'gen-bib-cache-idle)
#+END_SRC
Citar uses a cache to speed up library display.
If a bib file changes, the cache will automatically update the next time you run a Citar command.

For additional configuration options on this, see [[https://github.com/bdarcus/citar/wiki/Configuration#automating-path-watches][the wiki]].
The =citar-cache-refresh= command will also reload the caches manually.
bdarcus marked this conversation as resolved.
Show resolved Hide resolved

** Notes

Citar provides a ~citar-create-note-function~ variable, and a default function for org, which also works well with org-roam (v2 now supports org-cite).
You can configure the title display using the "note" template.

You can also use the ~citar-open-note-functions~ variable to replace or augment the default with another; for example from org-roam-bibtex:

#+BEGIN_SRC emacs-lisp
(setq citar-open-note-functions '(orb-citar-edit-note))
#+END_SRC

Since ~citar-open-note-functions~ is a list, you can also include multiple functions, to handle different note scenarios.

Please note that if you choose to use org-roam-bibtex using the above configuration, you will need to set ~:immediate-finish t~ in the template that you use for bibliography notes in ~org-roam-capture-templates~.
Since ~citar-open-note-functions~ attempts multiple functions one after the other, this is needed to ensure the ~org-capture~ returns immediately without waiting for further user input.

Citar also includes a ~citar-has-notes-functions~ variable, which specifies a list of functions, each of which returns a predicate function to test whether a reference has associated notes.
This function allows Citar to correctly format the completion UI candidates.
The default function only supports one-file-per-key notes.
Citar offers configurable note-taking and access integration.
The ~citar-notes-sources~ variable configures note backends, and ~citar-notes-source~ activates your chosen backend.
A backend primarily specifies functions to update the Citar display, to create the completion candidates, and to open existing and new notes.
See the docstrings for details.

** Files, file association and file-field parsing

Expand Down
Loading