From 5592f9b78392b00cf0a3a55a4cebfb0d93c1c298 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 30 Sep 2013 19:42:07 +0200 Subject: [PATCH] Emacs: fixed doc-view-mode [next] and [previous] keys. --- .emacs.d/main.el | 13 +++++++----- .emacs.d/mode-tex.el | 48 +++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/.emacs.d/main.el b/.emacs.d/main.el index 0e137098..4548b6b2 100644 --- a/.emacs.d/main.el +++ b/.emacs.d/main.el @@ -49,16 +49,19 @@ (setq kill-whole-line t) ;; Alternative scrolling -;; TODO: add support for DocView (define-key my-keys-minor-mode-map [next] (lambda () (interactive) - (condition-case nil (scroll-up) - (end-of-buffer (goto-char (point-max)))))) + (if (string= major-mode "doc-view-mode") + (doc-view-next-page) + (condition-case nil (scroll-up) + (end-of-buffer (goto-char (point-max))))))) (define-key my-keys-minor-mode-map [prior] (lambda () (interactive) - (condition-case nil (scroll-down) - (beginning-of-buffer (goto-char (point-min)))))) + (if (string= major-mode "doc-view-mode") + (doc-view-previous-page) + (condition-case nil (scroll-down) + (beginning-of-buffer (goto-char (point-min))))))) ;; Line numbers ;; TODO: This mode is slow on big files when using beginning-of-buffer binding. diff --git a/.emacs.d/mode-tex.el b/.emacs.d/mode-tex.el index f0b09637..502c5a55 100644 --- a/.emacs.d/mode-tex.el +++ b/.emacs.d/mode-tex.el @@ -4,16 +4,6 @@ ;; The default tex-mode and AucTeX may seem quite disappointing. Let's use ;; custom KISS functions for everything. -;; The magnificent latex-math-preview mode! -(autoload 'latex-math-preview-expression "latex-math-preview" nil t) -(autoload 'latex-math-preview-insert-symbol "latex-math-preview" nil t) -(autoload 'latex-math-preview-save-image-file "latex-math-preview" nil t) -(autoload 'latex-math-preview-beamer-frame "latex-math-preview" nil t) -(autoload 'latex-math-preview-text-symbol-datasets "latex-math-preview" nil t) - -(setq latex-math-preview-cache-directory-for-insertion - (concat emacs-cache-folder "latex-math-preview-cache")) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; CUSTOM (defcustom tex-compiler nil @@ -265,25 +255,37 @@ properly escaped with double-quotes in case it has spaces." (set (make-local-variable 'compilation-hide-window) t) (set (make-local-variable 'use-hard-newlines) t) (local-set-key (kbd "") 'tex-pdf-view) - ;; (local-set-key (kbd "C-c p") 'latex-math-preview-expression) - ;; (local-set-key (kbd "C-c C-p") 'latex-math-preview-save-image-file) - (local-set-key (kbd "C-c j") 'latex-math-preview-insert-symbol) - (local-set-key (kbd "C-c C-j") 'latex-math-preview-last-symbol-again) - ;; (local-set-key (kbd "C-c C-b") 'latex-math-preview-beamer-frame) (tex-set-compiler))) (add-hook 'latex-mode-hook (lambda () (local-set-key (kbd "M-RET") 'latex-itemize))) (add-hook 'latex-mode-hook 'turn-on-orgtbl) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; The magnificent latex-math-preview mode! +;; TODO: some symbols are not generated properly. +(autoload 'latex-math-preview-expression "latex-math-preview" nil t) +(autoload 'latex-math-preview-insert-symbol "latex-math-preview" nil t) +(autoload 'latex-math-preview-save-image-file "latex-math-preview" nil t) +(autoload 'latex-math-preview-beamer-frame "latex-math-preview" nil t) +(autoload 'latex-math-preview-text-symbol-datasets "latex-math-preview" nil t) + +(setq latex-math-preview-cache-directory-for-insertion + (concat emacs-cache-folder "latex-math-preview-cache")) ;; Extra for latex-math-preview-mode. ;; TODO: latex-math-preview-mode extra does not work. (require 'latex-math-preview-extra-data nil t) -(add-hook 'latex-mode-hook - (lambda () - (add-to-list 'latex-math-preview-text-symbol-datasets - latex-math-preview-textcomp-symbol-data) - (add-to-list 'latex-math-preview-text-symbol-datasets - latex-math-preview-pifont-zapf-dingbats-symbol-data) - (add-to-list 'latex-math-preview-text-symbol-datasets - latex-math-preview-pifont-symbol-fonts-symbol-data))) +(add-hook + 'latex-mode-hook + (lambda () + ;; (local-set-key (kbd "C-c p") 'latex-math-preview-expression) + ;; (local-set-key (kbd "C-c C-p") 'latex-math-preview-save-image-file) + (local-set-key (kbd "C-c j") 'latex-math-preview-insert-symbol) + (local-set-key (kbd "C-c C-j") 'latex-math-preview-last-symbol-again) + ;; (local-set-key (kbd "C-c C-b") 'latex-math-preview-beamer-frame) + (add-to-list 'latex-math-preview-text-symbol-datasets + latex-math-preview-textcomp-symbol-data) + (add-to-list 'latex-math-preview-text-symbol-datasets + latex-math-preview-pifont-zapf-dingbats-symbol-data) + (add-to-list 'latex-math-preview-text-symbol-datasets + latex-math-preview-pifont-symbol-fonts-symbol-data)))