diff options
| -rw-r--r-- | lib/doc/jao-org-links.el | 17 | ||||
| -rw-r--r-- | lib/doc/jao-pdf.el | 17 |
2 files changed, 26 insertions, 8 deletions
diff --git a/lib/doc/jao-org-links.el b/lib/doc/jao-org-links.el index 5f2304a..5547c9b 100644 --- a/lib/doc/jao-org-links.el +++ b/lib/doc/jao-org-links.el @@ -101,16 +101,19 @@ (insert "\n#+startup: latexpreview\n\n")) ;;;###autoload -(defun jao-org-pdf-goto-org (arg) +(defun jao-org-pdf-goto-org (arg &optional file-name) (interactive "P") - (when (jao-pdf-is-pdf-file buffer-file-name) - (let* ((file (jao-org-notes-find-for-pdf)) - (new (not (file-exists-p file))) - (title (jao-pdf-title))) - (when (or arg new) (org-store-link nil t)) + (when (jao-pdf-is-pdf-file (or file-name buffer-file-name)) + (let* ((file (jao-org-notes-find-for-pdf file-name)) + (new (not (file-exists-p file)))) + (if (and (not file-name) (or arg new)) + (org-store-link nil t) + (when-let* ((fboundp 'jao-skim-current-doc) + (lnk (jao-pdf-skim-org-link nil))) + (kill-new lnk))) (find-file-other-window file) (when new - (jao-org-insert-doc-skeleton title) + (jao-org-insert-doc-skeleton (jao-pdf-title file-name)) (org-insert-link))))) ;;;###autoload diff --git a/lib/doc/jao-pdf.el b/lib/doc/jao-pdf.el index 7996be8..fc332ab 100644 --- a/lib/doc/jao-pdf.el +++ b/lib/doc/jao-pdf.el @@ -108,7 +108,21 @@ ;;; Mac -(jao-when-darwin (require 'jao-mac)) +(when (eq system-type 'darwin) + (require 'jao-mac) + (defun jao-pdf-skim-org-link (title) + (when-let* ((fp (jao-skim-current-doc)) + (file (file-name-nondirectory (car fp))) + (page (cadr fp)) + (lnk (format "doc:%s::%s" file page))) + (org-make-link-string lnk title))) + + (defun jao-pdf-insert-skim-org-link () + (interactive) + (if-let* ((title (read-string "Title: ")) + (lnk (jao-pdf-skim-org-link title))) + (insert lnk) + (user-error "Skim is not viewing any docs!")))) ;;; Open doc functions @@ -125,6 +139,7 @@ (when page (jao-doc-view-goto-page page height)))) (jao-river-enabled (jao-river-open-with-zathura file page)) (jao-sway-enabled (jao-sway-open-with-zathura file page)) + ((eq system-type 'darwin) (jao-mac-open-in-skim file page)) (t (jao-zathura-open file page)))) (defun jao-open-doc (&optional file page height) |