annotate lisp/doc-view.el @ 87583:892548286484

*** empty log message ***
author Glenn Morris <rgm@gnu.org>
date Fri, 04 Jan 2008 16:31:44 +0000
parents c47e66c6d239
children 92ee34bb9001
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
1 ;;; doc-view.el --- View PDF/PostScript/DVI files in Emacs
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
2
87556
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
3 ;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
4 ;;
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
5 ;; Author: Tassilo Horn <tassilo@member.fsf.org>
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
6 ;; Maintainer: Tassilo Horn <tassilo@member.fsf.org>
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
7 ;; Keywords: files, pdf, ps, dvi
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
8
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
10
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
13 ;; the Free Software Foundation; either version 3, or (at your option)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
14 ;; any later version.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
15
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
20
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
24 ;; Boston, MA 02110-1301, USA.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
25
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
26 ;;; Requirements:
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
27
85367
1fbaddcbc4ec Mention xpdf. Fix spelling of Ghostscript.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85029
diff changeset
28 ;; doc-view.el requires GNU Emacs 22.1 or newer. You also need Ghostscript,
1fbaddcbc4ec Mention xpdf. Fix spelling of Ghostscript.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85029
diff changeset
29 ;; `dvipdfm' which comes with teTeX and `pdftotext', which comes with xpdf
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
30 ;; (http://www.foolabs.com/xpdf/) or poppler (http://poppler.freedesktop.org/).
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
31
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
32 ;;; Commentary:
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
33
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
34 ;; DocView is a document viewer for Emacs. It converts PDF, PS and DVI files
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
35 ;; to a set of PNG files, one PNG for each page, and displays the PNG images
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
36 ;; inside an Emacs buffer. This buffer uses `doc-view-mode' which provides
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
37 ;; convenient key bindings for browsing the document.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
38 ;;
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
39 ;; To use it simply open a document file with
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
40 ;;
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
41 ;; C-x C-f ~/path/to/document RET
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
42 ;;
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
43 ;; and the document will be converted and displayed, if your emacs supports png
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
44 ;; images. With `C-c C-c' you can toggle between the rendered images
85815
960b3c592913 (doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents: 85805
diff changeset
45 ;; representation and the source text representation of the document.
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
46 ;;
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
47 ;; Since conversion may take some time all the PNG images are cached in a
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
48 ;; subdirectory of `doc-view-cache-directory' and reused when you want to view
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
49 ;; that file again. To reconvert a document hit `g' (`doc-view-reconvert-doc')
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
50 ;; when displaying the document. To delete all cached files use
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
51 ;; `doc-view-clear-cache'. To open the cache with dired, so that you can tidy
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
52 ;; it out use `doc-view-dired-cache'.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
53 ;;
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
54 ;; When conversion in underway the first page will be displayed as soon as it
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
55 ;; is available and the available pages are refreshed every
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
56 ;; `doc-view-conversion-refresh-interval' seconds. If that variable is nil the
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
57 ;; pages won't be displayed before conversion of the document finished
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
58 ;; completely.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
59 ;;
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
60 ;; DocView lets you select a slice of the displayed pages. This slice will be
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
61 ;; remembered and applied to all pages of the current document. This enables
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
62 ;; you to cut away the margins of a document to save some space. To select a
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
63 ;; slice you can use `doc-view-set-slice' (bound to `s s') which will query you
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
64 ;; for the coordinates of the slice's top-left corner and its width and height.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
65 ;; A much more convenient way to do the same is offered by the command
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
66 ;; `doc-view-set-slice-using-mouse' (bound to `s m'). After invokation you
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
67 ;; only have to press mouse-1 at the top-left corner and drag it to the
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
68 ;; bottom-right corner of the desired slice. To reset the slice use
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
69 ;; `doc-view-reset-slice' (bound to `s r').
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
70 ;;
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
71 ;; You can also search within the document. The command `doc-view-search'
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
72 ;; (bound to `C-s') queries for a search regexp and initializes a list of all
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
73 ;; matching pages and messages how many match-pages were found. After that you
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
74 ;; can jump to the next page containing a match with an additional `C-s'. With
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
75 ;; `C-r' you can do the same, but backwards. To search for a new regexp give a
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
76 ;; prefix arg to one of the search functions, e.g. by typing `C-u C-s'. The
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
77 ;; searching works by using a plain text representation of the document. If
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
78 ;; that doesn't already exist the first invokation of `doc-view-search' (or
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
79 ;; `doc-view-search-backward') starts the conversion. When that finishes and
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
80 ;; you're still viewing the document (i.e. you didn't switch to another buffer)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
81 ;; you're queried for the regexp then.
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
82 ;;
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
83 ;; Dired users can simply hit `v' on a document file. If it's a PS, PDF or DVI
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
84 ;; it will be opened using `doc-view-mode'.
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
85 ;;
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
86
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
87 ;;; Configuration:
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
88
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
89 ;; If the images are too small or too big you should set the "-rXXX" option in
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
90 ;; `doc-view-ghostscript-options' to another value. (The bigger your screen,
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
91 ;; the higher the value.)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
92 ;;
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
93 ;; This and all other options can be set with the customization interface.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
94 ;; Simply do
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
95 ;;
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
96 ;; M-x customize-group RET doc-view RET
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
97 ;;
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
98 ;; and modify them to your needs.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
99
86035
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
100 ;;; Todo:
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
101
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
102 ;; - better menu.
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
103 ;; - don't use `find-file'.
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
104 ;; - Bind slicing to a drag event.
86119
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
105 ;; - doc-view-fit-doc-to-window and doc-view-fit-window-to-doc.
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
106 ;; - zoom a the region around the cursor (like xdvi).
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
107 ;; - get rid of the silly arrow in the fringe.
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
108 ;; - improve anti-aliasing (pdf-utils gets it better).
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
109
86035
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
110 ;;;; About isearch support
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
111
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
112 ;; I tried implementing isearch by setting
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
113 ;; `isearch-search-fun-function' buffer-locally, but that didn't
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
114 ;; work too good. The function doing the real search was called
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
115 ;; endlessly somehow. But even if we'd get that working no real
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
116 ;; isearch feeling comes up due to the missing match highlighting.
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
117 ;; Currently I display all lines containing a match in a tooltip and
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
118 ;; each C-s or C-r jumps directly to the next/previous page with a
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
119 ;; match. With isearch we could only display the current match. So
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
120 ;; we had to decide if another C-s jumps to the next page with a
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
121 ;; match (thus only the first match in a page will be displayed in a
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
122 ;; tooltip) or to the next match, which would do nothing visible
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
123 ;; (except the tooltip) if the next match is on the same page.
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
124
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
125 ;; And it's much slower than the current search facility, because
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
126 ;; isearch really searches for each step forward or backward wheras
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
127 ;; the current approach searches once and then it knows to which
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
128 ;; pages to jump.
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
129
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
130 ;; Anyway, if someone with better isearch knowledge wants to give it a try,
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
131 ;; feel free to do it. --Tassilo
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
132
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
133 ;;; Code:
d3745283de5f Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents: 86025
diff changeset
134
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
135 (require 'dired)
85420
de8f3f575afc (doc-view-mode-map): Use the image-mode scrolling commands. Don't rebind C-x k.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85419
diff changeset
136 (require 'image-mode)
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
137 (require 'jka-compr)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
138
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
139 ;;;; Customization Options
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
140
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
141 (defgroup doc-view nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
142 "In-buffer viewer for PDF, PostScript and DVI files."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
143 :link '(function-link doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
144 :version "22.2"
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
145 :group 'applications
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
146 :group 'multimedia
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
147 :prefix "doc-view-")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
148
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
149 (defcustom doc-view-ghostscript-program (executable-find "gs")
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
150 "Program to convert PS and PDF files to PNG."
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
151 :type 'file
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
152 :group 'doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
153
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
154 (defcustom doc-view-ghostscript-options
85418
26dcc1207f42 (doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85369
diff changeset
155 '("-dSAFER" ;; Avoid security problems when rendering files from untrusted
26dcc1207f42 (doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85369
diff changeset
156 ;; sources.
26dcc1207f42 (doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85369
diff changeset
157 "-dNOPAUSE" "-sDEVICE=png16m" "-dTextAlphaBits=4"
86119
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
158 "-dBATCH" "-dGraphicsAlphaBits=4" "-dQUIET")
85367
1fbaddcbc4ec Mention xpdf. Fix spelling of Ghostscript.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85029
diff changeset
159 "A list of options to give to ghostscript."
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
160 :type '(repeat string)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
161 :group 'doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
162
86119
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
163 (defcustom doc-view-resolution 100
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
164 "Dots per inch resolution used to render the documents.
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
165 Higher values result in larger images."
86154
1cdfc94602cb * smime.el (from):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86119
diff changeset
166 :type 'number
1cdfc94602cb * smime.el (from):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86119
diff changeset
167 :group 'doc-view)
86119
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
168
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
169 (defcustom doc-view-dvipdfm-program (executable-find "dvipdfm")
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
170 "Program to convert DVI files to PDF.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
171
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
172 DVI file will be converted to PDF before the resulting PDF is
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
173 converted to PNG."
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
174 :type 'file
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
175 :group 'doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
176
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
177 (defcustom doc-view-ps2pdf-program (executable-find "ps2pdf")
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
178 "Program to convert PS files to PDF.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
179
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
180 PS files will be converted to PDF before searching is possible."
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
181 :type 'file
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
182 :group 'doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
183
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
184 (defcustom doc-view-pdftotext-program (executable-find "pdftotext")
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
185 "Program to convert PDF files to plain text.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
186
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
187 Needed for searching."
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
188 :type 'file
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
189 :group 'doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
190
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
191 (defcustom doc-view-cache-directory
85856
a26944b15c75 (doc-view-cache-directory): Remove superfluous concat.
Glenn Morris <rgm@gnu.org>
parents: 85844
diff changeset
192 (expand-file-name (format "docview%d" (user-uid))
85844
cf0d3de08293 * doc-view.el (doc-view-cache-directory): Fix bug where an integer
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85843
diff changeset
193 temporary-file-directory)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
194 "The base directory, where the PNG images will be saved."
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
195 :type 'directory
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
196 :group 'doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
197
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
198 (defcustom doc-view-conversion-buffer "*doc-view conversion output*"
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
199 "The buffer where messages from the converter programs go to."
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
200 :type 'string
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
201 :group 'doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
202
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
203 (defcustom doc-view-conversion-refresh-interval 3
85815
960b3c592913 (doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents: 85805
diff changeset
204 "Interval in seconds between refreshes of the DocView buffer while converting.
960b3c592913 (doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents: 85805
diff changeset
205 After such a refresh newly converted pages will be available for
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
206 viewing. If set to nil there won't be any refreshes and the
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
207 pages won't be displayed before conversion of the whole document
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
208 has finished."
85421
fbc2287ee475 Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85420
diff changeset
209 :type 'integer
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
210 :group 'doc-view)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
211
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
212 ;;;; Internal Variables
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
213
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
214 (defvar doc-view-current-files nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
215 "Only used internally.")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
216
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
217 (defvar doc-view-current-page nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
218 "Only used internally.")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
219
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
220 (defvar doc-view-current-converter-process nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
221 "Only used internally.")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
222
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
223 (defvar doc-view-current-timer nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
224 "Only used internally.")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
225
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
226 (defvar doc-view-current-slice nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
227 "Only used internally.")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
228
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
229 (defvar doc-view-current-cache-dir nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
230 "Only used internally.")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
231
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
232 (defvar doc-view-current-search-matches nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
233 "Only used internally.")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
234
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
235 (defvar doc-view-current-image nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
236 "Only used internally.")
87006
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
237
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
238 (defvar doc-view-current-overlay nil
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
239 "Only used internally.")
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
240
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
241 (defvar doc-view-pending-cache-flush nil
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
242 "Only used internally.")
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
243
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
244 (defvar doc-view-current-info nil
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
245 "Only used internally.")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
246
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
247 (defvar doc-view-previous-major-mode nil
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
248 "Only used internally.")
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
249
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
250 ;;;; DocView Keymaps
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
251
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
252 (defvar doc-view-mode-map
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
253 (let ((map (make-sparse-keymap)))
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
254 (suppress-keymap map)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
255 ;; Navigation in the document
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
256 (define-key map (kbd "n") 'doc-view-next-page)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
257 (define-key map (kbd "p") 'doc-view-previous-page)
85444
a3364ed63fcd (doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85421
diff changeset
258 (define-key map (kbd "<next>") 'forward-page)
a3364ed63fcd (doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85421
diff changeset
259 (define-key map (kbd "<prior>") 'backward-page)
a3364ed63fcd (doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85421
diff changeset
260 (define-key map [remap forward-page] 'doc-view-next-page)
a3364ed63fcd (doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85421
diff changeset
261 (define-key map [remap backward-page] 'doc-view-previous-page)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
262 (define-key map (kbd "SPC") 'doc-view-scroll-up-or-next-page)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
263 (define-key map (kbd "DEL") 'doc-view-scroll-down-or-previous-page)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
264 (define-key map (kbd "M-<") 'doc-view-first-page)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
265 (define-key map (kbd "M->") 'doc-view-last-page)
85843
05357c175a50 (doc-view-mode-map): Bind doc-view-goto-page to the keys
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85815
diff changeset
266 (define-key map [remap goto-line] 'doc-view-goto-page)
87575
f637e8101ba1 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87572
diff changeset
267 (define-key map [remap scroll-up] 'image-scroll-up)
f637e8101ba1 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87572
diff changeset
268 (define-key map [remap scroll-down] 'image-scroll-down)
86119
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
269 ;; Zoom in/out.
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
270 (define-key map "+" 'doc-view-enlarge)
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
271 (define-key map "-" 'doc-view-shrink)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
272 ;; Killing/burying the buffer (and the process)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
273 (define-key map (kbd "q") 'bury-buffer)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
274 (define-key map (kbd "k") 'doc-view-kill-proc-and-buffer)
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
275 (define-key map (kbd "K") 'doc-view-kill-proc)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
276 ;; Slicing the image
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
277 (define-key map (kbd "s s") 'doc-view-set-slice)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
278 (define-key map (kbd "s m") 'doc-view-set-slice-using-mouse)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
279 (define-key map (kbd "s r") 'doc-view-reset-slice)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
280 ;; Searching
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
281 (define-key map (kbd "C-s") 'doc-view-search)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
282 (define-key map (kbd "<find>") 'doc-view-search)
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
283 (define-key map (kbd "C-r") 'doc-view-search-backward)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
284 ;; Scrolling
85444
a3364ed63fcd (doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85421
diff changeset
285 (define-key map [remap forward-char] 'image-forward-hscroll)
a3364ed63fcd (doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85421
diff changeset
286 (define-key map [remap backward-char] 'image-backward-hscroll)
a3364ed63fcd (doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85421
diff changeset
287 (define-key map [remap next-line] 'image-next-line)
a3364ed63fcd (doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85421
diff changeset
288 (define-key map [remap previous-line] 'image-previous-line)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
289 ;; Show the tooltip
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
290 (define-key map (kbd "C-t") 'doc-view-show-tooltip)
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
291 ;; Toggle between text and image display or editing
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
292 (define-key map (kbd "C-c C-c") 'doc-view-toggle-display)
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
293 ;; Reconvert the current document
85843
05357c175a50 (doc-view-mode-map): Bind doc-view-goto-page to the keys
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85815
diff changeset
294 (define-key map (kbd "g") 'revert-buffer)
05357c175a50 (doc-view-mode-map): Bind doc-view-goto-page to the keys
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85815
diff changeset
295 (define-key map (kbd "r") 'revert-buffer)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
296 map)
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
297 "Keymap used by `doc-view-mode' when displaying a doc as a set of images.")
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
298
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
299 (easy-menu-define doc-view-menu doc-view-mode-map
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
300 "Menu for Doc View mode."
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
301 '("DocView"
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
302 ["Set Slice" doc-view-set-slice-using-mouse]
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
303 ["Set Slice (manual)" doc-view-set-slice]
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
304 ["Reset Slice" doc-view-reset-slice]
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
305 "---"
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
306 ["Search" doc-view-search]
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
307 ["Search Backwards" doc-view-search-backward]
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
308 ["Toggle display" doc-view-toggle-display]
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
309 ))
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
310
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
311 (defvar doc-view-minor-mode-map
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
312 (let ((map (make-sparse-keymap)))
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
313 ;; Toggle between text and image display or editing
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
314 (define-key map (kbd "C-c C-c") 'doc-view-toggle-display)
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
315 map)
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
316 "Keymap used by `doc-minor-view-mode'.")
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
317
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
318 ;;;; Navigation Commands
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
319
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
320 (defun doc-view-goto-page (page)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
321 "View the page given by PAGE."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
322 (interactive "nPage: ")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
323 (let ((len (length doc-view-current-files)))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
324 (if (< page 1)
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
325 (setq page 1)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
326 (when (> page len)
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
327 (setq page len)))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
328 (setq doc-view-current-page page
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
329 doc-view-current-info
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
330 (concat
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
331 (propertize
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
332 (format "Page %d of %d."
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
333 doc-view-current-page
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
334 len) 'face 'bold)
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
335 ;; Tell user if converting isn't finished yet
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
336 (if doc-view-current-converter-process
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
337 " (still converting...)\n"
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
338 "\n")
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
339 ;; Display context infos if this page matches the last search
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
340 (when (and doc-view-current-search-matches
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
341 (assq doc-view-current-page
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
342 doc-view-current-search-matches))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
343 (concat (propertize "Search matches:\n" 'face 'bold)
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
344 (let ((contexts ""))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
345 (dolist (m (cdr (assq doc-view-current-page
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
346 doc-view-current-search-matches)))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
347 (setq contexts (concat contexts " - \"" m "\"\n")))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
348 contexts)))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
349 ;; Update the buffer
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
350 (doc-view-insert-image (nth (1- page) doc-view-current-files)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
351 :pointer 'arrow)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
352 (overlay-put doc-view-current-overlay 'help-echo doc-view-current-info)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
353 (goto-char (point-min))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
354 ;; This seems to be needed for set-window-hscroll (in
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
355 ;; image-forward-hscroll) to do something useful, I don't have time to
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
356 ;; debug this now. :-( --Stef
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
357 (forward-char)))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
358
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
359 (defun doc-view-next-page (&optional arg)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
360 "Browse ARG pages forward."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
361 (interactive "p")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
362 (doc-view-goto-page (+ doc-view-current-page (or arg 1))))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
363
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
364 (defun doc-view-previous-page (&optional arg)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
365 "Browse ARG pages backward."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
366 (interactive "p")
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
367 (doc-view-goto-page (- doc-view-current-page (or arg 1))))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
368
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
369 (defun doc-view-first-page ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
370 "View the first page."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
371 (interactive)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
372 (doc-view-goto-page 1))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
373
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
374 (defun doc-view-last-page ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
375 "View the last page."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
376 (interactive)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
377 (doc-view-goto-page (length doc-view-current-files)))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
378
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
379 (defun doc-view-scroll-up-or-next-page ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
380 "Scroll page up if possible, else goto next page."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
381 (interactive)
87572
0e44918a91f4 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87556
diff changeset
382 (when (= (window-vscroll) (image-scroll-up nil))
87580
c47e66c6d239 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87575
diff changeset
383 (let ((cur-page doc-view-current-page))
c47e66c6d239 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87575
diff changeset
384 (doc-view-next-page)
c47e66c6d239 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87575
diff changeset
385 (when (/= cur-page doc-view-current-page)
c47e66c6d239 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87575
diff changeset
386 (set-window-vscroll nil 0)))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
387
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
388 (defun doc-view-scroll-down-or-previous-page ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
389 "Scroll page down if possible, else goto previous page."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
390 (interactive)
87572
0e44918a91f4 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87556
diff changeset
391 (when (= (window-vscroll) (image-scroll-down nil))
87580
c47e66c6d239 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87575
diff changeset
392 (let ((cur-page doc-view-current-page))
c47e66c6d239 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87575
diff changeset
393 (doc-view-previous-page)
c47e66c6d239 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87575
diff changeset
394 (when (/= cur-page doc-view-current-page)
c47e66c6d239 2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87575
diff changeset
395 (image-scroll-up nil)))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
396
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
397 ;;;; Utility Functions
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
398
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
399 (defun doc-view-kill-proc ()
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
400 "Kill the current converter process."
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
401 (interactive)
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
402 (when doc-view-current-converter-process
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
403 (kill-process doc-view-current-converter-process)
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
404 (setq doc-view-current-converter-process nil))
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
405 (when doc-view-current-timer
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
406 (cancel-timer doc-view-current-timer)
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
407 (setq doc-view-current-timer nil))
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
408 (setq mode-line-process nil))
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
409
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
410 (defun doc-view-kill-proc-and-buffer ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
411 "Kill the current converter process and buffer."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
412 (interactive)
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
413 (doc-view-kill-proc)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
414 (when (eq major-mode 'doc-view-mode)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
415 (kill-buffer (current-buffer))))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
416
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
417 (defun doc-view-make-safe-dir (dir)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
418 (condition-case nil
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
419 (let ((umask (default-file-modes)))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
420 (unwind-protect
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
421 (progn
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
422 ;; Create temp files with strict access rights. It's easy to
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
423 ;; loosen them later, whereas it's impossible to close the
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
424 ;; time-window of loose permissions otherwise.
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
425 (set-default-file-modes #o0700)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
426 (make-directory dir))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
427 ;; Reset the umask.
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
428 (set-default-file-modes umask)))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
429 (file-already-exists
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
430 (if (file-symlink-p dir)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
431 (error "Danger: %s points to a symbolic link" dir))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
432 ;; In case it was created earlier with looser rights.
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
433 ;; We could check the mode info returned by file-attributes, but it's
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
434 ;; a pain to parse and it may not tell you what we want under
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
435 ;; non-standard file-systems. So let's just say what we want and let
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
436 ;; the underlying C code and file-system figure it out.
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
437 ;; This also ends up checking a bunch of useful conditions: it makes
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
438 ;; sure we have write-access to the directory and that we own it, thus
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
439 ;; closing a bunch of security holes.
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
440 (set-file-modes dir #o0700))))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
441
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
442 (defun doc-view-current-cache-dir ()
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
443 "Return the directory where the png files of the current doc should be saved.
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
444 It's a subdirectory of `doc-view-cache-directory'."
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
445 (if doc-view-current-cache-dir
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
446 doc-view-current-cache-dir
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
447 ;; Try and make sure doc-view-cache-directory exists and is safe.
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
448 (doc-view-make-safe-dir doc-view-cache-directory)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
449 ;; Now compute the subdirectory to use.
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
450 (setq doc-view-current-cache-dir
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
451 (file-name-as-directory
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
452 (expand-file-name
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
453 (let ((doc buffer-file-name))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
454 (concat (file-name-nondirectory doc)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
455 "-"
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
456 (with-temp-buffer
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
457 (insert-file-contents-literally doc)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
458 (md5 (current-buffer)))))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
459 doc-view-cache-directory)))))
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
460
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
461 (defun doc-view-remove-if (predicate list)
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
462 "Return LIST with all items removed that satisfy PREDICATE."
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
463 (let (new-list)
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
464 (dolist (item list (nreverse new-list))
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
465 (when (not (funcall predicate item))
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
466 (setq new-list (cons item new-list))))))
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
467
86441
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
468 ;;;###autoload
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
469 (defun doc-view-mode-p (type)
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
470 "Return non-nil if image type TYPE is available for `doc-view'.
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
471 Image types are symbols like `dvi', `postscript' or `pdf'."
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
472 (and (display-graphic-p)
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
473 (image-type-available-p 'png)
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
474 (cond
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
475 ((eq type 'dvi)
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
476 (and (doc-view-mode-p 'pdf)
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
477 doc-view-dvipdfm-program
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
478 (executable-find doc-view-dvipdfm-program)))
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
479 ((or (eq type 'postscript) (eq type 'ps)
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
480 (eq type 'pdf))
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
481 (and doc-view-ghostscript-program
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
482 (executable-find doc-view-ghostscript-program)))
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
483 (t ;; unknown image type
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
484 nil))))
6934c0956614 (doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86156
diff changeset
485
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
486 ;;;; Conversion Functions
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
487
86119
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
488 (defvar doc-view-shrink-factor 1.125)
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
489
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
490 (defun doc-view-enlarge (factor)
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
491 "Enlarge the document."
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
492 (interactive (list doc-view-shrink-factor))
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
493 (set (make-local-variable 'doc-view-resolution)
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
494 (* factor doc-view-resolution))
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
495 (doc-view-reconvert-doc))
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
496
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
497 (defun doc-view-shrink (factor)
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
498 "Shrink the document."
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
499 (interactive (list doc-view-shrink-factor))
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
500 (doc-view-enlarge (/ 1.0 factor)))
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
501
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
502 (defun doc-view-reconvert-doc ()
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
503 "Reconvert the current document.
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
504 Should be invoked when the cached images aren't up-to-date."
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
505 (interactive)
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
506 (doc-view-kill-proc)
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
507 ;; Clear the old cached files
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
508 (when (file-exists-p (doc-view-current-cache-dir))
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
509 (dired-delete-file (doc-view-current-cache-dir) 'always))
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
510 (doc-view-initiate-display))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
511
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
512 (defun doc-view-dvi->pdf-sentinel (proc event)
85029
63718012f1da (doc-view-dvi->pdf-sentinel, doc-view-reset-slice)
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 85027
diff changeset
513 "If DVI->PDF conversion was successful, convert the PDF to PNG now."
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
514 (if (not (string-match "finished" event))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
515 (message "DocView: dvi->pdf process changed status to %s." event)
87133
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
516 (with-current-buffer (process-get proc 'buffer)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
517 (setq doc-view-current-converter-process nil
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
518 mode-line-process nil)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
519 ;; Now go on converting this PDF to a set of PNG files.
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
520 (let* ((pdf (process-get proc 'pdf-file))
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
521 (png (expand-file-name "page-%d.png"
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
522 (doc-view-current-cache-dir))))
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
523 (doc-view-pdf/ps->png pdf png)))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
524
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
525 (defun doc-view-dvi->pdf (dvi pdf)
85815
960b3c592913 (doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents: 85805
diff changeset
526 "Convert DVI to PDF asynchronously."
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
527 (setq doc-view-current-converter-process
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
528 (start-process "dvi->pdf" doc-view-conversion-buffer
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
529 doc-view-dvipdfm-program
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
530 "-o" pdf dvi)
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
531 mode-line-process (list (format ":%s" doc-view-current-converter-process)))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
532 (set-process-sentinel doc-view-current-converter-process
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
533 'doc-view-dvi->pdf-sentinel)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
534 (process-put doc-view-current-converter-process 'buffer (current-buffer))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
535 (process-put doc-view-current-converter-process 'pdf-file pdf))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
536
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
537 (defun doc-view-pdf/ps->png-sentinel (proc event)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
538 "If PDF/PS->PNG conversion was successful, update the display."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
539 (if (not (string-match "finished" event))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
540 (message "DocView: converter process changed status to %s." event)
87133
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
541 (with-current-buffer (process-get proc 'buffer)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
542 (setq doc-view-current-converter-process nil
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
543 mode-line-process nil)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
544 (when doc-view-current-timer
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
545 (cancel-timer doc-view-current-timer)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
546 (setq doc-view-current-timer nil))
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
547 ;; Yippie, finished. Update the display!
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
548 (doc-view-display buffer-file-name 'force))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
549
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
550 (defun doc-view-pdf/ps->png (pdf-ps png)
85815
960b3c592913 (doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents: 85805
diff changeset
551 "Convert PDF-PS to PNG asynchronously."
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
552 (setq doc-view-current-converter-process
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
553 (apply 'start-process
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
554 (append (list "pdf/ps->png" doc-view-conversion-buffer
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
555 doc-view-ghostscript-program)
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
556 doc-view-ghostscript-options
86119
5b6715f2ee11 (doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86035
diff changeset
557 (list (format "-r%d" (round doc-view-resolution)))
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
558 (list (concat "-sOutputFile=" png))
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
559 (list pdf-ps)))
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
560 mode-line-process (list (format ":%s" doc-view-current-converter-process)))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
561 (process-put doc-view-current-converter-process
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
562 'buffer (current-buffer))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
563 (set-process-sentinel doc-view-current-converter-process
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
564 'doc-view-pdf/ps->png-sentinel)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
565 (when doc-view-conversion-refresh-interval
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
566 (setq doc-view-current-timer
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
567 (run-at-time "1 secs" doc-view-conversion-refresh-interval
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
568 'doc-view-display
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
569 buffer-file-name))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
570
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
571 (defun doc-view-pdf->txt-sentinel (proc event)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
572 (if (not (string-match "finished" event))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
573 (message "DocView: converter process changed status to %s." event)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
574 (let ((current-buffer (current-buffer))
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
575 (proc-buffer (process-get proc 'buffer)))
87133
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
576 (with-current-buffer proc-buffer
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
577 (setq doc-view-current-converter-process nil
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
578 mode-line-process nil)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
579 ;; If the user looks at the DocView buffer where the conversion was
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
580 ;; performed, search anew. This time it will be queried for a regexp.
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
581 (when (eq current-buffer proc-buffer)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
582 (doc-view-search nil))))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
583
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
584 (defun doc-view-pdf->txt (pdf txt)
85815
960b3c592913 (doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents: 85805
diff changeset
585 "Convert PDF to TXT asynchronously."
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
586 (setq doc-view-current-converter-process
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
587 (start-process "pdf->txt" doc-view-conversion-buffer
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
588 doc-view-pdftotext-program "-raw"
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
589 pdf txt)
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
590 mode-line-process (list (format ":%s" doc-view-current-converter-process)))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
591 (set-process-sentinel doc-view-current-converter-process
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
592 'doc-view-pdf->txt-sentinel)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
593 (process-put doc-view-current-converter-process 'buffer (current-buffer)))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
594
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
595 (defun doc-view-ps->pdf-sentinel (proc event)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
596 (if (not (string-match "finished" event))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
597 (message "DocView: converter process changed status to %s." event)
87133
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
598 (with-current-buffer (process-get proc 'buffer)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
599 (setq doc-view-current-converter-process nil
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
600 mode-line-process nil)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
601 ;; Now we can transform to plain text.
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
602 (doc-view-pdf->txt (process-get proc 'pdf-file)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
603 (expand-file-name "doc.txt"
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
604 (doc-view-current-cache-dir))))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
605
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
606 (defun doc-view-ps->pdf (ps pdf)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
607 "Convert PS to PDF asynchronously."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
608 (setq doc-view-current-converter-process
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
609 (start-process "ps->pdf" doc-view-conversion-buffer
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
610 doc-view-ps2pdf-program
85418
26dcc1207f42 (doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85369
diff changeset
611 ;; Avoid security problems when rendering files from
26dcc1207f42 (doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85369
diff changeset
612 ;; untrusted sources.
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
613 "-dSAFER"
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
614 ;; in-file and out-file
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
615 ps pdf)
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
616 mode-line-process (list (format ":%s" doc-view-current-converter-process)))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
617 (set-process-sentinel doc-view-current-converter-process
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
618 'doc-view-ps->pdf-sentinel)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
619 (process-put doc-view-current-converter-process 'buffer (current-buffer))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
620 (process-put doc-view-current-converter-process 'pdf-file pdf))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
621
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
622 (defun doc-view-convert-current-doc ()
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
623 "Convert `buffer-file-name' to a set of png files, one file per page.
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
624 Those files are saved in the directory given by the function
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
625 `doc-view-current-cache-dir'."
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
626 ;; Let stale files still display while we recompute the new ones, so only
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
627 ;; flush the cache when the conversion is over. One of the reasons why it
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
628 ;; is important to keep displaying the stale page is so that revert-buffer
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
629 ;; preserves the horizontal/vertical scroll settings (which are otherwise
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
630 ;; resets during the redisplay).
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
631 (setq doc-view-pending-cache-flush t)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
632 (let ((png-file (expand-file-name "page-%d.png"
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
633 (doc-view-current-cache-dir))))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
634 (make-directory (doc-view-current-cache-dir))
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
635 (if (not (string= (file-name-extension buffer-file-name) "dvi"))
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
636 ;; Convert to PNG images.
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
637 (doc-view-pdf/ps->png buffer-file-name png-file)
85367
1fbaddcbc4ec Mention xpdf. Fix spelling of Ghostscript.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85029
diff changeset
638 ;; DVI files have to be converted to PDF before Ghostscript can process
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
639 ;; it.
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
640 (doc-view-dvi->pdf buffer-file-name
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
641 (expand-file-name "doc.pdf"
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
642 doc-view-current-cache-dir)))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
643
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
644 ;;;; Slicing
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
645
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
646 (defun doc-view-set-slice (x y width height)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
647 "Set the slice of the images that should be displayed.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
648 You can use this function to tell doc-view not to display the
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
649 margins of the document. It prompts for the top-left corner (X
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
650 and Y) of the slice to display and its WIDTH and HEIGHT.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
651
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
652 See `doc-view-set-slice-using-mouse' for a more convenient way to
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
653 do that. To reset the slice use `doc-view-reset-slice'."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
654 (interactive
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
655 (let* ((size (image-size doc-view-current-image t))
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
656 (a (read-number (format "Top-left X (0..%d): " (car size))))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
657 (b (read-number (format "Top-left Y (0..%d): " (cdr size))))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
658 (c (read-number (format "Width (0..%d): " (- (car size) a))))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
659 (d (read-number (format "Height (0..%d): " (- (cdr size) b)))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
660 (list a b c d)))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
661 (setq doc-view-current-slice (list x y width height))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
662 ;; Redisplay
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
663 (doc-view-goto-page doc-view-current-page))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
664
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
665 (defun doc-view-set-slice-using-mouse ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
666 "Set the slice of the images that should be displayed.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
667 You set the slice by pressing mouse-1 at its top-left corner and
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
668 dragging it to its bottom-right corner. See also
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
669 `doc-view-set-slice' and `doc-view-reset-slice'."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
670 (interactive)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
671 (let (x y w h done)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
672 (while (not done)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
673 (let ((e (read-event
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
674 (concat "Press mouse-1 at the top-left corner and "
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
675 "drag it to the bottom-right corner!"))))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
676 (when (eq (car e) 'drag-mouse-1)
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
677 (setq x (car (posn-object-x-y (event-start e))))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
678 (setq y (cdr (posn-object-x-y (event-start e))))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
679 (setq w (- (car (posn-object-x-y (event-end e))) x))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
680 (setq h (- (cdr (posn-object-x-y (event-end e))) y))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
681 (setq done t))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
682 (doc-view-set-slice x y w h)))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
683
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
684 (defun doc-view-reset-slice ()
85029
63718012f1da (doc-view-dvi->pdf-sentinel, doc-view-reset-slice)
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 85027
diff changeset
685 "Reset the current slice.
85815
960b3c592913 (doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents: 85805
diff changeset
686 After calling this function whole pages will be visible again."
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
687 (interactive)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
688 (setq doc-view-current-slice nil)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
689 ;; Redisplay
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
690 (doc-view-goto-page doc-view-current-page))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
691
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
692 ;;;; Display
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
693
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
694 (defun doc-view-insert-image (file &rest args)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
695 "Insert the given png FILE.
85029
63718012f1da (doc-view-dvi->pdf-sentinel, doc-view-reset-slice)
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 85027
diff changeset
696 ARGS is a list of image descriptors."
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
697 (when doc-view-pending-cache-flush
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
698 (clear-image-cache)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
699 (setq doc-view-pending-cache-flush nil))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
700 (let ((image (apply 'create-image file 'png nil args)))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
701 (setq doc-view-current-image image)
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
702 (move-overlay doc-view-current-overlay (point-min) (point-max))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
703 (overlay-put doc-view-current-overlay 'display
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
704 (if doc-view-current-slice
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
705 (list (cons 'slice doc-view-current-slice) image)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
706 image))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
707
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
708 (defun doc-view-sort (a b)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
709 "Return non-nil if A should be sorted before B.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
710 Predicate for sorting `doc-view-current-files'."
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
711 (or (< (length a) (length b))
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
712 (and (= (length a) (length b))
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
713 (string< a b))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
714
87133
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
715 (defun doc-view-display (doc &optional force)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
716 "Start viewing the document DOC.
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
717 If FORCE is non-nil, start viewing even if the document does not
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
718 have the page we want to view."
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
719 (with-current-buffer (get-file-buffer doc)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
720 (setq doc-view-current-files
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
721 (sort (directory-files (doc-view-current-cache-dir) t
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
722 "page-[0-9]+\\.png" t)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
723 'doc-view-sort))
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
724 (when (or force
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
725 (>= (length doc-view-current-files)
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
726 (or doc-view-current-page 1)))
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
727 (doc-view-goto-page doc-view-current-page))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
728
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
729 (defun doc-view-buffer-message ()
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
730 ;; Only show this message initially, not when refreshing the buffer (in which
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
731 ;; case it's better to keep displaying the "stale" page while computing
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
732 ;; the fresh new ones).
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
733 (unless (overlay-get doc-view-current-overlay 'display)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
734 (overlay-put doc-view-current-overlay 'display
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
735 (concat (propertize "Welcome to DocView!" 'face 'bold)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
736 "\n"
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
737 "
85815
960b3c592913 (doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents: 85805
diff changeset
738 If you see this buffer it means that the document you want to view is being
85801
9b97166d0c6c (doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85784
diff changeset
739 converted to PNG and the conversion of the first page hasn't finished yet or
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
740 `doc-view-conversion-refresh-interval' is set to nil.
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
741
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
742 For now these keys are useful:
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
743
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
744 `q' : Bury this buffer. Conversion will go on in background.
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
745 `k' : Kill the conversion process and this buffer.
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
746 `K' : Kill the conversion process.\n"))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
747
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
748 (defun doc-view-show-tooltip ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
749 (interactive)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
750 (tooltip-show doc-view-current-info))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
751
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
752 ;;;;; Toggle between editing and viewing
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
753
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
754 (defun doc-view-toggle-display ()
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
755 "Toggle between editing a document as text or viewing it."
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
756 (interactive)
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
757 (if (eq major-mode 'doc-view-mode)
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
758 ;; Switch to editing mode
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
759 (progn
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
760 (doc-view-kill-proc)
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
761 (setq buffer-read-only nil)
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
762 (delete-overlay doc-view-current-overlay)
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
763 ;; Switch to the previously used major mode or fall back to fundamental
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
764 ;; mode.
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
765 (if doc-view-previous-major-mode
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
766 (funcall doc-view-previous-major-mode)
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
767 (fundamental-mode))
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
768 (doc-view-minor-mode 1))
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
769 ;; Switch to doc-view-mode
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
770 (when (and (buffer-modified-p)
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
771 (y-or-n-p "The buffer has been modified. Save the changes? "))
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
772 (save-buffer))
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
773 (doc-view-mode)))
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
774
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
775 ;;;; Searching
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
776
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
777 (defun doc-view-search-internal (regexp file)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
778 "Return a list of FILE's pages that contain text matching REGEXP.
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
779 The value is an alist of the form (PAGE CONTEXTS) where PAGE is
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
780 the pagenumber and CONTEXTS are all lines of text containing a match."
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
781 (with-temp-buffer
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
782 (insert-file-contents file)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
783 (let ((page 1)
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
784 (lastpage 1)
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
785 matches)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
786 (while (re-search-forward (concat "\\(?:\\([ ]\\)\\|\\("
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
787 regexp "\\)\\)") nil t)
87556
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
788 (when (match-string 1) (setq page (1+ page)))
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
789 (when (match-string 2)
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
790 (if (/= page lastpage)
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
791 (push (cons page
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
792 (list (buffer-substring
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
793 (line-beginning-position)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
794 (line-end-position))))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
795 matches)
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
796 (setq matches (cons
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
797 (append
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
798 (or
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
799 ;; This page already is a match.
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
800 (car matches)
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
801 ;; This is the first match on page.
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
802 (list page))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
803 (list (buffer-substring
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
804 (line-beginning-position)
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
805 (line-end-position))))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
806 (cdr matches))))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
807 (setq lastpage page)))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
808 (nreverse matches))))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
809
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
810 (defun doc-view-search-no-of-matches (list)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
811 "Extract the number of matches from the search result LIST."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
812 (let ((no 0))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
813 (dolist (p list)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
814 (setq no (+ no (1- (length p)))))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
815 no))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
816
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
817 (defun doc-view-search-backward (new-query)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
818 "Call `doc-view-search' for backward search.
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
819 If prefix NEW-QUERY is given, ask for a new regexp."
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
820 (interactive "P")
86156
d98fdcca854b * doc-view.el (doc-view-search-backward, doc-view-search): Fix
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86154
diff changeset
821 (doc-view-search new-query t))
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
822
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
823 (defun doc-view-search (new-query &optional backward)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
824 "Jump to the next match or initiate a new search if NEW-QUERY is given.
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
825 If the current document hasn't been transformed to plain text
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
826 till now do that first.
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
827 If BACKWARD is non-nil, jump to the previous match."
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
828 (interactive "P")
86156
d98fdcca854b * doc-view.el (doc-view-search-backward, doc-view-search): Fix
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86154
diff changeset
829 (if (and (not new-query)
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
830 doc-view-current-search-matches)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
831 (if backward
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
832 (doc-view-search-previous-match 1)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
833 (doc-view-search-next-match 1))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
834 ;; New search, so forget the old results.
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
835 (setq doc-view-current-search-matches nil)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
836 (let ((txt (expand-file-name "doc.txt"
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
837 (doc-view-current-cache-dir))))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
838 (if (file-readable-p txt)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
839 (progn
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
840 (setq doc-view-current-search-matches
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
841 (doc-view-search-internal
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
842 (read-from-minibuffer "Regexp: ")
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
843 txt))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
844 (message "DocView: search yielded %d matches."
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
845 (doc-view-search-no-of-matches
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
846 doc-view-current-search-matches)))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
847 ;; We must convert to TXT first!
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
848 (if doc-view-current-converter-process
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
849 (message "DocView: please wait till conversion finished.")
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
850 (let ((ext (file-name-extension buffer-file-name)))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
851 (cond
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
852 ((string= ext "pdf")
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
853 ;; Doc is a PDF, so convert it to TXT
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
854 (doc-view-pdf->txt buffer-file-name txt))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
855 ((string= ext "ps")
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
856 ;; Doc is a PS, so convert it to PDF (which will be converted to
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
857 ;; TXT thereafter).
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
858 (doc-view-ps->pdf buffer-file-name
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
859 (expand-file-name "doc.pdf"
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
860 (doc-view-current-cache-dir))))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
861 ((string= ext "dvi")
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
862 ;; Doc is a DVI. This means that a doc.pdf already exists in its
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
863 ;; cache subdirectory.
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
864 (doc-view-pdf->txt (expand-file-name "doc.pdf"
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
865 (doc-view-current-cache-dir))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
866 txt))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
867 (t (error "DocView doesn't know what to do")))))))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
868
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
869 (defun doc-view-search-next-match (arg)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
870 "Go to the ARGth next matching page."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
871 (interactive "p")
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
872 (let* ((next-pages (doc-view-remove-if
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
873 (lambda (i) (<= (car i) doc-view-current-page))
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
874 doc-view-current-search-matches))
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
875 (page (car (nth (1- arg) next-pages))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
876 (if page
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
877 (doc-view-goto-page page)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
878 (when (and
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
879 doc-view-current-search-matches
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
880 (y-or-n-p "No more matches after current page. Wrap to first match? "))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
881 (doc-view-goto-page (caar doc-view-current-search-matches))))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
882
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
883 (defun doc-view-search-previous-match (arg)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
884 "Go to the ARGth previous matching page."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
885 (interactive "p")
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
886 (let* ((prev-pages (doc-view-remove-if
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
887 (lambda (i) (>= (car i) doc-view-current-page))
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
888 doc-view-current-search-matches))
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
889 (page (car (nth (1- arg) (nreverse prev-pages)))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
890 (if page
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
891 (doc-view-goto-page page)
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
892 (when (and
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
893 doc-view-current-search-matches
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
894 (y-or-n-p "No more matches before current page. Wrap to last match? "))
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
895 (doc-view-goto-page (caar (last doc-view-current-search-matches)))))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
896
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
897 ;;;; User interface commands and the mode
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
898
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
899 ;; (put 'doc-view-mode 'mode-class 'special)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
900
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
901 (defun doc-view-initiate-display ()
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
902 ;; Switch to image display if possible
87006
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
903 (if (doc-view-mode-p (intern (file-name-extension buffer-file-name)))
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
904 (progn
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
905 (doc-view-buffer-message)
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
906 (setq doc-view-current-page (or doc-view-current-page 1))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
907 (if (file-exists-p (doc-view-current-cache-dir))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
908 (progn
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
909 (message "DocView: using cached files!")
87133
a99e0ba48aeb (doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87006
diff changeset
910 (doc-view-display buffer-file-name 'force))
85805
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
911 (doc-view-convert-current-doc))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
912 (message
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
913 "%s"
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
914 (substitute-command-keys
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
915 (concat "Type \\[doc-view-toggle-display] to toggle between "
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
916 "editing or viewing the document."))))
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
917 (message
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
918 "%s"
1d1d43e36948 Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85801
diff changeset
919 (substitute-command-keys
87006
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
920 (concat "No image (png) support available or some conversion utility for "
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
921 (file-name-extension buffer-file-name)" files is missing. "
a15ce3ca213a (doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 86441
diff changeset
922 "Type \\[doc-view-toggle-display] to switch to an editing mode.")))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
923
87556
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
924 (defvar bookmark-make-cell-function)
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
925
85027
06c04cf43e80 (doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents: 84450
diff changeset
926 ;;;###autoload
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
927 (defun doc-view-mode ()
85369
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
928 "Major mode in DocView buffers.
5b96a46cc08a * bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents: 85367
diff changeset
929 You can use \\<doc-view-mode-map>\\[doc-view-toggle-display] to
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
930 toggle between displaying the document or editing it as text."
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
931 (interactive)
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
932 (if jka-compr-really-do-compress
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
933 ;; This is a compressed file uncompressed by auto-compression-mode.
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
934 (when (y-or-n-p (concat "DocView: Cannot convert compressed file. "
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
935 "Save it uncompressed first? "))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
936 (let ((file (read-file-name
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
937 "File: "
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
938 (file-name-directory buffer-file-name))))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
939 (write-region (point-min) (point-max) file)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
940 (kill-buffer nil)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
941 (find-file file)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
942 (doc-view-mode)))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
943 (let* ((prev-major-mode (if (eq major-mode 'doc-view-mode)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
944 doc-view-previous-major-mode
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
945 major-mode)))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
946 (kill-all-local-variables)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
947 (set (make-local-variable 'doc-view-previous-major-mode) prev-major-mode))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
948 (make-local-variable 'doc-view-current-files)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
949 (make-local-variable 'doc-view-current-image)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
950 (make-local-variable 'doc-view-current-page)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
951 (make-local-variable 'doc-view-current-converter-process)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
952 (make-local-variable 'doc-view-current-timer)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
953 (make-local-variable 'doc-view-current-slice)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
954 (make-local-variable 'doc-view-current-cache-dir)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
955 (make-local-variable 'doc-view-current-info)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
956 (make-local-variable 'doc-view-current-search-matches)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
957 (set (make-local-variable 'doc-view-current-overlay)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
958 (make-overlay (point-min) (point-max) nil t))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
959 (add-hook 'change-major-mode-hook
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
960 (lambda () (delete-overlay doc-view-current-overlay))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
961 nil t)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
962 (set (make-local-variable 'mode-line-position)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
963 '(" P" (:eval (number-to-string doc-view-current-page))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
964 "/" (:eval (number-to-string (length doc-view-current-files)))))
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
965 (set (make-local-variable 'cursor-type) nil)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
966 (use-local-map doc-view-mode-map)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
967 (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc)
87411
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
968 (set (make-local-variable 'bookmark-make-cell-function)
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
969 'doc-view-bookmark-make-cell)
86025
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
970 (setq mode-name "DocView"
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
971 buffer-read-only t
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
972 major-mode 'doc-view-mode)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
973 (doc-view-initiate-display)
19784f7db0ef (doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents: 85856
diff changeset
974 (run-mode-hooks 'doc-view-mode-hook)))
85784
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
975
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
976 ;;;###autoload
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
977 (define-minor-mode doc-view-minor-mode
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
978 "Toggle Doc view minor mode.
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
979 With arg, turn Doc view minor mode on if arg is positive, off otherwise.
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
980 See the command `doc-view-mode' for more information on this mode."
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
981 nil " DocView" doc-view-minor-mode-map
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
982 :group 'doc-view
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
983 (when doc-view-minor-mode
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
984 (add-hook 'change-major-mode-hook (lambda () (doc-view-minor-mode -1)) nil t)
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
985 (message
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
986 "%s"
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
987 (substitute-command-keys
b0dc7772c4dc Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents: 85444
diff changeset
988 "Type \\[doc-view-toggle-display] to toggle between editing or viewing the document."))))
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
989
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
990 (defun doc-view-clear-cache ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
991 "Delete the whole cache (`doc-view-cache-directory')."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
992 (interactive)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
993 (dired-delete-file doc-view-cache-directory 'always)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
994 (make-directory doc-view-cache-directory))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
995
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
996 (defun doc-view-dired-cache ()
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
997 "Open `dired' in `doc-view-cache-directory'."
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
998 (interactive)
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
999 (dired doc-view-cache-directory))
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
1000
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
1001
87411
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1002 ;;;; Bookmark integration
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1003
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1004 (defun doc-view-bookmark-make-cell (annotation &rest args)
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1005 (let ((the-record
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1006 `((filename . ,(buffer-file-name))
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1007 (page . ,doc-view-current-page)
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1008 (handler . doc-view-bookmark-jump))))
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1009
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1010 ;; Take no chances with text properties
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1011 (set-text-properties 0 (length annotation) nil annotation)
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1012
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1013 (when annotation
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1014 (nconc the-record (list (cons 'annotation annotation))))
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1015
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1016 ;; Finally, return the completed record.
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1017 the-record))
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1018
87556
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1019
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1020 (declare-function bookmark-get-filename "bookmark" (bookmark))
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1021 (declare-function bookmark-get-bookmark-record "bookmark" (bookmark))
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1022
87411
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1023 ;;;###autoload
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1024 (defun doc-view-bookmark-jump (bmk)
87521
0140d3ebb262 Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents: 87412
diff changeset
1025 ;; This implements the `handler' function interface for record type
0140d3ebb262 Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents: 87412
diff changeset
1026 ;; returned by `bookmark-make-cell-function', which see.
87411
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1027 (save-window-excursion
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1028 (let ((filename (bookmark-get-filename bmk))
87412
f6ce12419345 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87411
diff changeset
1029 (page (cdr (assq 'page (bookmark-get-bookmark-record bmk)))))
87411
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1030 (find-file filename)
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1031 (when (not (eq major-mode 'doc-view-mode))
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1032 (doc-view-toggle-display))
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1033 (doc-view-goto-page page)
87521
0140d3ebb262 Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents: 87412
diff changeset
1034 `((buffer ,(current-buffer)) (position ,1)))))
87411
9ac481bc897b 2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents: 87133
diff changeset
1035
87556
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1036
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1037 (provide 'doc-view)
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1038
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1039 ;; Local Variables:
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1040 ;; mode: outline-minor
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1041 ;; End:
39204305bf6f (doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents: 87522
diff changeset
1042
87522
818b4291c99a Add arch tagline
Miles Bader <miles@gnu.org>
parents: 87521
diff changeset
1043 ;; arch-tag: 5d6e5c5e-095f-489e-b4e4-1ca90a7d79be
84422
67c730c1c685 Initial revision
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
diff changeset
1044 ;;; doc-view.el ends here