Mercurial > emacs
annotate lisp/doc-view.el @ 92998:98176f05203c
*** empty log message ***
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Sun, 16 Mar 2008 01:53:42 +0000 |
parents | 4486b0175a46 |
children | c378e060aab3 |
rev | line source |
---|---|
84422 | 1 ;;; doc-view.el --- View PDF/PostScript/DVI files in Emacs |
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 | 4 ;; |
5 ;; Author: Tassilo Horn <tassilo@member.fsf.org> | |
6 ;; Maintainer: Tassilo Horn <tassilo@member.fsf.org> | |
7 ;; Keywords: files, pdf, ps, dvi | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 3, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
24 ;; Boston, MA 02110-1301, USA. | |
25 | |
26 ;;; Requirements: | |
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 | 31 |
32 ;;; Commentary: | |
33 | |
34 ;; DocView is a document viewer for Emacs. It converts PDF, PS and DVI files | |
35 ;; to a set of PNG files, one PNG for each page, and displays the PNG images | |
36 ;; inside an Emacs buffer. This buffer uses `doc-view-mode' which provides | |
37 ;; convenient key bindings for browsing the document. | |
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 | 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 | 46 ;; |
47 ;; Since conversion may take some time all the PNG images are cached in a | |
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 | 51 ;; `doc-view-clear-cache'. To open the cache with dired, so that you can tidy |
52 ;; it out use `doc-view-dired-cache'. | |
53 ;; | |
54 ;; When conversion in underway the first page will be displayed as soon as it | |
55 ;; is available and the available pages are refreshed every | |
56 ;; `doc-view-conversion-refresh-interval' seconds. If that variable is nil the | |
57 ;; pages won't be displayed before conversion of the document finished | |
58 ;; completely. | |
59 ;; | |
60 ;; DocView lets you select a slice of the displayed pages. This slice will be | |
61 ;; remembered and applied to all pages of the current document. This enables | |
62 ;; you to cut away the margins of a document to save some space. To select a | |
63 ;; slice you can use `doc-view-set-slice' (bound to `s s') which will query you | |
64 ;; for the coordinates of the slice's top-left corner and its width and height. | |
65 ;; A much more convenient way to do the same is offered by the command | |
66 ;; `doc-view-set-slice-using-mouse' (bound to `s m'). After invokation you | |
67 ;; only have to press mouse-1 at the top-left corner and drag it to the | |
68 ;; bottom-right corner of the desired slice. To reset the slice use | |
69 ;; `doc-view-reset-slice' (bound to `s r'). | |
70 ;; | |
71 ;; You can also search within the document. The command `doc-view-search' | |
72 ;; (bound to `C-s') queries for a search regexp and initializes a list of all | |
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 | 86 |
87 ;;; Configuration: | |
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 | 92 ;; |
93 ;; This and all other options can be set with the customization interface. | |
94 ;; Simply do | |
95 ;; | |
96 ;; M-x customize-group RET doc-view RET | |
97 ;; | |
98 ;; and modify them to your needs. | |
99 | |
86035
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
100 ;;; Todo: |
84422 | 101 |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
102 ;; - add print command. |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
103 ;; - share more code with image-mode. |
85801
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
104 ;; - 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
|
105 ;; - Bind slicing to a drag event. |
92759
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
106 ;; - doc-view-fit-doc-to-window and doc-view-fit-window-to-doc? |
87842
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
107 ;; - zoom 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
|
108 ;; - 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
|
109 ;; - 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
|
110 |
86035
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
111 ;;;; About isearch support |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
112 |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
113 ;; I tried implementing isearch by setting |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
114 ;; `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
|
115 ;; 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
|
116 ;; 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
|
117 ;; 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
|
118 ;; 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
|
119 ;; 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
|
120 ;; 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
|
121 ;; 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
|
122 ;; 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
|
123 ;; 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
|
124 ;; (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
|
125 |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
126 ;; 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
|
127 ;; 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
|
128 ;; 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
|
129 ;; pages to jump. |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
130 |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
131 ;; 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
|
132 ;; feel free to do it. --Tassilo |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
133 |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
134 ;;; Code: |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
135 |
84422 | 136 (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
|
137 (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
|
138 (require 'jka-compr) |
84422 | 139 |
140 ;;;; Customization Options | |
141 | |
142 (defgroup doc-view nil | |
143 "In-buffer viewer for PDF, PostScript and DVI files." | |
144 :link '(function-link doc-view) | |
145 :version "22.2" | |
146 :group 'applications | |
147 :group 'multimedia | |
148 :prefix "doc-view-") | |
149 | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
150 (defcustom doc-view-ghostscript-program (executable-find "gs") |
84422 | 151 "Program to convert PS and PDF files to PNG." |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
152 :type 'file |
84422 | 153 :group 'doc-view) |
154 | |
155 (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
|
156 '("-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
|
157 ;; sources. |
26dcc1207f42
(doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85369
diff
changeset
|
158 "-dNOPAUSE" "-sDEVICE=png16m" "-dTextAlphaBits=4" |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
159 "-dBATCH" "-dGraphicsAlphaBits=4" "-dQUIET") |
85367
1fbaddcbc4ec
Mention xpdf. Fix spelling of Ghostscript.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85029
diff
changeset
|
160 "A list of options to give to ghostscript." |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
161 :type '(repeat string) |
84422 | 162 :group 'doc-view) |
163 | |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
164 (defcustom doc-view-resolution 100 |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
165 "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
|
166 Higher values result in larger images." |
86154 | 167 :type 'number |
168 :group 'doc-view) | |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
169 |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
170 (defcustom doc-view-dvipdfm-program (executable-find "dvipdfm") |
84422 | 171 "Program to convert DVI files to PDF. |
172 | |
173 DVI file will be converted to PDF before the resulting PDF is | |
174 converted to PNG." | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
175 :type 'file |
84422 | 176 :group 'doc-view) |
177 | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
178 (defcustom doc-view-ps2pdf-program (executable-find "ps2pdf") |
84422 | 179 "Program to convert PS files to PDF. |
180 | |
181 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
|
182 :type 'file |
84422 | 183 :group 'doc-view) |
184 | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
185 (defcustom doc-view-pdftotext-program (executable-find "pdftotext") |
84422 | 186 "Program to convert PDF files to plain text. |
187 | |
188 Needed for searching." | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
189 :type 'file |
84422 | 190 :group 'doc-view) |
191 | |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
192 (defcustom doc-view-cache-directory |
85856
a26944b15c75
(doc-view-cache-directory): Remove superfluous concat.
Glenn Morris <rgm@gnu.org>
parents:
85844
diff
changeset
|
193 (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
|
194 temporary-file-directory) |
84422 | 195 "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
|
196 :type 'directory |
84422 | 197 :group 'doc-view) |
198 | |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
199 (defvar doc-view-conversion-buffer " *doc-view conversion output*" |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
200 "The buffer where messages from the converter programs go to.") |
84422 | 201 |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
202 (defcustom doc-view-conversion-refresh-interval 1 |
85815
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
203 "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
|
204 After such a refresh newly converted pages will be available for |
84422 | 205 viewing. If set to nil there won't be any refreshes and the |
206 pages won't be displayed before conversion of the whole document | |
207 has finished." | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
208 :type 'integer |
84422 | 209 :group 'doc-view) |
210 | |
211 ;;;; Internal Variables | |
212 | |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
213 (defun doc-view-new-window-function (winprops) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
214 (let ((ol (image-mode-window-get 'overlay winprops))) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
215 (if ol |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
216 (setq ol (copy-overlay ol)) |
92759
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
217 (assert (not (get-char-property (point-min) 'display (car winprops)))) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
218 (setq ol (make-overlay (point-min) (point-max) nil t)) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
219 (overlay-put ol 'doc-view t)) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
220 (overlay-put ol 'window (car winprops)) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
221 (image-mode-window-put 'overlay ol winprops))) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
222 |
84422 | 223 (defvar doc-view-current-files nil |
224 "Only used internally.") | |
225 | |
226 (defvar doc-view-current-converter-process nil | |
227 "Only used internally.") | |
228 | |
229 (defvar doc-view-current-timer nil | |
230 "Only used internally.") | |
231 | |
232 (defvar doc-view-current-cache-dir nil | |
233 "Only used internally.") | |
234 | |
235 (defvar doc-view-current-search-matches nil | |
236 "Only used internally.") | |
237 | |
87006
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
238 (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
|
239 "Only used internally.") |
84422 | 240 |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
241 (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
|
242 "Only used internally.") |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
243 |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
244 (defvar doc-view-buffer-file-name nil |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
245 "Only used internally. |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
246 The file name used for conversion. Normally it's the same as |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
247 `buffer-file-name', but for remote files, compressed files and |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
248 files inside an archive it is a temporary copy of |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
249 the (uncompressed, extracted) file residing in |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
250 `doc-view-cache-directory'.") |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
251 |
92759
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
252 (defvar doc-view-doc-type nil |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
253 "The type of document in the current buffer. |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
254 Can be `dvi', `pdf', or `ps'.") |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
255 |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
256 ;;;; DocView Keymaps |
84422 | 257 |
258 (defvar doc-view-mode-map | |
259 (let ((map (make-sparse-keymap))) | |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
260 (suppress-keymap map) |
84422 | 261 ;; Navigation in the document |
262 (define-key map (kbd "n") 'doc-view-next-page) | |
263 (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
|
264 (define-key map (kbd "<next>") 'forward-page) |
a3364ed63fcd
(doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85421
diff
changeset
|
265 (define-key map (kbd "<prior>") 'backward-page) |
a3364ed63fcd
(doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85421
diff
changeset
|
266 (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
|
267 (define-key map [remap backward-page] 'doc-view-previous-page) |
84422 | 268 (define-key map (kbd "SPC") 'doc-view-scroll-up-or-next-page) |
269 (define-key map (kbd "DEL") 'doc-view-scroll-down-or-previous-page) | |
270 (define-key map (kbd "M-<") 'doc-view-first-page) | |
271 (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
|
272 (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
|
273 (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
|
274 (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
|
275 ;; Zoom in/out. |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
276 (define-key map "+" 'doc-view-enlarge) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
277 (define-key map "-" 'doc-view-shrink) |
84422 | 278 ;; Killing/burying the buffer (and the process) |
279 (define-key map (kbd "q") 'bury-buffer) | |
280 (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
|
281 (define-key map (kbd "K") 'doc-view-kill-proc) |
84422 | 282 ;; Slicing the image |
283 (define-key map (kbd "s s") 'doc-view-set-slice) | |
284 (define-key map (kbd "s m") 'doc-view-set-slice-using-mouse) | |
285 (define-key map (kbd "s r") 'doc-view-reset-slice) | |
286 ;; Searching | |
287 (define-key map (kbd "C-s") 'doc-view-search) | |
288 (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
|
289 (define-key map (kbd "C-r") 'doc-view-search-backward) |
84422 | 290 ;; Scrolling |
85444
a3364ed63fcd
(doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85421
diff
changeset
|
291 (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
|
292 (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
|
293 (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
|
294 (define-key map [remap previous-line] 'image-previous-line) |
84422 | 295 ;; Show the tooltip |
296 (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
|
297 ;; 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
|
298 (define-key map (kbd "C-c C-c") 'doc-view-toggle-display) |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
299 ;; Open a new buffer with doc's text contents |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
300 (define-key map (kbd "C-c C-t") 'doc-view-open-text) |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
301 ;; 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
|
302 (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
|
303 (define-key map (kbd "r") 'revert-buffer) |
84422 | 304 map) |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
305 "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
|
306 |
85801
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
307 (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
|
308 "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
|
309 '("DocView" |
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
310 ["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
|
311 ["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
|
312 ["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
|
313 "---" |
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
314 ["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
|
315 ["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
|
316 ["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
|
317 )) |
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
318 |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
319 (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
|
320 (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
|
321 ;; 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
|
322 (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
|
323 map) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
324 "Keymap used by `doc-minor-view-mode'.") |
84422 | 325 |
326 ;;;; Navigation Commands | |
327 | |
92224
5f0de7ccefc4
(doc-view-current-page): Add a `win' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92220
diff
changeset
|
328 (defmacro doc-view-current-page (&optional win) |
5f0de7ccefc4
(doc-view-current-page): Add a `win' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92220
diff
changeset
|
329 `(image-mode-window-get 'page ,win)) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
330 (defmacro doc-view-current-info () `(image-mode-window-get 'info)) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
331 (defmacro doc-view-current-overlay () `(image-mode-window-get 'overlay)) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
332 (defmacro doc-view-current-image () `(image-mode-window-get 'image)) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
333 (defmacro doc-view-current-slice () `(image-mode-window-get 'slice)) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
334 |
84422 | 335 (defun doc-view-goto-page (page) |
336 "View the page given by PAGE." | |
337 (interactive "nPage: ") | |
338 (let ((len (length doc-view-current-files))) | |
339 (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
|
340 (setq page 1) |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
341 (when (and (> page len) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
342 ;; As long as the converter is running, we don't know |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
343 ;; how many pages will be available. |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
344 (null 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
|
345 (setq page len))) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
346 (setf (doc-view-current-page) page |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
347 (doc-view-current-info) |
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
|
348 (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
|
349 (propertize |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
350 (format "Page %d of %d." page len) 'face 'bold) |
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
|
351 ;; 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
|
352 (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
|
353 " (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
|
354 "\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
|
355 ;; 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
|
356 (when (and doc-view-current-search-matches |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
357 (assq page 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
|
358 (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
|
359 (let ((contexts "")) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
360 (dolist (m (cdr (assq 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
|
361 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
|
362 (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
|
363 contexts))))) |
84422 | 364 ;; Update the buffer |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
365 ;; We used to find the file name from doc-view-current-files but |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
366 ;; that's not right if the pages are not generated sequentially |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
367 ;; or if the page isn't in doc-view-current-files yet. |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
368 (doc-view-insert-image (expand-file-name (format "page-%d.png" page) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
369 (doc-view-current-cache-dir)) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
370 :pointer 'arrow) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
371 (overlay-put (doc-view-current-overlay) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
372 'help-echo (doc-view-current-info)))) |
84422 | 373 |
374 (defun doc-view-next-page (&optional arg) | |
375 "Browse ARG pages forward." | |
376 (interactive "p") | |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
377 (doc-view-goto-page (+ (doc-view-current-page) (or arg 1)))) |
84422 | 378 |
379 (defun doc-view-previous-page (&optional arg) | |
380 "Browse ARG pages backward." | |
381 (interactive "p") | |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
382 (doc-view-goto-page (- (doc-view-current-page) (or arg 1)))) |
84422 | 383 |
384 (defun doc-view-first-page () | |
385 "View the first page." | |
386 (interactive) | |
387 (doc-view-goto-page 1)) | |
388 | |
389 (defun doc-view-last-page () | |
390 "View the last page." | |
391 (interactive) | |
392 (doc-view-goto-page (length doc-view-current-files))) | |
393 | |
394 (defun doc-view-scroll-up-or-next-page () | |
395 "Scroll page up if possible, else goto next page." | |
396 (interactive) | |
87572
0e44918a91f4
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87556
diff
changeset
|
397 (when (= (window-vscroll) (image-scroll-up nil)) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
398 (let ((cur-page (doc-view-current-page))) |
87580
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
399 (doc-view-next-page) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
400 (when (/= cur-page (doc-view-current-page)) |
87580
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
401 (set-window-vscroll nil 0))))) |
84422 | 402 |
403 (defun doc-view-scroll-down-or-previous-page () | |
404 "Scroll page down if possible, else goto previous page." | |
405 (interactive) | |
87572
0e44918a91f4
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87556
diff
changeset
|
406 (when (= (window-vscroll) (image-scroll-down nil)) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
407 (let ((cur-page (doc-view-current-page))) |
87580
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
408 (doc-view-previous-page) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
409 (when (/= cur-page (doc-view-current-page)) |
87580
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
410 (image-scroll-up nil))))) |
84422 | 411 |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
412 ;;;; Utility Functions |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
413 |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
414 (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
|
415 "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
|
416 (interactive) |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
417 (when doc-view-current-converter-process |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
418 (ignore-errors ;; Maybe it's dead already? |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
419 (kill-process doc-view-current-converter-process)) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
420 (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
|
421 (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
|
422 (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
|
423 (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
|
424 (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
|
425 |
84422 | 426 (defun doc-view-kill-proc-and-buffer () |
427 "Kill the current converter process and buffer." | |
428 (interactive) | |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
429 (doc-view-kill-proc) |
84422 | 430 (when (eq major-mode 'doc-view-mode) |
431 (kill-buffer (current-buffer)))) | |
432 | |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
433 (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
|
434 (condition-case nil |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
435 (let ((umask (default-file-modes))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
436 (unwind-protect |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
437 (progn |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
438 ;; 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
|
439 ;; 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
|
440 ;; time-window of loose permissions otherwise. |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
441 (set-default-file-modes #o0700) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
442 (make-directory dir)) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
443 ;; Reset the umask. |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
444 (set-default-file-modes umask))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
445 (file-already-exists |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
446 (if (file-symlink-p dir) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
447 (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
|
448 ;; 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
|
449 ;; 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
|
450 ;; 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
|
451 ;; 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
|
452 ;; 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
|
453 ;; 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
|
454 ;; 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
|
455 ;; closing a bunch of security holes. |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
456 (set-file-modes dir #o0700)))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
457 |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
458 (defun doc-view-current-cache-dir () |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
459 "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
|
460 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
|
461 (if doc-view-current-cache-dir |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
462 doc-view-current-cache-dir |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
463 ;; 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
|
464 (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
|
465 ;; Now compute the subdirectory to use. |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
466 (setq doc-view-current-cache-dir |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
467 (file-name-as-directory |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
468 (expand-file-name |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
469 (concat (file-name-nondirectory buffer-file-name) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
470 "-" |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
471 (let ((file doc-view-buffer-file-name)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
472 (with-temp-buffer |
92760
0275e742e0a1
(doc-view-current-cache-dir): Set buffer used for
Tassilo Horn <tassilo@member.fsf.org>
parents:
92759
diff
changeset
|
473 (set-buffer-multibyte nil) |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
474 (insert-file-contents-literally file) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
475 (md5 (current-buffer))))) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
476 doc-view-cache-directory))))) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
477 |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
478 (defun doc-view-remove-if (predicate list) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
479 "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
|
480 (let (new-list) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
481 (dolist (item list (nreverse new-list)) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
482 (when (not (funcall predicate item)) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
483 (setq new-list (cons item new-list)))))) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
484 |
86441
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
485 ;;;###autoload |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
486 (defun doc-view-mode-p (type) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
487 "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
|
488 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
|
489 (and (display-graphic-p) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
490 (image-type-available-p 'png) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
491 (cond |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
492 ((eq type 'dvi) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
493 (and (doc-view-mode-p 'pdf) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
494 doc-view-dvipdfm-program |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
495 (executable-find doc-view-dvipdfm-program))) |
87681
92ee34bb9001
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87580
diff
changeset
|
496 ((or (eq type 'postscript) (eq type 'ps) (eq type 'eps) |
86441
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
497 (eq type 'pdf)) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
498 (and doc-view-ghostscript-program |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
499 (executable-find doc-view-ghostscript-program))) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
500 (t ;; unknown image type |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
501 nil)))) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
502 |
84422 | 503 ;;;; Conversion Functions |
504 | |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
505 (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
|
506 |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
507 (defun doc-view-enlarge (factor) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
508 "Enlarge the document." |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
509 (interactive (list doc-view-shrink-factor)) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
510 (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
|
511 (* factor doc-view-resolution)) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
512 (doc-view-reconvert-doc)) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
513 |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
514 (defun doc-view-shrink (factor) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
515 "Shrink the document." |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
516 (interactive (list doc-view-shrink-factor)) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
517 (doc-view-enlarge (/ 1.0 factor))) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
518 |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
519 (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
|
520 "Reconvert the current document. |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
521 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
|
522 (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
|
523 (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
|
524 ;; 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
|
525 (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
|
526 (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
|
527 (doc-view-initiate-display)) |
84422 | 528 |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
529 (defun doc-view-sentinel (proc event) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
530 "Generic sentinel for doc-view conversion processes." |
84422 | 531 (if (not (string-match "finished" event)) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
532 (message "DocView: process %s changed status to %s." |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
533 (process-name proc) event) |
87133
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
534 (with-current-buffer (process-get proc 'buffer) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
535 (setq doc-view-current-converter-process nil |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
536 mode-line-process nil) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
537 (funcall (process-get proc 'callback))))) |
84422 | 538 |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
539 (defun doc-view-dvi->pdf (dvi pdf callback) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
540 "Convert DVI to PDF asynchronously and call CALLBACK when finished." |
84422 | 541 (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
|
542 (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
|
543 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
|
544 "-o" pdf dvi) |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
545 mode-line-process (list (format ":%s" doc-view-current-converter-process))) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
546 (set-process-sentinel doc-view-current-converter-process 'doc-view-sentinel) |
84422 | 547 (process-put doc-view-current-converter-process 'buffer (current-buffer)) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
548 (process-put doc-view-current-converter-process 'callback callback)) |
84422 | 549 |
550 (defun doc-view-pdf/ps->png-sentinel (proc event) | |
551 "If PDF/PS->PNG conversion was successful, update the display." | |
552 (if (not (string-match "finished" event)) | |
553 (message "DocView: converter process changed status to %s." event) | |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
554 ;; FIXME: kill the process if we kill the buffer? |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
555 (when (buffer-live-p (process-get proc 'buffer)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
556 (with-current-buffer (process-get proc 'buffer) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
557 (setq doc-view-current-converter-process nil |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
558 mode-line-process nil) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
559 (when doc-view-current-timer |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
560 (cancel-timer doc-view-current-timer) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
561 (setq doc-view-current-timer nil)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
562 ;; Yippie, finished. Update the display! |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
563 (doc-view-display (current-buffer) 'force))))) |
84422 | 564 |
565 (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
|
566 "Convert PDF-PS to PNG asynchronously." |
84422 | 567 (setq doc-view-current-converter-process |
87842
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
568 ;; Make sure the process is started in an existing directory, |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
569 ;; (rather than some file-name-handler-managed dir, for example). |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
570 (let ((default-directory (file-name-directory pdf-ps))) |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
571 (apply 'start-process |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
572 (append (list "pdf/ps->png" doc-view-conversion-buffer |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
573 doc-view-ghostscript-program) |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
574 doc-view-ghostscript-options |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
575 (list (format "-r%d" (round doc-view-resolution))) |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
576 (list (concat "-sOutputFile=" png)) |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
577 (list pdf-ps)))) |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
578 mode-line-process (list (format ":%s" doc-view-current-converter-process))) |
84422 | 579 (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
|
580 'buffer (current-buffer)) |
84422 | 581 (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
|
582 'doc-view-pdf/ps->png-sentinel) |
84422 | 583 (when doc-view-conversion-refresh-interval |
584 (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
|
585 (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
|
586 'doc-view-display |
91789
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
587 (current-buffer))))) |
84422 | 588 |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
589 (defun doc-view-pdf->txt (pdf txt callback) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
590 "Convert PDF to TXT asynchronously and call CALLBACK when finished." |
84422 | 591 (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
|
592 (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
|
593 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
|
594 pdf txt) |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
595 mode-line-process (list (format ":%s" doc-view-current-converter-process))) |
84422 | 596 (set-process-sentinel doc-view-current-converter-process |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
597 'doc-view-sentinel) |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
598 (process-put doc-view-current-converter-process 'buffer (current-buffer)) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
599 (process-put doc-view-current-converter-process 'callback callback)) |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
600 |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
601 (defun doc-view-doc->txt (txt callback) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
602 "Convert the current document to text and call CALLBACK when done." |
92879
4486b0175a46
(doc-view-doc->txt, doc-view-convert-current-doc):
Tassilo Horn <tassilo@member.fsf.org>
parents:
92763
diff
changeset
|
603 (unless (file-exists-p (doc-view-current-cache-dir)) |
4486b0175a46
(doc-view-doc->txt, doc-view-convert-current-doc):
Tassilo Horn <tassilo@member.fsf.org>
parents:
92763
diff
changeset
|
604 (make-directory (doc-view-current-cache-dir))) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
605 (case doc-view-doc-type |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
606 (pdf |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
607 ;; Doc is a PDF, so convert it to TXT |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
608 (doc-view-pdf->txt doc-view-buffer-file-name txt callback)) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
609 (ps |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
610 ;; Doc is a PS, so convert it to PDF (which will be converted to |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
611 ;; TXT thereafter). |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
612 (lexical-let ((pdf (expand-file-name "doc.pdf" |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
613 (doc-view-current-cache-dir))) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
614 (txt txt) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
615 (callback callback)) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
616 (doc-view-ps->pdf doc-view-buffer-file-name pdf |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
617 (lambda () (doc-view-pdf->txt pdf txt callback))))) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
618 (dvi |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
619 ;; Doc is a DVI. This means that a doc.pdf already exists in its |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
620 ;; cache subdirectory. |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
621 (doc-view-pdf->txt (expand-file-name "doc.pdf" |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
622 (doc-view-current-cache-dir)) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
623 txt callback)) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
624 (t (error "DocView doesn't know what to do")))) |
84422 | 625 |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
626 (defun doc-view-ps->pdf (ps pdf callback) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
627 "Convert PS to PDF asynchronously and call CALLBACK when finished." |
84422 | 628 (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
|
629 (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
|
630 doc-view-ps2pdf-program |
85418
26dcc1207f42
(doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85369
diff
changeset
|
631 ;; 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
|
632 ;; untrusted sources. |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
633 "-dSAFER" |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
634 ;; in-file and out-file |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
635 ps pdf) |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
636 mode-line-process (list (format ":%s" doc-view-current-converter-process))) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
637 (set-process-sentinel doc-view-current-converter-process 'doc-view-sentinel) |
84422 | 638 (process-put doc-view-current-converter-process 'buffer (current-buffer)) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
639 (process-put doc-view-current-converter-process 'callback callback)) |
84422 | 640 |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
641 (defun doc-view-convert-current-doc () |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
642 "Convert `doc-view-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
|
643 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
|
644 `doc-view-current-cache-dir'." |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
645 ;; 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
|
646 ;; 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
|
647 ;; 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
|
648 ;; 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
|
649 ;; resets during the redisplay). |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
650 (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
|
651 (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
|
652 (doc-view-current-cache-dir)))) |
92879
4486b0175a46
(doc-view-doc->txt, doc-view-convert-current-doc):
Tassilo Horn <tassilo@member.fsf.org>
parents:
92763
diff
changeset
|
653 (unless (file-exists-p (doc-view-current-cache-dir)) |
4486b0175a46
(doc-view-doc->txt, doc-view-convert-current-doc):
Tassilo Horn <tassilo@member.fsf.org>
parents:
92763
diff
changeset
|
654 (make-directory (doc-view-current-cache-dir))) |
92759
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
655 (case doc-view-doc-type |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
656 (dvi |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
657 ;; DVI files have to be converted to PDF before Ghostscript can process |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
658 ;; it. |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
659 (lexical-let |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
660 ((pdf (expand-file-name "doc.pdf" doc-view-current-cache-dir)) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
661 (png-file png-file)) |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
662 (doc-view-dvi->pdf doc-view-buffer-file-name pdf |
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
663 (lambda () (doc-view-pdf/ps->png pdf png-file))))) |
92759
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
664 (t |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
665 ;; Convert to PNG images. |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
666 (doc-view-pdf/ps->png doc-view-buffer-file-name png-file))))) |
84422 | 667 |
668 ;;;; Slicing | |
669 | |
670 (defun doc-view-set-slice (x y width height) | |
671 "Set the slice of the images that should be displayed. | |
672 You can use this function to tell doc-view not to display the | |
673 margins of the document. It prompts for the top-left corner (X | |
674 and Y) of the slice to display and its WIDTH and HEIGHT. | |
675 | |
676 See `doc-view-set-slice-using-mouse' for a more convenient way to | |
677 do that. To reset the slice use `doc-view-reset-slice'." | |
678 (interactive | |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
679 (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
|
680 (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
|
681 (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
|
682 (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
|
683 (d (read-number (format "Height (0..%d): " (- (cdr size) b))))) |
84422 | 684 (list a b c d))) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
685 (setf (doc-view-current-slice) (list x y width height)) |
84422 | 686 ;; Redisplay |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
687 (doc-view-goto-page (doc-view-current-page))) |
84422 | 688 |
689 (defun doc-view-set-slice-using-mouse () | |
690 "Set the slice of the images that should be displayed. | |
691 You set the slice by pressing mouse-1 at its top-left corner and | |
692 dragging it to its bottom-right corner. See also | |
693 `doc-view-set-slice' and `doc-view-reset-slice'." | |
694 (interactive) | |
695 (let (x y w h done) | |
696 (while (not done) | |
697 (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
|
698 (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
|
699 "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
|
700 (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
|
701 (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
|
702 (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
|
703 (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
|
704 (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
|
705 (setq done t)))) |
84422 | 706 (doc-view-set-slice x y w h))) |
707 | |
708 (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
|
709 "Reset the current slice. |
85815
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
710 After calling this function whole pages will be visible again." |
84422 | 711 (interactive) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
712 (setf (doc-view-current-slice) nil) |
84422 | 713 ;; Redisplay |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
714 (doc-view-goto-page (doc-view-current-page))) |
84422 | 715 |
716 ;;;; Display | |
717 | |
718 (defun doc-view-insert-image (file &rest args) | |
719 "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
|
720 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
|
721 (when doc-view-pending-cache-flush |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
722 (clear-image-cache) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
723 (setq doc-view-pending-cache-flush nil)) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
724 (let ((ol (doc-view-current-overlay)) |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
725 (image (if (and file (file-readable-p file)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
726 (apply 'create-image file 'png nil args))) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
727 (slice (doc-view-current-slice))) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
728 (setf (doc-view-current-image) image) |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
729 (move-overlay ol (point-min) (point-max)) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
730 (overlay-put ol 'display |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
731 (cond |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
732 (image |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
733 (if slice |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
734 (list (cons 'slice slice) image) |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
735 image)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
736 ;; We're trying to display a page that doesn't exist. |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
737 (doc-view-current-converter-process |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
738 ;; Maybe the page doesn't exist *yet*. |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
739 "Cannot display this page (yet)!") |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
740 (t |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
741 ;; Typically happens if the conversion process somehow |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
742 ;; failed. Better not signal an error here because it |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
743 ;; could prevent a subsequent reconversion from fixing |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
744 ;; the problem. |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
745 (concat "Cannot display this page!\n" |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
746 "Maybe because of a conversion failure!")))) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
747 (let ((win (overlay-get ol 'window))) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
748 (if (stringp (overlay-get ol 'display)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
749 (progn ;Make sure the text is not scrolled out of view. |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
750 (set-window-hscroll win 0) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
751 (set-window-vscroll win 0)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
752 (let ((hscroll (image-mode-window-get 'hscroll win)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
753 (vscroll (image-mode-window-get 'vscroll win))) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
754 ;; Reset scroll settings, in case they were changed. |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
755 (if hscroll (set-window-hscroll win hscroll)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
756 (if vscroll (set-window-vscroll win vscroll))))))) |
84422 | 757 |
758 (defun doc-view-sort (a b) | |
759 "Return non-nil if A should be sorted before B. | |
760 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
|
761 (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
|
762 (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
|
763 (string< a b)))) |
84422 | 764 |
91789
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
765 (defun doc-view-display (buffer &optional force) |
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
766 "Start viewing the document in BUFFER. |
87133
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
767 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
|
768 have the page we want to view." |
91789
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
769 (with-current-buffer buffer |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
770 (let ((prev-pages doc-view-current-files)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
771 (setq doc-view-current-files |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
772 (sort (directory-files (doc-view-current-cache-dir) t |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
773 "page-[0-9]+\\.png" t) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
774 'doc-view-sort)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
775 (dolist (win (get-buffer-window-list buffer nil t)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
776 (let* ((page (doc-view-current-page win)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
777 (pagefile (expand-file-name (format "page-%d.png" page) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
778 (doc-view-current-cache-dir)))) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
779 (when (or force |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
780 (and (not (member pagefile prev-pages)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
781 (member pagefile doc-view-current-files))) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
782 (with-selected-window win |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
783 (assert (eq (current-buffer) buffer)) |
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
784 (doc-view-goto-page page)))))))) |
84422 | 785 |
786 (defun doc-view-buffer-message () | |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
787 ;; 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
|
788 ;; 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
|
789 ;; the fresh new ones). |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
790 (unless (overlay-get (doc-view-current-overlay) 'display) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
791 (overlay-put (doc-view-current-overlay) 'display |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
792 (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
|
793 "\n" |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
794 " |
85815
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
795 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
|
796 converted to PNG and the conversion of the first page hasn't finished yet or |
84422 | 797 `doc-view-conversion-refresh-interval' is set to nil. |
798 | |
799 For now these keys are useful: | |
800 | |
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
|
801 `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
|
802 `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
|
803 `K' : Kill the conversion process.\n")))) |
84422 | 804 |
805 (defun doc-view-show-tooltip () | |
806 (interactive) | |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
807 (tooltip-show (doc-view-current-info))) |
84422 | 808 |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
809 (defun doc-view-open-text () |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
810 "Open a buffer with the current doc's contents as text." |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
811 (interactive) |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
812 (if doc-view-current-converter-process |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
813 (message "DocView: please wait till conversion finished.") |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
814 (let ((txt (expand-file-name "doc.txt" (doc-view-current-cache-dir)))) |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
815 (if (file-readable-p txt) |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
816 (find-file txt) |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
817 (doc-view-doc->txt txt 'doc-view-open-text))))) |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
818 |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
819 ;;;;; 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
|
820 |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
821 |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
822 (defun doc-view-toggle-display () |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
823 "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
|
824 (interactive) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
825 (if (eq major-mode 'doc-view-mode) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
826 ;; Switch to editing mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
827 (progn |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
828 (doc-view-kill-proc) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
829 (setq buffer-read-only nil) |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
830 (remove-overlays (point-min) (point-max) 'doc-view t) |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
831 (set (make-local-variable 'image-mode-winprops-alist) t) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
832 ;; 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
|
833 ;; mode. |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
834 (if doc-view-previous-major-mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
835 (funcall doc-view-previous-major-mode) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
836 (fundamental-mode)) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
837 (doc-view-minor-mode 1)) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
838 ;; Switch to doc-view-mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
839 (when (and (buffer-modified-p) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
840 (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
|
841 (save-buffer)) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
842 (doc-view-mode))) |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
843 |
84422 | 844 ;;;; Searching |
845 | |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
846 |
84422 | 847 (defun doc-view-search-internal (regexp file) |
848 "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
|
849 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
|
850 the pagenumber and CONTEXTS are all lines of text containing a match." |
84422 | 851 (with-temp-buffer |
852 (insert-file-contents file) | |
853 (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
|
854 (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
|
855 matches) |
84422 | 856 (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
|
857 regexp "\\)\\)") nil t) |
87556
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
858 (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
|
859 (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
|
860 (if (/= page lastpage) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
861 (push (cons page |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
862 (list (buffer-substring |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
863 (line-beginning-position) |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
864 (line-end-position)))) |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
865 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
|
866 (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
|
867 (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
|
868 (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
|
869 ;; 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
|
870 (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
|
871 ;; 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
|
872 (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
|
873 (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
|
874 (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
|
875 (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
|
876 (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
|
877 (setq lastpage page))) |
84422 | 878 (nreverse matches)))) |
879 | |
880 (defun doc-view-search-no-of-matches (list) | |
881 "Extract the number of matches from the search result LIST." | |
882 (let ((no 0)) | |
883 (dolist (p list) | |
884 (setq no (+ no (1- (length p))))) | |
885 no)) | |
886 | |
86025
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
887 (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
|
888 "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
|
889 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
|
890 (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
|
891 (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
|
892 |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
893 (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
|
894 "Jump to the next match or initiate a new search if NEW-QUERY is given. |
84422 | 895 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
|
896 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
|
897 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
|
898 (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
|
899 (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
|
900 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
|
901 (if backward |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
902 (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
|
903 (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
|
904 ;; 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
|
905 (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
|
906 (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
|
907 (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
|
908 (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
|
909 (progn |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
910 (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
|
911 (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
|
912 (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
|
913 txt)) |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
914 (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
|
915 (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
|
916 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
|
917 ;; 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
|
918 (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
|
919 (message "DocView: please wait till conversion finished.") |
92763
5d8ccd2d65e2
Remove all cb-args, use closures instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92760
diff
changeset
|
920 (doc-view-doc->txt txt (lambda () (doc-view-search nil)))))))) |
84422 | 921 |
922 (defun doc-view-search-next-match (arg) | |
923 "Go to the ARGth next matching page." | |
924 (interactive "p") | |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
925 (let* ((next-pages (doc-view-remove-if |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
926 (lambda (i) (<= (car i) (doc-view-current-page))) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
927 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
|
928 (page (car (nth (1- arg) next-pages)))) |
84422 | 929 (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
|
930 (doc-view-goto-page page) |
84422 | 931 (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
|
932 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
|
933 (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
|
934 (doc-view-goto-page (caar doc-view-current-search-matches)))))) |
84422 | 935 |
936 (defun doc-view-search-previous-match (arg) | |
937 "Go to the ARGth previous matching page." | |
938 (interactive "p") | |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
939 (let* ((prev-pages (doc-view-remove-if |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
940 (lambda (i) (>= (car i) (doc-view-current-page))) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
941 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
|
942 (page (car (nth (1- arg) (nreverse prev-pages))))) |
84422 | 943 (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
|
944 (doc-view-goto-page page) |
84422 | 945 (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
|
946 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
|
947 (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
|
948 (doc-view-goto-page (caar (last doc-view-current-search-matches))))))) |
84422 | 949 |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
950 ;;;; 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
|
951 |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
952 ;; (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
|
953 |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
954 (defun doc-view-already-converted-p () |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
955 "Return non-nil if the current doc was already converted." |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
956 (and (file-exists-p (doc-view-current-cache-dir)) |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
957 (> 0 (length (directory-files (doc-view-current-cache-dir) nil "\\.png$"))))) |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
958 |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
959 (defun doc-view-initiate-display () |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
960 ;; Switch to image display if possible |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
961 (if (doc-view-mode-p (intern (file-name-extension doc-view-buffer-file-name))) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
962 (progn |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
963 (doc-view-buffer-message) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
964 (setf (doc-view-current-page) (or (doc-view-current-page) 1)) |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
965 (if (doc-view-already-converted-p) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
966 (progn |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
967 (message "DocView: using cached files!") |
91789
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
968 (doc-view-display (current-buffer) 'force)) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
969 (doc-view-convert-current-doc)) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
970 (message |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
971 "%s" |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
972 (substitute-command-keys |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
973 (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
|
974 "editing or viewing the document.")))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
975 (message |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
976 "%s" |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
977 (substitute-command-keys |
87006
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
978 (concat "No image (png) support available or some conversion utility for " |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
979 (file-name-extension doc-view-buffer-file-name)" files is missing. " |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
980 "Type \\[doc-view-toggle-display] to switch to an editing mode or " |
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
981 "\\[doc-view-open-text] to open a buffer showing the doc as text."))))) |
84422 | 982 |
92556
5944be8c8211
Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents:
92224
diff
changeset
|
983 (defvar bookmark-make-record-function) |
87556
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
984 |
91789
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
985 (defun doc-view-clone-buffer-hook () |
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
986 ;; FIXME: There are several potential problems linked with reconversion |
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
987 ;; and auto-revert when we have indirect buffers because they share their |
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
988 ;; /tmp cache directory. This sharing is good (you'd rather not reconvert |
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
989 ;; for each clone), but that means that clones need to collaborate a bit. |
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
990 ;; I guess it mostly means: detect when a reconversion process is already |
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
991 ;; running, and run the sentinel in all clones. |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
992 ;; |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
993 ;; Maybe the clones should really have a separate /tmp directory |
91789
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
994 ;; so they could have a different resolution and you could use clones |
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
995 ;; for zooming. |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
996 (remove-overlays (point-min) (point-max) 'doc-view t) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
997 (if (consp image-mode-winprops-alist) (setq image-mode-winprops-alist nil))) |
91789
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
998 |
92759
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
999 (defun doc-view-intersection (l1 l2) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1000 (let ((l ())) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1001 (dolist (x l1) (if (memq x l2) (push x l))) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1002 l)) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1003 |
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
|
1004 ;;;###autoload |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1005 (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
|
1006 "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
|
1007 You can use \\<doc-view-mode-map>\\[doc-view-toggle-display] to |
88105
44fd682c485a
(doc-view-mode): Improve docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88063
diff
changeset
|
1008 toggle between displaying the document or editing it as text. |
44fd682c485a
(doc-view-mode): Improve docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88063
diff
changeset
|
1009 \\{doc-view-mode-map}" |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1010 (interactive) |
87681
92ee34bb9001
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87580
diff
changeset
|
1011 |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1012 (let* ((prev-major-mode (if (eq major-mode 'doc-view-mode) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1013 doc-view-previous-major-mode |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1014 major-mode))) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1015 (kill-all-local-variables) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1016 (set (make-local-variable 'doc-view-previous-major-mode) prev-major-mode)) |
87681
92ee34bb9001
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87580
diff
changeset
|
1017 |
92759
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1018 ;; Figure out the document type. |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1019 (let ((name-types |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1020 (when buffer-file-name |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1021 (cdr (assoc (file-name-extension buffer-file-name) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1022 '(("dvi" dvi) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1023 ("pdf" pdf) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1024 ("epdf" pdf) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1025 ("ps" ps) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1026 ("eps" ps)))))) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1027 (content-types |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1028 (save-excursion |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1029 (goto-char (point-min)) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1030 (cond |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1031 ((looking-at "%!") '(ps)) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1032 ((looking-at "%PDF") '(pdf)) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1033 ((looking-at "\367\002") '(dvi)))))) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1034 (set (make-local-variable 'doc-view-doc-type) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1035 (car (or (doc-view-intersection name-types content-types) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1036 (when (and name-types content-types) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1037 (error "Conflicting types: name says %s but content says %s" |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1038 name-types content-types)) |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1039 name-types content-types |
01d116e7fb72
(doc-view-new-window-function): Add assertion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92752
diff
changeset
|
1040 (error "Cannot determine the document type"))))) |
92879
4486b0175a46
(doc-view-doc->txt, doc-view-convert-current-doc):
Tassilo Horn <tassilo@member.fsf.org>
parents:
92763
diff
changeset
|
1041 |
92220
9976b0faa96a
(doc-view-conversion-buffer): Give it an internal name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92004
diff
changeset
|
1042 (doc-view-make-safe-dir doc-view-cache-directory) |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1043 ;; Handle compressed files, remote files, files inside archives |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1044 (set (make-local-variable 'doc-view-buffer-file-name) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1045 (cond |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1046 (jka-compr-really-do-compress |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1047 (expand-file-name |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1048 (file-name-nondirectory |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1049 (file-name-sans-extension buffer-file-name)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1050 doc-view-cache-directory)) |
87842
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
1051 ;; Is the file readable by local processes? |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
1052 ;; We used to use `file-remote-p' but it's unclear what it's |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
1053 ;; supposed to return nil for things like local files accessed via |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
1054 ;; `su' or via file://... |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
1055 ((let ((file-name-handler-alist nil)) |
3a98637489f5
(doc-view-pdf/ps->png): Make sure we a have a valid cwd.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87697
diff
changeset
|
1056 (not (file-readable-p buffer-file-name))) |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1057 (expand-file-name |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1058 (file-name-nondirectory buffer-file-name) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1059 doc-view-cache-directory)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1060 (t buffer-file-name))) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1061 (when (not (string= doc-view-buffer-file-name buffer-file-name)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1062 (write-region nil nil doc-view-buffer-file-name)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1063 |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1064 (make-local-variable 'doc-view-current-files) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1065 (make-local-variable 'doc-view-current-converter-process) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1066 (make-local-variable 'doc-view-current-timer) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1067 (make-local-variable 'doc-view-current-cache-dir) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1068 (make-local-variable 'doc-view-current-search-matches) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1069 (add-hook 'change-major-mode-hook |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
1070 (lambda () (remove-overlays (point-min) (point-max) 'doc-view t)) |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1071 nil t) |
91789
0048d198c131
(doc-view-display): Change file arg to buffer arg, so it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91715
diff
changeset
|
1072 (add-hook 'clone-indirect-buffer-hook 'doc-view-clone-buffer-hook nil t) |
88058
fd7dd85405fc
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87850
diff
changeset
|
1073 |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
1074 (remove-overlays (point-min) (point-max) 'doc-view t) ;Just in case. |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
1075 ;; Keep track of display info ([vh]scroll, page number, overlay, ...) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
1076 ;; for each window in which this document is shown. |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
1077 (add-hook 'image-mode-new-window-functions |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
1078 'doc-view-new-window-function nil t) |
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
1079 (image-mode-setup-winprops) |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
1080 |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1081 (set (make-local-variable 'mode-line-position) |
92004
db743b98a24b
Allow different windows to show different pages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91789
diff
changeset
|
1082 '(" P" (:eval (number-to-string (doc-view-current-page))) |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1083 "/" (:eval (number-to-string (length doc-view-current-files))))) |
87850
dd673d4bceda
(doc-view-goto-page): Don't move point any more, now that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87842
diff
changeset
|
1084 ;; Don't scroll unless the user specifically asked for it. |
dd673d4bceda
(doc-view-goto-page): Don't move point any more, now that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87842
diff
changeset
|
1085 (set (make-local-variable 'auto-hscroll-mode) nil) |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1086 (set (make-local-variable 'cursor-type) nil) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1087 (use-local-map doc-view-mode-map) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1088 (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc) |
92556
5944be8c8211
Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents:
92224
diff
changeset
|
1089 (set (make-local-variable 'bookmark-make-record-function) |
5944be8c8211
Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents:
92224
diff
changeset
|
1090 'doc-view-bookmark-make-record) |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1091 (setq mode-name "DocView" |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1092 buffer-read-only t |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1093 major-mode 'doc-view-mode) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1094 (doc-view-initiate-display) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
1095 (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
|
1096 |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1097 ;;;###autoload |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1098 (define-minor-mode doc-view-minor-mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1099 "Toggle Doc view minor mode. |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1100 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
|
1101 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
|
1102 nil " DocView" doc-view-minor-mode-map |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1103 :group 'doc-view |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1104 (when doc-view-minor-mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1105 (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
|
1106 (message |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1107 "%s" |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1108 (substitute-command-keys |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1109 "Type \\[doc-view-toggle-display] to toggle between editing or viewing the document.")))) |
84422 | 1110 |
1111 (defun doc-view-clear-cache () | |
1112 "Delete the whole cache (`doc-view-cache-directory')." | |
1113 (interactive) | |
92752
7f212bec15c4
(doc-view-doc->txt, doc-view-open-text)
Tassilo Horn <tassilo@member.fsf.org>
parents:
92691
diff
changeset
|
1114 (dired-delete-file doc-view-cache-directory 'always)) |
84422 | 1115 |
1116 (defun doc-view-dired-cache () | |
1117 "Open `dired' in `doc-view-cache-directory'." | |
1118 (interactive) | |
1119 (dired doc-view-cache-directory)) | |
1120 | |
1121 | |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1122 ;;;; Bookmark integration |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1123 |
92691
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1124 (declare-function bookmark-buffer-file-name "bookmark" ()) |
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1125 (declare-function bookmark-prop-get "bookmark" (bookmark prop)) |
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1126 |
92674
ac3c6c3e119c
* bookmark.el (bookmark-make): Don't pass the `annotation' to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92563
diff
changeset
|
1127 (defun doc-view-bookmark-make-record () |
92691
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1128 `((filename . ,(bookmark-buffer-file-name)) |
92674
ac3c6c3e119c
* bookmark.el (bookmark-make): Don't pass the `annotation' to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92563
diff
changeset
|
1129 (page . ,(doc-view-current-page)) |
ac3c6c3e119c
* bookmark.el (bookmark-make): Don't pass the `annotation' to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92563
diff
changeset
|
1130 (handler . doc-view-bookmark-jump))) |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1131 |
87556
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1132 |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1133 ;;;###autoload |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1134 (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
|
1135 ;; This implements the `handler' function interface for record type |
92556
5944be8c8211
Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents:
92224
diff
changeset
|
1136 ;; returned by `doc-view-bookmark-make-record', which see. |
92691
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1137 (let ((filename (bookmark-prop-get bmk 'filename)) |
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1138 (page (bookmark-prop-get bmk 'page))) |
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1139 (with-current-buffer (find-file-noselect filename) |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1140 (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
|
1141 (doc-view-toggle-display)) |
92691
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1142 (with-selected-window |
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1143 (or (get-buffer-window (current-buffer) 0) |
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1144 (selected-window)) |
0574109ed8bc
(bookmark-buffer-file-name, bookmark-prop-get): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92674
diff
changeset
|
1145 (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
|
1146 `((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
|
1147 |
87556
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1148 |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1149 (provide 'doc-view) |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1150 |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1151 ;; Local Variables: |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1152 ;; mode: outline-minor |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1153 ;; End: |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1154 |
87522 | 1155 ;; arch-tag: 5d6e5c5e-095f-489e-b4e4-1ca90a7d79be |
84422 | 1156 ;;; doc-view.el ends here |