Skip to content
This repository was archived by the owner on Apr 20, 2022. It is now read-only.

various patch #58

Open
lujun9972 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

various patch #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions interleave.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,18 +351,20 @@ It (possibly) narrows the subtree when found."
(defun interleave-scroll-up ()
"Scroll up the PDF. Look up for available notes."
(interactive)
(setq interleave-page-marker (funcall interleave-pdf-current-page-fn))
(funcall interleave-pdf-scroll-up-or-next-page-fn)
(unless (= interleave-page-marker (funcall interleave-pdf-current-page-fn))
(interleave--go-to-page-note (funcall interleave-pdf-current-page-fn))))
(with-selected-window (display-buffer interleave-pdf-buffer)
(setq interleave-page-marker (funcall interleave-pdf-current-page-fn))
(funcall interleave-pdf-scroll-up-or-next-page-fn)
(unless (= interleave-page-marker (funcall interleave-pdf-current-page-fn))
(interleave--go-to-page-note (funcall interleave-pdf-current-page-fn)))))

(defun interleave-scroll-down ()
"Scroll down the PDF. Look up for available notes."
(interactive)
(setq interleave-page-marker (funcall interleave-pdf-current-page-fn))
(funcall interleave-pdf-scroll-down-or-previous-page-fn)
(unless (= interleave-page-marker (funcall interleave-pdf-current-page-fn))
(interleave--go-to-page-note (funcall interleave-pdf-current-page-fn))))
(with-selected-window (display-buffer interleave-pdf-buffer)
(setq interleave-page-marker (funcall interleave-pdf-current-page-fn))
(funcall interleave-pdf-scroll-down-or-previous-page-fn)
(unless (= interleave-page-marker (funcall interleave-pdf-current-page-fn))
(interleave--go-to-page-note (funcall interleave-pdf-current-page-fn)))))

(defun interleave--switch-to-org-buffer (&optional insert-newline-maybe position)
"Switch to the notes buffer.
Expand Down Expand Up @@ -416,7 +418,7 @@ Return the position of the newly inserted heading."
(org-insert-heading-respect-content)
(let* ((parent-level (if interleave-multi-pdf-notes-file
(org-element-property :level parent-headline)
0))
(or (org-up-heading-safe) 0)))
(change-level (if (> (org-element-property :level (org-element-at-point))
(1+ parent-level))
#'org-promote
Expand Down Expand Up @@ -730,6 +732,8 @@ Keybindings (org-mode buffer):
(define-key interleave-mode-map (kbd "M-.") #'interleave-sync-pdf-page-current)
(define-key interleave-mode-map (kbd "M-p") #'interleave-sync-pdf-page-previous)
(define-key interleave-mode-map (kbd "M-n") #'interleave-sync-pdf-page-next)
(define-key interleave-mode-map (kbd "C-j") #'interleave-scroll-up)
(define-key interleave-mode-map (kbd "C-k") #'interleave-scroll-down)

(define-key interleave-pdf-mode-map (kbd "n") #'interleave-go-to-next-page)
(define-key interleave-pdf-mode-map (kbd "p") #'interleave-go-to-previous-page)
Expand Down