Mercurial > emacs
annotate lisp/doc-view.el @ 87735:dfca58cb5e8d
*** empty log message ***
author | Martin Rudalics <rudalics@gmx.at> |
---|---|
date | Sun, 13 Jan 2008 18:16:39 +0000 |
parents | e0467846347e |
children | 3a98637489f5 |
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 |
85801
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
102 ;; - better menu. |
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
103 ;; - don't use `find-file'. |
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
104 ;; - Bind slicing to a drag event. |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
105 ;; - doc-view-fit-doc-to-window and doc-view-fit-window-to-doc. |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
106 ;; - zoom a the region around the cursor (like xdvi). |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
107 ;; - get rid of the silly arrow in the fringe. |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
108 ;; - improve anti-aliasing (pdf-utils gets it better). |
85801
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
109 |
86035
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
110 ;;;; About isearch support |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
111 |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
112 ;; I tried implementing isearch by setting |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
113 ;; `isearch-search-fun-function' buffer-locally, but that didn't |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
114 ;; work too good. The function doing the real search was called |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
115 ;; endlessly somehow. But even if we'd get that working no real |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
116 ;; isearch feeling comes up due to the missing match highlighting. |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
117 ;; Currently I display all lines containing a match in a tooltip and |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
118 ;; each C-s or C-r jumps directly to the next/previous page with a |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
119 ;; match. With isearch we could only display the current match. So |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
120 ;; we had to decide if another C-s jumps to the next page with a |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
121 ;; match (thus only the first match in a page will be displayed in a |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
122 ;; tooltip) or to the next match, which would do nothing visible |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
123 ;; (except the tooltip) if the next match is on the same page. |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
124 |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
125 ;; And it's much slower than the current search facility, because |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
126 ;; isearch really searches for each step forward or backward wheras |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
127 ;; the current approach searches once and then it knows to which |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
128 ;; pages to jump. |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
129 |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
130 ;; Anyway, if someone with better isearch knowledge wants to give it a try, |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
131 ;; feel free to do it. --Tassilo |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
132 |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
133 ;;; Code: |
d3745283de5f
Add comments about isearch support.
Juri Linkov <juri@jurta.org>
parents:
86025
diff
changeset
|
134 |
84422 | 135 (require 'dired) |
85420
de8f3f575afc
(doc-view-mode-map): Use the image-mode scrolling commands. Don't rebind C-x k.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85419
diff
changeset
|
136 (require 'image-mode) |
86025
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
137 (require 'jka-compr) |
84422 | 138 |
139 ;;;; Customization Options | |
140 | |
141 (defgroup doc-view nil | |
142 "In-buffer viewer for PDF, PostScript and DVI files." | |
143 :link '(function-link doc-view) | |
144 :version "22.2" | |
145 :group 'applications | |
146 :group 'multimedia | |
147 :prefix "doc-view-") | |
148 | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
149 (defcustom doc-view-ghostscript-program (executable-find "gs") |
84422 | 150 "Program to convert PS and PDF files to PNG." |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
151 :type 'file |
84422 | 152 :group 'doc-view) |
153 | |
154 (defcustom doc-view-ghostscript-options | |
85418
26dcc1207f42
(doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85369
diff
changeset
|
155 '("-dSAFER" ;; Avoid security problems when rendering files from untrusted |
26dcc1207f42
(doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85369
diff
changeset
|
156 ;; sources. |
26dcc1207f42
(doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85369
diff
changeset
|
157 "-dNOPAUSE" "-sDEVICE=png16m" "-dTextAlphaBits=4" |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
158 "-dBATCH" "-dGraphicsAlphaBits=4" "-dQUIET") |
85367
1fbaddcbc4ec
Mention xpdf. Fix spelling of Ghostscript.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85029
diff
changeset
|
159 "A list of options to give to ghostscript." |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
160 :type '(repeat string) |
84422 | 161 :group 'doc-view) |
162 | |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
163 (defcustom doc-view-resolution 100 |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
164 "Dots per inch resolution used to render the documents. |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
165 Higher values result in larger images." |
86154 | 166 :type 'number |
167 :group 'doc-view) | |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
168 |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
169 (defcustom doc-view-dvipdfm-program (executable-find "dvipdfm") |
84422 | 170 "Program to convert DVI files to PDF. |
171 | |
172 DVI file will be converted to PDF before the resulting PDF is | |
173 converted to PNG." | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
174 :type 'file |
84422 | 175 :group 'doc-view) |
176 | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
177 (defcustom doc-view-ps2pdf-program (executable-find "ps2pdf") |
84422 | 178 "Program to convert PS files to PDF. |
179 | |
180 PS files will be converted to PDF before searching is possible." | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
181 :type 'file |
84422 | 182 :group 'doc-view) |
183 | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
184 (defcustom doc-view-pdftotext-program (executable-find "pdftotext") |
84422 | 185 "Program to convert PDF files to plain text. |
186 | |
187 Needed for searching." | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
188 :type 'file |
84422 | 189 :group 'doc-view) |
190 | |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
191 (defcustom doc-view-cache-directory |
85856
a26944b15c75
(doc-view-cache-directory): Remove superfluous concat.
Glenn Morris <rgm@gnu.org>
parents:
85844
diff
changeset
|
192 (expand-file-name (format "docview%d" (user-uid)) |
85844
cf0d3de08293
* doc-view.el (doc-view-cache-directory): Fix bug where an integer
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85843
diff
changeset
|
193 temporary-file-directory) |
84422 | 194 "The base directory, where the PNG images will be saved." |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
195 :type 'directory |
84422 | 196 :group 'doc-view) |
197 | |
198 (defcustom doc-view-conversion-buffer "*doc-view conversion output*" | |
199 "The buffer where messages from the converter programs go to." | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
200 :type 'string |
84422 | 201 :group 'doc-view) |
202 | |
203 (defcustom doc-view-conversion-refresh-interval 3 | |
85815
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
204 "Interval in seconds between refreshes of the DocView buffer while converting. |
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
205 After such a refresh newly converted pages will be available for |
84422 | 206 viewing. If set to nil there won't be any refreshes and the |
207 pages won't be displayed before conversion of the whole document | |
208 has finished." | |
85421
fbc2287ee475
Remove version keyword.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85420
diff
changeset
|
209 :type 'integer |
84422 | 210 :group 'doc-view) |
211 | |
212 ;;;; Internal Variables | |
213 | |
214 (defvar doc-view-current-files nil | |
215 "Only used internally.") | |
216 | |
217 (defvar doc-view-current-page nil | |
218 "Only used internally.") | |
219 | |
220 (defvar doc-view-current-converter-process nil | |
221 "Only used internally.") | |
222 | |
223 (defvar doc-view-current-timer nil | |
224 "Only used internally.") | |
225 | |
226 (defvar doc-view-current-slice nil | |
227 "Only used internally.") | |
228 | |
229 (defvar doc-view-current-cache-dir nil | |
230 "Only used internally.") | |
231 | |
232 (defvar doc-view-current-search-matches nil | |
233 "Only used internally.") | |
234 | |
235 (defvar doc-view-current-image nil | |
236 "Only used internally.") | |
87006
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
237 |
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
238 (defvar doc-view-current-overlay nil |
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
239 "Only used internally.") |
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
240 |
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
241 (defvar doc-view-pending-cache-flush nil |
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
242 "Only used internally.") |
84422 | 243 |
244 (defvar doc-view-current-info nil | |
245 "Only used internally.") | |
246 | |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
247 (defvar doc-view-previous-major-mode nil |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
248 "Only used internally.") |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
249 |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
250 (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
|
251 "Only used internally. |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
252 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
|
253 `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
|
254 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
|
255 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
|
256 `doc-view-cache-directory'.") |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
257 |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
258 ;;;; DocView Keymaps |
84422 | 259 |
260 (defvar doc-view-mode-map | |
261 (let ((map (make-sparse-keymap))) | |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
262 (suppress-keymap map) |
84422 | 263 ;; Navigation in the document |
264 (define-key map (kbd "n") 'doc-view-next-page) | |
265 (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
|
266 (define-key map (kbd "<next>") 'forward-page) |
a3364ed63fcd
(doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85421
diff
changeset
|
267 (define-key map (kbd "<prior>") 'backward-page) |
a3364ed63fcd
(doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85421
diff
changeset
|
268 (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
|
269 (define-key map [remap backward-page] 'doc-view-previous-page) |
84422 | 270 (define-key map (kbd "SPC") 'doc-view-scroll-up-or-next-page) |
271 (define-key map (kbd "DEL") 'doc-view-scroll-down-or-previous-page) | |
272 (define-key map (kbd "M-<") 'doc-view-first-page) | |
273 (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
|
274 (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
|
275 (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
|
276 (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
|
277 ;; Zoom in/out. |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
278 (define-key map "+" 'doc-view-enlarge) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
279 (define-key map "-" 'doc-view-shrink) |
84422 | 280 ;; Killing/burying the buffer (and the process) |
281 (define-key map (kbd "q") 'bury-buffer) | |
282 (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
|
283 (define-key map (kbd "K") 'doc-view-kill-proc) |
84422 | 284 ;; Slicing the image |
285 (define-key map (kbd "s s") 'doc-view-set-slice) | |
286 (define-key map (kbd "s m") 'doc-view-set-slice-using-mouse) | |
287 (define-key map (kbd "s r") 'doc-view-reset-slice) | |
288 ;; Searching | |
289 (define-key map (kbd "C-s") 'doc-view-search) | |
290 (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
|
291 (define-key map (kbd "C-r") 'doc-view-search-backward) |
84422 | 292 ;; Scrolling |
85444
a3364ed63fcd
(doc-view-mode-map): Use remapping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85421
diff
changeset
|
293 (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
|
294 (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
|
295 (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
|
296 (define-key map [remap previous-line] 'image-previous-line) |
84422 | 297 ;; Show the tooltip |
298 (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
|
299 ;; 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
|
300 (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
|
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 | |
328 (defun doc-view-goto-page (page) | |
329 "View the page given by PAGE." | |
330 (interactive "nPage: ") | |
331 (let ((len (length doc-view-current-files))) | |
332 (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
|
333 (setq page 1) |
84422 | 334 (when (> page len) |
85027
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
335 (setq page len))) |
84422 | 336 (setq doc-view-current-page page |
85027
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
337 doc-view-current-info |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
338 (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
|
339 (propertize |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
340 (format "Page %d of %d." |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
341 doc-view-current-page |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
342 len) 'face 'bold) |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
343 ;; 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
|
344 (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
|
345 " (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
|
346 "\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
|
347 ;; 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
|
348 (when (and doc-view-current-search-matches |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
349 (assq doc-view-current-page |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
350 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
|
351 (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
|
352 (let ((contexts "")) |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
353 (dolist (m (cdr (assq doc-view-current-page |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
354 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
|
355 (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
|
356 contexts))))) |
84422 | 357 ;; Update the buffer |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
358 (doc-view-insert-image (nth (1- page) doc-view-current-files) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
359 :pointer 'arrow) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
360 (overlay-put doc-view-current-overlay 'help-echo doc-view-current-info) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
361 (goto-char (point-min)) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
362 ;; This seems to be needed for set-window-hscroll (in |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
363 ;; image-forward-hscroll) to do something useful, I don't have time to |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
364 ;; debug this now. :-( --Stef |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
365 (forward-char))) |
84422 | 366 |
367 (defun doc-view-next-page (&optional arg) | |
368 "Browse ARG pages forward." | |
369 (interactive "p") | |
370 (doc-view-goto-page (+ doc-view-current-page (or arg 1)))) | |
371 | |
372 (defun doc-view-previous-page (&optional arg) | |
373 "Browse ARG pages backward." | |
374 (interactive "p") | |
375 (doc-view-goto-page (- doc-view-current-page (or arg 1)))) | |
376 | |
377 (defun doc-view-first-page () | |
378 "View the first page." | |
379 (interactive) | |
380 (doc-view-goto-page 1)) | |
381 | |
382 (defun doc-view-last-page () | |
383 "View the last page." | |
384 (interactive) | |
385 (doc-view-goto-page (length doc-view-current-files))) | |
386 | |
387 (defun doc-view-scroll-up-or-next-page () | |
388 "Scroll page up if possible, else goto next page." | |
389 (interactive) | |
87572
0e44918a91f4
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87556
diff
changeset
|
390 (when (= (window-vscroll) (image-scroll-up nil)) |
87580
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
391 (let ((cur-page doc-view-current-page)) |
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
392 (doc-view-next-page) |
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
393 (when (/= cur-page doc-view-current-page) |
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
394 (set-window-vscroll nil 0))))) |
84422 | 395 |
396 (defun doc-view-scroll-down-or-previous-page () | |
397 "Scroll page down if possible, else goto previous page." | |
398 (interactive) | |
87572
0e44918a91f4
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87556
diff
changeset
|
399 (when (= (window-vscroll) (image-scroll-down nil)) |
87580
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
400 (let ((cur-page doc-view-current-page)) |
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
401 (doc-view-previous-page) |
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
402 (when (/= cur-page doc-view-current-page) |
c47e66c6d239
2008-01-04 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87575
diff
changeset
|
403 (image-scroll-up nil))))) |
84422 | 404 |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
405 ;;;; Utility Functions |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
406 |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
407 (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
|
408 "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
|
409 (interactive) |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
410 (when doc-view-current-converter-process |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
411 (kill-process doc-view-current-converter-process) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
412 (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
|
413 (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
|
414 (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
|
415 (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
|
416 (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
|
417 |
84422 | 418 (defun doc-view-kill-proc-and-buffer () |
419 "Kill the current converter process and buffer." | |
420 (interactive) | |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
421 (doc-view-kill-proc) |
84422 | 422 (when (eq major-mode 'doc-view-mode) |
423 (kill-buffer (current-buffer)))) | |
424 | |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
425 (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
|
426 (condition-case nil |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
427 (let ((umask (default-file-modes))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
428 (unwind-protect |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
429 (progn |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
430 ;; 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
|
431 ;; 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
|
432 ;; time-window of loose permissions otherwise. |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
433 (set-default-file-modes #o0700) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
434 (make-directory dir)) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
435 ;; Reset the umask. |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
436 (set-default-file-modes umask))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
437 (file-already-exists |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
438 (if (file-symlink-p dir) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
439 (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
|
440 ;; 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
|
441 ;; 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
|
442 ;; 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
|
443 ;; 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
|
444 ;; 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
|
445 ;; 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
|
446 ;; 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
|
447 ;; closing a bunch of security holes. |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
448 (set-file-modes dir #o0700)))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
449 |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
450 (defun doc-view-current-cache-dir () |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
451 "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
|
452 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
|
453 (if doc-view-current-cache-dir |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
454 doc-view-current-cache-dir |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
455 ;; 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
|
456 (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
|
457 ;; Now compute the subdirectory to use. |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
458 (setq doc-view-current-cache-dir |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
459 (file-name-as-directory |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
460 (expand-file-name |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
461 (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
|
462 "-" |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
463 (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
|
464 (with-temp-buffer |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
465 (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
|
466 (md5 (current-buffer))))) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
467 doc-view-cache-directory))))) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
468 |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
469 (defun doc-view-remove-if (predicate list) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
470 "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
|
471 (let (new-list) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
472 (dolist (item list (nreverse new-list)) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
473 (when (not (funcall predicate item)) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
474 (setq new-list (cons item new-list)))))) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
475 |
86441
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
476 ;;;###autoload |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
477 (defun doc-view-mode-p (type) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
478 "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
|
479 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
|
480 (and (display-graphic-p) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
481 (image-type-available-p 'png) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
482 (cond |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
483 ((eq type 'dvi) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
484 (and (doc-view-mode-p 'pdf) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
485 doc-view-dvipdfm-program |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
486 (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
|
487 ((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
|
488 (eq type 'pdf)) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
489 (and doc-view-ghostscript-program |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
490 (executable-find doc-view-ghostscript-program))) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
491 (t ;; unknown image type |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
492 nil)))) |
6934c0956614
(doc-view-mode-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86156
diff
changeset
|
493 |
84422 | 494 ;;;; Conversion Functions |
495 | |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
496 (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
|
497 |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
498 (defun doc-view-enlarge (factor) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
499 "Enlarge the document." |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
500 (interactive (list doc-view-shrink-factor)) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
501 (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
|
502 (* factor doc-view-resolution)) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
503 (doc-view-reconvert-doc)) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
504 |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
505 (defun doc-view-shrink (factor) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
506 "Shrink the document." |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
507 (interactive (list doc-view-shrink-factor)) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
508 (doc-view-enlarge (/ 1.0 factor))) |
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
509 |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
510 (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
|
511 "Reconvert the current document. |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
512 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
|
513 (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
|
514 (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
|
515 ;; 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
|
516 (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
|
517 (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
|
518 (doc-view-initiate-display)) |
84422 | 519 |
520 (defun doc-view-dvi->pdf-sentinel (proc event) | |
85029
63718012f1da
(doc-view-dvi->pdf-sentinel, doc-view-reset-slice)
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
85027
diff
changeset
|
521 "If DVI->PDF conversion was successful, convert the PDF to PNG now." |
84422 | 522 (if (not (string-match "finished" event)) |
523 (message "DocView: dvi->pdf process changed status to %s." event) | |
87133
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
524 (with-current-buffer (process-get proc 'buffer) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
525 (setq doc-view-current-converter-process nil |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
526 mode-line-process nil) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
527 ;; Now go on converting this PDF to a set of PNG files. |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
528 (let* ((pdf (process-get proc 'pdf-file)) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
529 (png (expand-file-name "page-%d.png" |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
530 (doc-view-current-cache-dir)))) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
531 (doc-view-pdf/ps->png pdf png))))) |
84422 | 532 |
533 (defun doc-view-dvi->pdf (dvi pdf) | |
85815
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
534 "Convert DVI to PDF asynchronously." |
84422 | 535 (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
|
536 (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
|
537 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
|
538 "-o" pdf dvi) |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
539 mode-line-process (list (format ":%s" doc-view-current-converter-process))) |
84422 | 540 (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
|
541 'doc-view-dvi->pdf-sentinel) |
84422 | 542 (process-put doc-view-current-converter-process 'buffer (current-buffer)) |
543 (process-put doc-view-current-converter-process 'pdf-file pdf)) | |
544 | |
545 (defun doc-view-pdf/ps->png-sentinel (proc event) | |
546 "If PDF/PS->PNG conversion was successful, update the display." | |
547 (if (not (string-match "finished" event)) | |
548 (message "DocView: converter process changed status to %s." event) | |
87133
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
549 (with-current-buffer (process-get proc 'buffer) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
550 (setq doc-view-current-converter-process nil |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
551 mode-line-process nil) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
552 (when doc-view-current-timer |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
553 (cancel-timer doc-view-current-timer) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
554 (setq doc-view-current-timer nil)) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
555 ;; Yippie, finished. Update the display! |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
556 (doc-view-display buffer-file-name 'force)))) |
84422 | 557 |
558 (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
|
559 "Convert PDF-PS to PNG asynchronously." |
84422 | 560 (setq doc-view-current-converter-process |
85027
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
561 (apply 'start-process |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
562 (append (list "pdf/ps->png" doc-view-conversion-buffer |
85027
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
563 doc-view-ghostscript-program) |
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
564 doc-view-ghostscript-options |
86119
5b6715f2ee11
(doc-view-ghostscript-options): Remove resolution arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86035
diff
changeset
|
565 (list (format "-r%d" (round doc-view-resolution))) |
85027
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
566 (list (concat "-sOutputFile=" png)) |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
567 (list pdf-ps))) |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
568 mode-line-process (list (format ":%s" doc-view-current-converter-process))) |
84422 | 569 (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
|
570 'buffer (current-buffer)) |
84422 | 571 (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
|
572 'doc-view-pdf/ps->png-sentinel) |
84422 | 573 (when doc-view-conversion-refresh-interval |
574 (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
|
575 (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
|
576 'doc-view-display |
85801
9b97166d0c6c
(doc-view-current-doc): Remove. Replace all uses by buffer-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85784
diff
changeset
|
577 buffer-file-name)))) |
84422 | 578 |
579 (defun doc-view-pdf->txt-sentinel (proc event) | |
580 (if (not (string-match "finished" event)) | |
581 (message "DocView: converter process changed status to %s." event) | |
582 (let ((current-buffer (current-buffer)) | |
85027
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
583 (proc-buffer (process-get proc 'buffer))) |
87133
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
584 (with-current-buffer proc-buffer |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
585 (setq doc-view-current-converter-process nil |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
586 mode-line-process nil) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
587 ;; If the user looks at the DocView buffer where the conversion was |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
588 ;; performed, search anew. This time it will be queried for a regexp. |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
589 (when (eq current-buffer proc-buffer) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
590 (doc-view-search nil)))))) |
84422 | 591 |
592 (defun doc-view-pdf->txt (pdf txt) | |
85815
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
593 "Convert PDF to TXT asynchronously." |
84422 | 594 (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
|
595 (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
|
596 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
|
597 pdf txt) |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
598 mode-line-process (list (format ":%s" doc-view-current-converter-process))) |
84422 | 599 (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
|
600 'doc-view-pdf->txt-sentinel) |
84422 | 601 (process-put doc-view-current-converter-process 'buffer (current-buffer))) |
602 | |
603 (defun doc-view-ps->pdf-sentinel (proc event) | |
604 (if (not (string-match "finished" event)) | |
605 (message "DocView: converter process changed status to %s." event) | |
87133
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
606 (with-current-buffer (process-get proc 'buffer) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
607 (setq doc-view-current-converter-process nil |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
608 mode-line-process nil) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
609 ;; Now we can transform to plain text. |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
610 (doc-view-pdf->txt (process-get proc 'pdf-file) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
611 (expand-file-name "doc.txt" |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
612 (doc-view-current-cache-dir)))))) |
84422 | 613 |
614 (defun doc-view-ps->pdf (ps pdf) | |
615 "Convert PS to PDF asynchronously." | |
616 (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
|
617 (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
|
618 doc-view-ps2pdf-program |
85418
26dcc1207f42
(doc-view-ghostscript-options, doc-view-ps->pdf):
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85369
diff
changeset
|
619 ;; 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
|
620 ;; untrusted sources. |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
621 "-dSAFER" |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
622 ;; in-file and out-file |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
623 ps pdf) |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
624 mode-line-process (list (format ":%s" doc-view-current-converter-process))) |
84422 | 625 (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
|
626 'doc-view-ps->pdf-sentinel) |
84422 | 627 (process-put doc-view-current-converter-process 'buffer (current-buffer)) |
628 (process-put doc-view-current-converter-process 'pdf-file pdf)) | |
629 | |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
630 (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
|
631 "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
|
632 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
|
633 `doc-view-current-cache-dir'." |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
634 ;; 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
|
635 ;; 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
|
636 ;; 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
|
637 ;; 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
|
638 ;; resets during the redisplay). |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
639 (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
|
640 (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
|
641 (doc-view-current-cache-dir)))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
642 (make-directory (doc-view-current-cache-dir)) |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
643 (if (not (string= (file-name-extension doc-view-buffer-file-name) "dvi")) |
85027
06c04cf43e80
(doc-view): Don't ignore pdf and dvi files when completing filename.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84450
diff
changeset
|
644 ;; Convert to PNG images. |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
645 (doc-view-pdf/ps->png doc-view-buffer-file-name png-file) |
85367
1fbaddcbc4ec
Mention xpdf. Fix spelling of Ghostscript.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85029
diff
changeset
|
646 ;; DVI files have to be converted to PDF before Ghostscript can process |
84422 | 647 ;; it. |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
648 (doc-view-dvi->pdf doc-view-buffer-file-name |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
649 (expand-file-name "doc.pdf" |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
650 doc-view-current-cache-dir))))) |
84422 | 651 |
652 ;;;; Slicing | |
653 | |
654 (defun doc-view-set-slice (x y width height) | |
655 "Set the slice of the images that should be displayed. | |
656 You can use this function to tell doc-view not to display the | |
657 margins of the document. It prompts for the top-left corner (X | |
658 and Y) of the slice to display and its WIDTH and HEIGHT. | |
659 | |
660 See `doc-view-set-slice-using-mouse' for a more convenient way to | |
661 do that. To reset the slice use `doc-view-reset-slice'." | |
662 (interactive | |
663 (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
|
664 (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
|
665 (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
|
666 (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
|
667 (d (read-number (format "Height (0..%d): " (- (cdr size) b))))) |
84422 | 668 (list a b c d))) |
669 (setq doc-view-current-slice (list x y width height)) | |
670 ;; Redisplay | |
671 (doc-view-goto-page doc-view-current-page)) | |
672 | |
673 (defun doc-view-set-slice-using-mouse () | |
674 "Set the slice of the images that should be displayed. | |
675 You set the slice by pressing mouse-1 at its top-left corner and | |
676 dragging it to its bottom-right corner. See also | |
677 `doc-view-set-slice' and `doc-view-reset-slice'." | |
678 (interactive) | |
679 (let (x y w h done) | |
680 (while (not done) | |
681 (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
|
682 (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
|
683 "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
|
684 (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
|
685 (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
|
686 (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
|
687 (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
|
688 (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
|
689 (setq done t)))) |
84422 | 690 (doc-view-set-slice x y w h))) |
691 | |
692 (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
|
693 "Reset the current slice. |
85815
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
694 After calling this function whole pages will be visible again." |
84422 | 695 (interactive) |
696 (setq doc-view-current-slice nil) | |
697 ;; Redisplay | |
698 (doc-view-goto-page doc-view-current-page)) | |
699 | |
700 ;;;; Display | |
701 | |
702 (defun doc-view-insert-image (file &rest args) | |
703 "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
|
704 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
|
705 (when doc-view-pending-cache-flush |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
706 (clear-image-cache) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
707 (setq doc-view-pending-cache-flush nil)) |
84422 | 708 (let ((image (apply 'create-image file 'png nil args))) |
709 (setq doc-view-current-image image) | |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
710 (move-overlay doc-view-current-overlay (point-min) (point-max)) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
711 (overlay-put doc-view-current-overlay 'display |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
712 (if doc-view-current-slice |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
713 (list (cons 'slice doc-view-current-slice) image) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
714 image)))) |
84422 | 715 |
716 (defun doc-view-sort (a b) | |
717 "Return non-nil if A should be sorted before B. | |
718 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
|
719 (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
|
720 (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
|
721 (string< a b)))) |
84422 | 722 |
87133
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
723 (defun doc-view-display (doc &optional force) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
724 "Start viewing the document DOC. |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
725 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
|
726 have the page we want to view." |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
727 (with-current-buffer (get-file-buffer doc) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
728 (setq doc-view-current-files |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
729 (sort (directory-files (doc-view-current-cache-dir) t |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
730 "page-[0-9]+\\.png" t) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
731 'doc-view-sort)) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
732 (when (or force |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
733 (>= (length doc-view-current-files) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
734 (or doc-view-current-page 1))) |
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
735 (doc-view-goto-page doc-view-current-page)))) |
84422 | 736 |
737 (defun doc-view-buffer-message () | |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
738 ;; 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
|
739 ;; 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
|
740 ;; the fresh new ones). |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
741 (unless (overlay-get doc-view-current-overlay 'display) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
742 (overlay-put doc-view-current-overlay 'display |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
743 (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
|
744 "\n" |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
745 " |
85815
960b3c592913
(doc-view-conversion-refresh-interval)
Glenn Morris <rgm@gnu.org>
parents:
85805
diff
changeset
|
746 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
|
747 converted to PNG and the conversion of the first page hasn't finished yet or |
84422 | 748 `doc-view-conversion-refresh-interval' is set to nil. |
749 | |
750 For now these keys are useful: | |
751 | |
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
|
752 `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
|
753 `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
|
754 `K' : Kill the conversion process.\n")))) |
84422 | 755 |
756 (defun doc-view-show-tooltip () | |
757 (interactive) | |
758 (tooltip-show doc-view-current-info)) | |
759 | |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
760 ;;;;; 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
|
761 |
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
762 (defun doc-view-toggle-display () |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
763 "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
|
764 (interactive) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
765 (if (eq major-mode 'doc-view-mode) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
766 ;; Switch to editing mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
767 (progn |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
768 (doc-view-kill-proc) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
769 (setq buffer-read-only nil) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
770 (delete-overlay doc-view-current-overlay) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
771 ;; 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
|
772 ;; mode. |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
773 (if doc-view-previous-major-mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
774 (funcall doc-view-previous-major-mode) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
775 (fundamental-mode)) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
776 (doc-view-minor-mode 1)) |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
777 ;; Switch to doc-view-mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
778 (when (and (buffer-modified-p) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
779 (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
|
780 (save-buffer)) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
781 (doc-view-mode))) |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
782 |
84422 | 783 ;;;; Searching |
784 | |
785 (defun doc-view-search-internal (regexp file) | |
786 "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
|
787 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
|
788 the pagenumber and CONTEXTS are all lines of text containing a match." |
84422 | 789 (with-temp-buffer |
790 (insert-file-contents file) | |
791 (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
|
792 (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
|
793 matches) |
84422 | 794 (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
|
795 regexp "\\)\\)") nil t) |
87556
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
796 (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
|
797 (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
|
798 (if (/= page lastpage) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
799 (push (cons page |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
800 (list (buffer-substring |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
801 (line-beginning-position) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
802 (line-end-position)))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
803 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
|
804 (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
|
805 (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
|
806 (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
|
807 ;; 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
|
808 (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
|
809 ;; 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
|
810 (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
|
811 (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
|
812 (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
|
813 (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
|
814 (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
|
815 (setq lastpage page))) |
84422 | 816 (nreverse matches)))) |
817 | |
818 (defun doc-view-search-no-of-matches (list) | |
819 "Extract the number of matches from the search result LIST." | |
820 (let ((no 0)) | |
821 (dolist (p list) | |
822 (setq no (+ no (1- (length p))))) | |
823 no)) | |
824 | |
86025
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
825 (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
|
826 "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
|
827 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
|
828 (interactive "P") |
86156
d98fdcca854b
* doc-view.el (doc-view-search-backward, doc-view-search): Fix
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86154
diff
changeset
|
829 (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
|
830 |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
831 (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
|
832 "Jump to the next match or initiate a new search if NEW-QUERY is given. |
84422 | 833 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
|
834 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
|
835 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
|
836 (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
|
837 (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
|
838 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
|
839 (if backward |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
840 (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
|
841 (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
|
842 ;; 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
|
843 (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
|
844 (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
|
845 (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
|
846 (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
|
847 (progn |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
848 (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
|
849 (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
|
850 (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
|
851 txt)) |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
852 (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
|
853 (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
|
854 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
|
855 ;; 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
|
856 (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
|
857 (message "DocView: please wait till conversion finished.") |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
858 (let ((ext (file-name-extension doc-view-buffer-file-name))) |
86025
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
859 (cond |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
860 ((string= ext "pdf") |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
861 ;; Doc is a PDF, so convert it to TXT |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
862 (doc-view-pdf->txt doc-view-buffer-file-name txt)) |
86025
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
863 ((string= ext "ps") |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
864 ;; Doc is a PS, so convert it to PDF (which will be converted to |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
865 ;; TXT thereafter). |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
866 (doc-view-ps->pdf doc-view-buffer-file-name |
86025
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
867 (expand-file-name "doc.pdf" |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
868 (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
|
869 ((string= ext "dvi") |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
870 ;; Doc is a DVI. This means that a doc.pdf already exists in its |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
871 ;; cache subdirectory. |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
872 (doc-view-pdf->txt (expand-file-name "doc.pdf" |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
873 (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
|
874 txt)) |
19784f7db0ef
(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Juri Linkov <juri@jurta.org>
parents:
85856
diff
changeset
|
875 (t (error "DocView doesn't know what to do"))))))))) |
84422 | 876 |
877 (defun doc-view-search-next-match (arg) | |
878 "Go to the ARGth next matching page." | |
879 (interactive "p") | |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
880 (let* ((next-pages (doc-view-remove-if |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
881 (lambda (i) (<= (car i) doc-view-current-page)) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
882 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
|
883 (page (car (nth (1- arg) next-pages)))) |
84422 | 884 (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
|
885 (doc-view-goto-page page) |
84422 | 886 (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
|
887 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
|
888 (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
|
889 (doc-view-goto-page (caar doc-view-current-search-matches)))))) |
84422 | 890 |
891 (defun doc-view-search-previous-match (arg) | |
892 "Go to the ARGth previous matching page." | |
893 (interactive "p") | |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
894 (let* ((prev-pages (doc-view-remove-if |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
895 (lambda (i) (>= (car i) doc-view-current-page)) |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
896 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
|
897 (page (car (nth (1- arg) (nreverse prev-pages))))) |
84422 | 898 (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
|
899 (doc-view-goto-page page) |
84422 | 900 (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
|
901 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
|
902 (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
|
903 (doc-view-goto-page (caar (last doc-view-current-search-matches))))))) |
84422 | 904 |
85369
5b96a46cc08a
* bindings.el (completion-ignored-extensions): Remove pdf and dvi
Reiner Steib <Reiner.Steib@gmx.de>
parents:
85367
diff
changeset
|
905 ;;;; 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
|
906 |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
907 ;; (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
|
908 |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
909 (defun doc-view-initiate-display () |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
910 ;; 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
|
911 (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
|
912 (progn |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
913 (doc-view-buffer-message) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
914 (setq doc-view-current-page (or doc-view-current-page 1)) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
915 (if (file-exists-p (doc-view-current-cache-dir)) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
916 (progn |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
917 (message "DocView: using cached files!") |
87133
a99e0ba48aeb
(doc-view-dvi->pdf-sentinel, doc-view-pdf/ps->png-sentinel)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87006
diff
changeset
|
918 (doc-view-display buffer-file-name 'force)) |
85805
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
919 (doc-view-convert-current-doc)) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
920 (message |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
921 "%s" |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
922 (substitute-command-keys |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
923 (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
|
924 "editing or viewing the document.")))) |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
925 (message |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
926 "%s" |
1d1d43e36948
Use expand-file-name rather than concat.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85801
diff
changeset
|
927 (substitute-command-keys |
87006
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
928 (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
|
929 (file-name-extension doc-view-buffer-file-name)" files is missing. " |
87006
a15ce3ca213a
(doc-view-initiate-display): Use `doc-view-mode-p'.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
86441
diff
changeset
|
930 "Type \\[doc-view-toggle-display] to switch to an editing mode."))))) |
84422 | 931 |
87556
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
932 (defvar bookmark-make-cell-function) |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
933 |
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
|
934 ;;;###autoload |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
935 (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
|
936 "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
|
937 You can use \\<doc-view-mode-map>\\[doc-view-toggle-display] to |
85784
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
938 toggle between displaying the document or editing it as text." |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
939 (interactive) |
87681
92ee34bb9001
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87580
diff
changeset
|
940 |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
941 (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
|
942 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
|
943 major-mode))) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
944 (kill-all-local-variables) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
945 (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
|
946 |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
947 ;; 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
|
948 (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
|
949 (cond |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
950 (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
|
951 (expand-file-name |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
952 (file-name-nondirectory |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
953 (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
|
954 doc-view-cache-directory)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
955 ((or |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
956 (not (file-exists-p buffer-file-name)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
957 (file-remote-p buffer-file-name)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
958 (expand-file-name |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
959 (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
|
960 doc-view-cache-directory)) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
961 (t buffer-file-name))) |
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
962 (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
|
963 (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
|
964 |
87685
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
965 (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
|
966 (make-local-variable 'doc-view-current-image) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
967 (make-local-variable 'doc-view-current-page) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
968 (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
|
969 (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
|
970 (make-local-variable 'doc-view-current-slice) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
971 (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
|
972 (make-local-variable 'doc-view-current-info) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
973 (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
|
974 (set (make-local-variable 'doc-view-current-overlay) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
975 (make-overlay (point-min) (point-max) nil t)) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
976 (add-hook 'change-major-mode-hook |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
977 (lambda () (delete-overlay doc-view-current-overlay)) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
978 nil t) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
979 (set (make-local-variable 'mode-line-position) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
980 '(" P" (:eval (number-to-string doc-view-current-page)) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
981 "/" (:eval (number-to-string (length doc-view-current-files))))) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
982 (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
|
983 (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
|
984 (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
985 (set (make-local-variable 'bookmark-make-cell-function) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
986 'doc-view-bookmark-make-cell) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
987 (setq mode-name "DocView" |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
988 buffer-read-only t |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
989 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
|
990 (doc-view-initiate-display) |
9b8e42b90c3b
2008-01-09 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87681
diff
changeset
|
991 (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
|
992 |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
993 ;;;###autoload |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
994 (define-minor-mode doc-view-minor-mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
995 "Toggle Doc view minor mode. |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
996 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
|
997 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
|
998 nil " DocView" doc-view-minor-mode-map |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
999 :group 'doc-view |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1000 (when doc-view-minor-mode |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1001 (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
|
1002 (message |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1003 "%s" |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1004 (substitute-command-keys |
b0dc7772c4dc
Tassilo Horn <tassilo at member.fsf.org>
Glenn Morris <rgm@gnu.org>
parents:
85444
diff
changeset
|
1005 "Type \\[doc-view-toggle-display] to toggle between editing or viewing the document.")))) |
84422 | 1006 |
1007 (defun doc-view-clear-cache () | |
1008 "Delete the whole cache (`doc-view-cache-directory')." | |
1009 (interactive) | |
1010 (dired-delete-file doc-view-cache-directory 'always) | |
1011 (make-directory doc-view-cache-directory)) | |
1012 | |
1013 (defun doc-view-dired-cache () | |
1014 "Open `dired' in `doc-view-cache-directory'." | |
1015 (interactive) | |
1016 (dired doc-view-cache-directory)) | |
1017 | |
1018 | |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1019 ;;;; Bookmark integration |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1020 |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1021 (defun doc-view-bookmark-make-cell (annotation &rest args) |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1022 (let ((the-record |
87697
e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87693
diff
changeset
|
1023 `((filename . ,buffer-file-name) |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1024 (page . ,doc-view-current-page) |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1025 (handler . doc-view-bookmark-jump)))) |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1026 |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1027 ;; Take no chances with text properties |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1028 (set-text-properties 0 (length annotation) nil annotation) |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1029 |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1030 (when annotation |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1031 (nconc the-record (list (cons 'annotation annotation)))) |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1032 |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1033 ;; Finally, return the completed record. |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1034 the-record)) |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1035 |
87556
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1036 |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1037 (declare-function bookmark-get-filename "bookmark" (bookmark)) |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1038 (declare-function bookmark-get-bookmark-record "bookmark" (bookmark)) |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1039 |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1040 ;;;###autoload |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1041 (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
|
1042 ;; This implements the `handler' function interface for record type |
0140d3ebb262
Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents:
87412
diff
changeset
|
1043 ;; returned by `bookmark-make-cell-function', which see. |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1044 (save-window-excursion |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1045 (let ((filename (bookmark-get-filename bmk)) |
87412
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87411
diff
changeset
|
1046 (page (cdr (assq 'page (bookmark-get-bookmark-record bmk))))) |
87411
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1047 (find-file filename) |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1048 (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
|
1049 (doc-view-toggle-display)) |
9ac481bc897b
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87133
diff
changeset
|
1050 (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
|
1051 `((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
|
1052 |
87556
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1053 |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1054 (provide 'doc-view) |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1055 |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1056 ;; Local Variables: |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1057 ;; mode: outline-minor |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1058 ;; End: |
39204305bf6f
(doc-view-search-internal): Don't use `incf'.
Glenn Morris <rgm@gnu.org>
parents:
87522
diff
changeset
|
1059 |
87522 | 1060 ;; arch-tag: 5d6e5c5e-095f-489e-b4e4-1ca90a7d79be |
84422 | 1061 ;;; doc-view.el ends here |