diff options
| -rw-r--r-- | custom/jao-custom-pdf.el | 9 | ||||
| -rw-r--r-- | lib/doc/jao-devon.el | 55 | ||||
| -rw-r--r-- | lib/doc/jao-mac.el | 102 | ||||
| -rw-r--r-- | lib/doc/jao-pdf.el | 17 |
4 files changed, 111 insertions, 72 deletions
diff --git a/custom/jao-custom-pdf.el b/custom/jao-custom-pdf.el index 98a28b1..50612bf 100644 --- a/custom/jao-custom-pdf.el +++ b/custom/jao-custom-pdf.el @@ -9,7 +9,7 @@ (use-package jao-pdf :demand t :config - (setq jao-open-doc-fun (jao-d-l 'jao-pdf-open-in-devon 'jao-find-or-open)) + (setq jao-open-doc-fun 'jao-find-or-open) (setq jao-org-open-pdf-fun jao-open-doc-fun)) ;;;; doc-view @@ -20,13 +20,15 @@ doc-view-continuous t doc-view-conversion-refresh-interval 1 doc-view-mupdf-use-svg t) + (defalias 'jao-doc-view-externally + (jao-d-l 'jao-mac-open-in-skim 'jao-open-with-zathura)) :hook ((doc-view-mode . jao-doc-session-mark)) :bind (:map doc-view-mode-map ("j" . doc-view-next-line-or-next-page) ("J" . doc-view-search-next-match) ("k" . doc-view-previous-line-or-previous-page) ("K" . doc-view-search-previous-match) - ("z" . jao-open-with-zathura))) + ("z" . jao-doc-view-externally))) (use-package jao-doc-session :demand t) @@ -59,7 +61,8 @@ ("S" "save session" jao-doc-session-save) ("d" "visit cache directory" doc-view-dired-cache)] ["External viewers" - ("z" "open with zathura" jao-open-with-zathura)]) + ("z" "open with zathura" jao-open-with-zathura :if jao-is-linux) + ("z" "open with skim" jao-mac-open-in-skim :if jao-is-darwin)]) (with-eval-after-load "pdf-view" (jao-transient-major-mode pdf-view diff --git a/lib/doc/jao-devon.el b/lib/doc/jao-devon.el deleted file mode 100644 index 489307e..0000000 --- a/lib/doc/jao-devon.el +++ /dev/null @@ -1,55 +0,0 @@ -;;; jao-devon.el --- Utilities to interact with devonthink -*- lexical-binding: t; -*- - -;; Copyright (C) 2025 Jose Antonio Ortega Ruiz - -;; Author: Jose Antonio Ortega Ruiz <mail@jao.io> -;; Keywords: docs - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <https://www.gnu.org/licenses/>. - -;;; Commentary: - -;; Searches and general scripting in devon. - -;;; Code: - -(defun jao-devon--do-applescript (script) - (let (start cmd return) - (while (string-match "\n" script) - (setq script (replace-match "\r" t t script))) - (while (string-match "'" script start) - (setq start (+ 2 (match-beginning 0)) - script (replace-match "\\'" t t script))) - (setq cmd (concat "osascript -e '" script "'")) - (setq return (shell-command-to-string cmd)) - (string-trim return))) - -(defun jao-devon-tell (&rest script-lines) - (let ((scpt (mapconcat 'identity - (append (cons "tell application id \"DNtp\"" - script-lines) - '("end tell\n")) - "\n"))) - (jao-devon--do-applescript scpt))) - -(defun jao-devon-find-url (file) - (jao-devon-tell - "repeat with db in databases" - (format "set res to lookup records with path %S in db" (file-truename file)) - "if res /= {} then return the reference URL of (item 1 of res)" - "end repeat" - "return \"\"")) - -(provide 'jao-devon) -;;; jao-devon.el ends here diff --git a/lib/doc/jao-mac.el b/lib/doc/jao-mac.el new file mode 100644 index 0000000..f40ca10 --- /dev/null +++ b/lib/doc/jao-mac.el @@ -0,0 +1,102 @@ +;;; jao-mac.el --- Running applescript. -*- lexical-binding: t; -*- + +;; Copyright (C) 2025 Jose Antonio Ortega Ruiz + +;; Author: Jose Antonio Ortega Ruiz <mail@jao.io> +;; Keywords: lisp + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <https://www.gnu.org/licenses/>. + +(require 'jao-shell) + +;;; Applescript +(defun jao-mac-run-applescript (script) + (let (start cmd return) + (while (string-match "\n" script) + (setq script (replace-match "\r" t t script))) + (while (string-match "'" script start) + (setq start (+ 2 (match-beginning 0)) + script (replace-match "\\'" t t script))) + (setq cmd (concat "osascript -e '" script "'")) + (setq return (shell-command-to-string cmd)) + (string-trim return))) + +(defun jao-mac-run-applescript* (&rest script-lines) + (jao-mac-run-applescript (mapconcat 'identity script-lines "\r"))) + +(defun jao-mac-tell-app (app &rest script-lines) + (let* ((app-id (string-split app)) + (id (if (> (length app-id) 1) (car app-id) "")) + (app (if (> (length app-id) 1) (cadr app-id) (car app-id))) + (pre (list (format "tell application %s %S" id app))) + (post '("end tell\n"))) + (jao-mac-run-applescript* (append pre script-lines post)))) + +;;; open + +(defun jao-mac-open (thing &rest args) + "Invoke open after formatting thing with args, using `format'" + (jao-shell-exec (format "open %s" (apply #'format thing args)))) + +(defun jao-mac-open-in-skim (&optional file page height) + (interactive) + (let* ((file (if file (expand-file-name file) (buffer-file-name))) + (page (or page (and (derived-mode-p 'doc-view-mode) + (doc-view-current-page))))) + (jao-mac-open "skim://%s%s" file (if page (format "#page=%s" page) "")))) + +;; https://alvinalexander.com/macos/applescript-how-to-open-pdf-file-in-preview-go-to-page/ +;; This will work as long as Preview is the default app for the file at hand. +(defun jao-mac-open-in-preview (&optional file page height) + (interactive) + (let ((file (if file (expand-file-name file) (buffer-file-name))) + (page (or page (and (derived-mode-p 'doc-view-doc) + (doc-view-current-page))))) + (jao-mac-run-applescript* + (format "tell application id \"com.apple.Preview\" to open (POSIX file %S)\r\r" + (file-truename file)) + "delay 1" + "tell application \"System Events\"" + "keystroke \"g\" using {option down, command down}" + (format "keystroke %s" (or page 1)) + "delay 0.1\rkeystroke return\rend tell"))) + +;;; DevonThink + +(defun jao-devon-tell (&rest script-lines) + (apply #'jao-mac-tell-app "id DNtp" script-lines )) + +(defun jao-devon-find-url (file) + (jao-devon-tell + "repeat with db in databases" + (format "set res to lookup records with path %S in db" + (file-truename file)) + "if res /= {} then return the reference URL of (item 1 of res)" + "end repeat" + "return \"\"")) + +(defun jao-devon-show-search (s) + (jao-devon-tell (format "show search %S" s) "activate")) + +(defun jao-devon-open (file &optional page height) + (let ((url (jao-devon-find-url file))) + (if (string-empty-p (or url "")) + (let ((jao-browse-doc-use-emacs-p t)) + (jao-find-or-open file page height)) + (let* ((p (if page (format "?page=%s" (- page 1)) "")) + (u (format "%s%s" url p))) + (jao-mac-open "%s%s" url p))))) + +(provide 'jao-mac) +;;; jao-mac.el ends here diff --git a/lib/doc/jao-pdf.el b/lib/doc/jao-pdf.el index 15e403a..f855143 100644 --- a/lib/doc/jao-pdf.el +++ b/lib/doc/jao-pdf.el @@ -106,20 +106,9 @@ (cmd (format "xdotool windowactivate %s%s" id page))) (jao-shell-exec cmd t))))) -;;; DevonThink - -(jao-when-darwin - (require 'jao-devon) - - (defun jao-pdf-open-in-devon (file &optional page height) - (let ((url (jao-devon-find-url file))) - (if (string-empty-p (or url "")) - (let ((jao-browse-doc-use-emacs-p t)) - (jao-find-or-open file page height)) - (let* ((p (if page (format "?page=%s" (- page 1)) "")) - (u (format "%s%s" url p))) - (message "Opening %s ..." u) - (jao-shell-exec* t "open" u)))))) +;;; Mac + +(jao-when-darwin (require 'jao-mac)) ;;; Open doc functions |