annotate lisp/htmlfontify.el @ 106331:1c9648ddfd5e

(vc-git-registered): Call vc-git-root only once.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 30 Nov 2009 21:21:35 +0000
parents 8d51419ae1f3
children 3b90f039f42b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1 ;;; htmlfontify.el --- htmlise a buffer/source tree with optional hyperlinks
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
3 ;; Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
4
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5 ;; Emacs Lisp Archive Entry
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
6 ;; Package: htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
7 ;; Filename: htmlfontify.el
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
8 ;; Version: 0.21
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
9 ;; Keywords: html, hypermedia, markup, etags
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
10 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
11 ;; Maintainer: Vivek Dasmohapatra <vivek@etla.org>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 ;; Created: 2002-01-05
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
13 ;; Description: htmlise a buffer/source tree with optional hyperlinks
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
14 ;; URL: http://rtfm.etla.org/emacs/htmlfontify/
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15 ;; Compatibility: Emacs23, Emacs22
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
16 ;; Incompatibility: Emacs19, Emacs20, Emacs21
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 ;; Last Updated: Thu 2009-11-19 01:31:21 +0000
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
18
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19 ;; This file is part of GNU Emacs.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
20
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21 ;; GNU Emacs is free software: you can redistribute it and/or modify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
22 ;; it under the terms of the GNU General Public License as published by
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
23 ;; the Free Software Foundation, either version 3 of the License, or
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
24 ;; (at your option) any later version.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
25
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
26 ;; GNU Emacs is distributed in the hope that it will be useful,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
27 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
28 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
29 ;; GNU General Public License for more details.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
30
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
31 ;; You should have received a copy of the GNU General Public License
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
32 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
33
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
34 ;;; Commentary:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
35 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
36 ;; I have made some changes to make it work for Emacs 22. A lot of
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
37 ;; small bug fixes related to the format of text and overlay
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
38 ;; properties (which might have changed since the beginning of 2003
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
39 ;; when this file was originally written).
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
40 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
41 ;; The function `hfy-face-at' currently carries much of the burden of
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
42 ;; my lacking understanding of the formats mentioned above and should
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
43 ;; need some knowledgeable help.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
44 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
45 ;; Another thing that maybe could be fixed is that overlay background
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
46 ;; colors which are now only seen where there is text (in the XHTML
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
47 ;; output). A bit of CSS tweaking is necessary there.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
48 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
49 ;; The face 'default has a value :background "SystemWindow" for the
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
50 ;; background color. There is no explicit notion that this should be
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
51 ;; considered transparent, but I have assumed that it could be handled
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
52 ;; like if it was here. (I am unsure that background and foreground
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
53 ;; priorities are handled ok, but it looks ok in my tests now.)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
54 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
55 ;; 2007-12-27 Lennart Borgman
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
56 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
57
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
58 ;; Here's some elisp code to html-pretty-print an Emacs buffer, preserving
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
59 ;; the Emacs syntax/whatever highlighting. It also knows how to drive etags
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
60 ;; (exuberant-ctags or Emacs etags) and hyperlink the code according
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
61 ;; to its (etags') output.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
62
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
63 ;; NOTE: Currently the hyperlinking code only knows how to drive GNU find
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
64 ;; and the exuberant and GNU variants of etags : I do not know of any other
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
65 ;; etags variants, but mechanisms have been provided to allow htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
66 ;; to be taught how to drive them. As long as your version of find has
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
67 ;; the -path test and is reasonably sane, you should be fine.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
68
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
69 ;; A sample of the htmlfontified / hyperlinked output of this module can be
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
70 ;; found at http://rtfm.etla.org/sql/dbishell/src/ - it's not perfect, but
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
71 ;; it's a hell of a lot faster and more thorough than I could hope to be
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
72 ;; doing this by hand.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
73
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
74 ;; some user / horrified onlooker comments:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
75 ;; What? No! There's something deeply wrong here... (R. Shufflebotham)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
76 ;; You're a freak. (D. Silverstone)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
77 ;; Aren't we giving you enough to do? (J. Busuttil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
78 ;; You're almost as messed up as Lexx is! (N. Graves-Morris)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
79
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
80 ;;; History:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
81 ;; Changes: moved to changelog (CHANGES) file.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
83 ;;; Code:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 (eval-when-compile (require 'cl))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
85 (require 'faces)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
86 ;; (`facep' `face-attr-construct' `x-color-values' `color-values' `face-name')
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
87 (require 'custom)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
88 ;; (`defgroup' `defcustom')
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
89 (require 'font-lock)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
90 ;; (`font-lock-fontify-region')
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
91 (require 'cus-edit)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
92
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
93 (eval-and-compile
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
94 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
95 ;; I want these - can't be bothered requiring all of cl though.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
96 (if (not (fboundp 'caddr))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
97 (defun caddr (list)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
98 "Return the `car' of the `cddr' of LIST."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
99 (car (cddr list))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
100
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
101 (if (not (fboundp 'cadddr))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
102 (defun cadddr (list)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
103 "Return the `cadr' of the `cddr' of LIST."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
104 (cadr (cddr list))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
105 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
106
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
107 (autoload
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
108 'htmlfontify-load-rgb-file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
109 "hfy-cmap"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
110 "Load an rgb.txt file for colour name -> rgb translation purposes."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
111 'interactive)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
112
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
113 (autoload
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
114 'htmlfontify-unload-rgb-file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
115 "hfy-cmap"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
116 "Unload the current colour name -> rgb translation map."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
117 'interactive)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
118
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
119 (autoload
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
120 'hfy-fallback-colour-values
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
121 "hfy-cmap"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
122 "Use a fallback method for obtaining the rgb values for a colour."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
123 'interactive)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
124 )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
125
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
126 (defconst htmlfontify-version 0.21)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
127
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
128 (defconst hfy-meta-tags
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
129 (format "<meta name=\"generator\" content=\"emacs %s; htmlfontify %0.2f\" />"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
130 emacs-version htmlfontify-version)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
131 "The generator meta tag for this version of htmlfontify.")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
132
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
133 (defconst htmlfontify-manual "Htmlfontify Manual"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
134 "Copy and convert buffers and files to html, adding hyperlinks between files
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
135 \(driven by etags\) if requested.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
136 \nInteractive functions:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
137 `htmlfontify-buffer'
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
138 `htmlfontify-run-etags'
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
139 `htmlfontify-copy-and-link-dir'
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
140 `htmlfontify-load-rgb-file'
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
141 `htmlfontify-unload-rgb-file'\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
142 In order to:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
143 fontify a file you have open: M-x htmlfontify-buffer
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
144 prepare the etags map for a directory: M-x htmlfontify-run-etags
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
145 copy a directory, fontifying as you go: M-x htmlfontify-copy-and-link-dir\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
146 The following might be useful when running non-windowed or in batch mode:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
147 \(note that they shouldn't be necessary - we have a built in map\)\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
148 load an X11 style rgb.txt file: M-x htmlfontify-load-rgb-file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
149 unload the current rgb.txt file: M-x htmlfontify-unload-rgb-file\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
150 And here's a programmatic example:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
151 \(defun rtfm-build-page-header \(file style\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
152 \(format \"#define TEMPLATE red+black.html
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
153 #define DEBUG 1
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
154 #include <build/menu-dirlist|>\\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
155 html-css-url := /css/red+black.css
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
156 title := rtfm.etla.org \( %s / src/%s \)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
157 bodytag :=
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
158 head <=STYLESHEET;\\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
159 %s
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
160 STYLESHEET
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
161 main-title := rtfm / %s / src/%s\\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
162 main-content <=MAIN_CONTENT;\\n\" rtfm-section file style rtfm-section file\)\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
163
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
164 \(defun rtfm-build-page-footer \(file\) \"\\nMAIN_CONTENT\\n\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
165
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
166 \(defun rtfm-build-source-docs \(section srcdir destdir\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
167 \(interactive
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
168 \"s section[eg- emacs / p4-blame]:\\nD source-dir: \\nD output-dir: \"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
169 \(require 'htmlfontify\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
170 \(hfy-load-tags-cache srcdir\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
171 \(let \(\(hfy-page-header 'rtfm-build-page-header\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
172 \(hfy-page-footer 'rtfm-build-page-footer\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
173 \(rtfm-section section\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
174 \(hfy-index-file \"index\"\)\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
175 \(htmlfontify-run-etags srcdir\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
176 \(htmlfontify-copy-and-link-dir srcdir destdir \".src\" \".html\"\)\)\)")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
177
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
178 (defgroup htmlfontify nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
179 "Copy and convert buffers and files to html, adding hyperlinks between
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
180 files \(driven by etags\) if requested.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
181 See: `htmlfontify-manual'"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
182 :group 'applications
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
183 :prefix "hfy-")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
184
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
185 (defcustom hfy-page-header 'hfy-default-header
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
186 "Function called with two arguments \(the filename relative to the top
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
187 level source directory being etag\'d and fontified), and a string containing
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
188 the <style>...</style> text to embed in the document- the string returned will
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
189 be used as the header for the htmlfontified version of the source file.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
190 See also: `hfy-page-footer'"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
191 :group 'htmlfontify
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
192 ;; FIXME: Why place such a :tag everywhere? Isn't it imposing your
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
193 ;; own Custom preference on your users? --Stef
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
194 :tag "page-header"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
195 :type '(function))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
196
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
197 (defcustom hfy-split-index nil
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
198 "Whether or not to split the index `hfy-index-file' alphabetically
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
199 on the first letter of each tag. Useful when the index would otherwise
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
200 be large and take a long time to render or be difficult to navigate."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
201 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
202 :tag "split-index"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
203 :type '(boolean))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
204
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
205 (defcustom hfy-page-footer 'hfy-default-footer
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
206 "As `hfy-page-header', but generates the output footer
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
207 \(and takes only 1 argument, the filename\)."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
208 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
209 :tag "page-footer"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
210 :type '(function))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
211
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
212 (defcustom hfy-extn ".html"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
213 "File extension used for output files."
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
214 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
215 :tag "extension"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
216 :type '(string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
217
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
218 (defcustom hfy-src-doc-link-style "text-decoration: underline;"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
219 "String to add to the \'<style> a\' variant of an htmlfontify css class."
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
220 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
221 :tag "src-doc-link-style"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
222 :type '(string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
223
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
224 (defcustom hfy-src-doc-link-unstyle " text-decoration: none;"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
225 "Regex to remove from the <style> a variant of an htmlfontify css class."
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
226 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
227 :tag "src-doc-link-unstyle"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
228 :type '(string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
229
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
230 (defcustom hfy-link-extn nil
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
231 "File extension used for href links - Useful where the htmlfontify
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
232 output files are going to be processed again, with a resulting change
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
233 in file extension. If nil, then any code using this should fall back
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
234 to `hfy-extn'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
235 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
236 :tag "link-extension"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
237 :type '(choice string (const nil)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
238
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
239 (defcustom hfy-link-style-fun 'hfy-link-style-string
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
240 "Set this to a function, which will be called with one argument
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
241 \(a \"{ foo: bar; ...}\" css style-string\) - it should return a copy of
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
242 its argument, altered so as to make any changes you want made for text which
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
243 is a hyperlink, in addition to being in the class to which that style would
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
244 normally be applied."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
245 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
246 :tag "link-style-function"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
247 :type '(function))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
248
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
249 (defcustom hfy-index-file "hfy-index"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
250 "Name \(sans extension\) of the tag definition index file produced during
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
251 fontification-and-hyperlinking."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
252 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
253 :tag "index-file"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
254 :type '(string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
255
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
256 (defcustom hfy-instance-file "hfy-instance"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
257 "Name \(sans extension\) of the tag usage index file produced during
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
258 fontification-and-hyperlinking."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
259 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
260 :tag "instance-file"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
261 :type '(string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
262
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
263 (defcustom hfy-html-quote-regex "\\(<\\|\"\\|&\\|>\\)"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
264 "Regex to match \(with a single back-reference per match\) strings in HTML
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
265 which should be quoted with `hfy-html-quote' \(and `hfy-html-quote-map'\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
266 to make them safe."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
267 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
268 :tag "html-quote-regex"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
269 :type '(regexp))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
270
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
271 (define-obsolete-variable-alias 'hfy-init-kludge-hooks 'hfy-init-kludge-hook
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
272 "23.2")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
273 (defcustom hfy-init-kludge-hook '(hfy-kludge-cperl-mode)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
274 "List of functions to call when starting htmlfontify-buffer to do any
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
275 kludging necessary to get highlighting modes to bahave as you want, even
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
276 when not running under a window system."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
277 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
278 :tag "init-kludge-hooks"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
279 :type '(hook))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
280
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
281 (defcustom hfy-post-html-hooks nil
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
282 "List of functions to call after creating and filling the html buffer.
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
283 These functions will be called with the html buffer as the current buffer"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
284 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
285 :tag "post-html-hooks"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
286 :options '(set-auto-mode)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
287 :type '(hook))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
288
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
289 (defcustom hfy-default-face-def nil
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
290 "Fallback `defface' specification for the face \'default, used when
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
291 `hfy-display-class' has been set \(the normal htmlfontify way of extracting
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
292 potentially non-current face information doesn\'t necessarily work for
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
293 \'default\).\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
294 Example: I customise this to:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
295 \(\(t :background \"black\" :foreground \"white\" :family \"misc-fixed\"\)\)"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
296 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
297 :tag "default-face-definition"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
298 :type '(alist))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
299
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
300 (defcustom hfy-etag-regex (concat ".*"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
301 "\x7f" "\\([^\x01\n]+\\)"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
302 "\x01" "\\([0-9]+\\)"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
303 "," "\\([0-9]+\\)$"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
304 "\\|" ".*\x7f[0-9]+,[0-9]+$")
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
305 "Regex used to parse an etags entry: must have 3 subexps, corresponding,
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
306 in order, to:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
307 1 - The tag
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
308 2 - The line
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
309 3 - The char \(point\) at which the tag occurs."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
310 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
311 :tag "etag-regex"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
312 :type '(regexp))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
313
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
314 (defcustom hfy-html-quote-map '(("\"" "&quot;")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
315 ("<" "&lt;" )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
316 ("&" "&amp;" )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
317 (">" "&gt;" ))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
318 "Alist of char -> entity mappings used to make the text html-safe."
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
319 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
320 :tag "html-quote-map"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
321 :type '(alist :key-type (string)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
322 (eval-and-compile
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
323 (defconst hfy-e2x-etags-cmd "for src in `find . -type f`;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
324 do
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
325 ETAGS=%s;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
326 case ${src} in
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
327 *.ad[absm]|*.[CFHMSacfhlmpsty]|*.def|*.in[cs]|*.s[as]|*.src|*.cc|\\
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
328 *.hh|*.[chy]++|*.[ch]pp|*.[chy]xx|*.pdb|*.[ch]s|*.[Cc][Oo][Bb]|\\
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
329 *.[eh]rl|*.f90|*.for|*.java|*.[cem]l|*.clisp|*.lisp|*.[Ll][Ss][Pp]|\\
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
330 [Mm]akefile*|*.pas|*.[Pp][LlMm]|*.psw|*.lm|*.pc|*.prolog|*.oak|\\
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
331 *.p[sy]|*.sch|*.scheme|*.[Ss][Cc][Mm]|*.[Ss][Mm]|*.bib|*.cl[os]|\\
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
332 *.ltx|*.sty|*.TeX|*.tex|*.texi|*.texinfo|*.txi|*.x[bp]m|*.yy|\\
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
333 *.[Ss][Qq][Ll])
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
334 ${ETAGS} -o- ${src};
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
335 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
336 *)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
337 FTYPE=`file ${src}`;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
338 case ${FTYPE} in
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
339 *script*text*)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
340 ${ETAGS} -o- ${src};
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
341 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
342 *text*)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
343 SHEBANG=`head -n1 ${src} | grep '#!' -c`;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
344 if [ ${SHEBANG} -eq 1 ];
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
345 then
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
346 ${ETAGS} -o- ${src};
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
347 fi;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
348 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
349 esac;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
350 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
351 esac;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
352 done;")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
353
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
354 (defconst hfy-etags-cmd-alist-default
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
355 `(("emacs etags" . ,hfy-e2x-etags-cmd)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
356 ("exuberant ctags" . "%s -R -f -" )))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
357
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
358 (defcustom hfy-etags-cmd-alist
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
359 hfy-etags-cmd-alist-default
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
360 "Alist of possible shell commands that will generate etags output that
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
361 `htmlfontify' can use. \'%s\' will be replaced by `hfy-etags-bin'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
362 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
363 :tag "etags-cmd-alist"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
364 :type '(alist :key-type (string) :value-type (string)) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
365
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
366 (defcustom hfy-etags-bin "etags"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
367 "Location of etags binary (we begin by assuming it\'s in your path).\n
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
368 Note that if etags is not in your path, you will need to alter the shell
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
369 commands in `hfy-etags-cmd-alist'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
370 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
371 :tag "etags-bin"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
372 :type '(file))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
373
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
374 (defcustom hfy-shell-file-name "/bin/sh"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
375 "Shell (bourne or compatible) to invoke for complex shell operations."
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
376 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
377 :tag "shell-file-name"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
378 :type '(file))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
379
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
380 (defun hfy-which-etags ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
381 "Return a string indicating which flavour of etags we are using."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
382 (let ((v (shell-command-to-string (concat hfy-etags-bin " --version"))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
383 (cond ((string-match "exube" v) "exuberant ctags")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
384 ((string-match "GNU E" v) "emacs etags" )) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
385
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
386 (defcustom hfy-etags-cmd
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
387 (eval-and-compile (cdr (assoc (hfy-which-etags) hfy-etags-cmd-alist)))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
388 "The etags equivalent command to run in a source directory to generate a tags
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
389 file for the whole source tree from there on down. The command should emit
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
390 the etags output on stdout.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
391 Two canned commands are provided - they drive Emacs\' etags and
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
392 exuberant-ctags\' etags respectively."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
393 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
394 :tag "etags-command"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
395 :type (eval-and-compile
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
396 (let ((clist (list '(string))))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
397 (dolist (C hfy-etags-cmd-alist)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
398 (push (list 'const :tag (car C) (cdr C)) clist))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
399 (cons 'choice clist)) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
400
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
401 (defcustom hfy-istext-command "file %s | sed -e 's@^[^:]*:[ \t]*@@'"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
402 "Command to run with the name of a file, to see whether it is a text file
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
403 or not. The command should emit a string containing the word \'text\' if
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
404 the file is a text file, and a string not containing \'text\' otherwise."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
405 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
406 :tag "istext-command"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
407 :type '(string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
408
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
409 (defcustom hfy-find-cmd
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
410 "find . -type f \\! -name \\*~ \\! -name \\*.flc \\! -path \\*/CVS/\\*"
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
411 "Find command used to harvest a list of files to attempt to fontify."
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
412 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
413 :tag "find-command"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
414 :type '(string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
415
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
416 (defcustom hfy-display-class nil
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
417 "Display class to use to determine which display class to use when
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
418 calculating a face\'s attributes. This is useful when, for example, you
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
419 are running Emacs on a tty or in batch mode, and want htmlfontify to have
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
420 access to the face spec you would use if you were connected to an X display.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
421 Some valid class specification elements are:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
422 \'\(class color\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
423 \'\(class grayscale\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
424 \'\(background dark\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
425 \'\(background light\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
426 \'\(type x-toolkit\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
427 \'\(type tty\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
428 \'\(type motif\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
429 \'\(type lucid\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
430 Multiple values for a tag may be combined, to indicate that any one or more
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
431 of these values in the specification key constitutes a match, eg:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
432 \'\(\(class color grayscale\) \(type tty\)\) would match any of:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
433 \'\(\(class color\)\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
434 \'\(\(class grayscale\)\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
435 \'\(\(class color grayscale\)\)\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
436 \'\(\(class color foo\)\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
437 \'\(\(type tty\)\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
438 \'\(\(type tty\) \(class color\)\)\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
439 and so on."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
440 :type '(alist :key-type (symbol) :value-type (symbol))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
441 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
442 :tag "display-class"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
443 :options '((type (choice (const :tag "X11" x-toolkit)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
444 (const :tag "Terminal" tty )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
445 (const :tag "Lucid Toolkit" lucid )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
446 (const :tag "Motif Toolkit" motif )))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
447
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
448 (class (choice (const :tag "Colour" color )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
449 (const :tag "Greyscale" grayscale)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
450
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
451 (background (choice (const :tag "Dark" dark )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
452 (const :tag "Bright" light ))) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
453
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
454 (defcustom hfy-optimisations (list 'keep-overlays)
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
455 "Optimisations to turn on: So far, the following have been implemented:\n
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
456 merge-adjacent-tags: If two (or more) span tags are adjacent, identical and
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
457 separated by nothing more than whitespace, they will
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
458 be merged into one span.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
459 zap-comment-links : Suppress hyperlinking of tags found in comments.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
460 zap-string-links : Suppress hyperlinking of tags found in strings.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
461 div-wrapper : Add <div class=\"default\"> </div> tags around the
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
462 output.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
463 keep-overlays : More of a bell \(or possibly whistle\) than an
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
464 optimisation - If on, preserve overlay highlighting
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
465 \(cf ediff or goo-font-lock\) as well as basic faces\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
466 And the following are planned but not yet available:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
467 kill-context-leak : Suppress hyperlinking between files highlighted by
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
468 different modes.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
469 Note: like compiler optimisations, these optimise the _output_ of the code,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
470 not the processing of the source itself, and are therefore likely to slow
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
471 htmlfontify down, at least a little. Except for skip-refontification,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
472 which can never slow you down, but may result in incomplete fontification."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
473 :type '(set (const :tag "merge-adjacent-tags" merge-adjacent-tags )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
474 (const :tag "zap-comment-links" zap-comment-links )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
475 (const :tag "zap-string-links" zap-string-links )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
476 (const :tag "skip-refontification" skip-refontification)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
477 (const :tag "kill-context-leak" kill-context-leak )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
478 (const :tag "div-wrapper" div-wrapper )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
479 (const :tag "keep-overlays" keep-overlays ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
480 :group 'htmlfontify
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
481 :tag "optimisations")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
482
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
483 (defvar hfy-tags-cache nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
484 "Alist of the form:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
485 \(\(\"/src/dir/0\" . tag-hash0\) \(\"/src/dir/1\" tag-hash1\) ...\)\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
486 Each tag hash entry then contains entries of the form:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
487 \"tag_string\" => ((\"file/name.ext\" line char) ... )\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
488 ie an alist mapping \(relative\) file paths to line and character offsets.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
489 See `hfy-load-tags-cache'.")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
490
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
491 (defvar hfy-tags-sortl nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
492 "Alist of the form \(\(\"/src/dir\" . (tag0 tag1 tag2)\) ... \)\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
493 Where the tags are stored in descending order of length.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
494 See `hfy-load-tags-cache'.")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
495
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
496 (defvar hfy-tags-rmap nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
497 "Alist of the form \(\(\"/src/dir\" . tag-rmap-hash\)\)\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
498 Where tag-rmap-hash has entries of the form:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
499 \"tag_string\" => ( \"file/name.ext\" line char )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
500 Unlike `hfy-tags-cache' these are the locations of occurrences of
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
501 tagged items, not the locations of their definitions.")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
502
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
503 (defvar hfy-style-assoc 'please-ignore-this-line
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
504 "An assoc representing/describing an Emacs face.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
505 Properties may be repeated, In which case later properties should be
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
506 treated as if they were inherited from a \'parent\' font.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
507 \(For some properties, only the first encountered value is of any importance,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
508 for others the values might be cumulative, and for others they might be
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
509 cumulative in a complex way).\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
510 Some examples:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
511 \(hfy-face-to-style 'default\) =>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
512 \(\(\"background\" . \"rgb\(0, 0, 0\)\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
513 \(\"color\" . \"rgb\(255, 255, 255\)\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
514 \(\"font-style\" . \"normal\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
515 \(\"font-weight\" . \"500\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
516 \(\"font-stretch\" . \"normal\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
517 \(\"font-family\" . \"misc-fixed\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
518 \(\"font-size\" . \"13pt\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
519 \(\"text-decoration\" . \"none\"\)\)\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
520 \(hfy-face-to-style 'Info-title-3-face\) =>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
521 \(\(\"font-weight\" . \"700\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
522 \(\"font-family\" . \"helv\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
523 \(\"font-size\" . \"120%\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
524 \(\"text-decoration\" . \"none\"\)\)\n")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
525
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
526 (defvar hfy-sheet-assoc 'please-ignore-this-line
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
527 "An assoc with elements of the form (face-name style-name . stlye-string):\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
528 '\(\(default \"default\" . \"{background: black;color: white}\"\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
529 \(font-lock-string-face \"string\" . \"{color: rgb\(64,224,208\)}\"\)\)" )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
530
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
531 (defvar hfy-facemap-assoc 'please-ignore-this-line
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
532 "An assoc of \(point . FACE-SYMBOL\) or \(point . DEFFACE-LIST\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
533 and (point . 'end) elements, in descending order of point value
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
534 \(ie from the file's end to its beginning\).\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
535 The map is in reverse order because inserting a <style> tag \(or any other
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
536 string) at POINT invalidates the map for all entries with a greater value of
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
537 point. By traversing the map from greatest to least POINT, we still invalidate
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
538 the map as we go, but only those points we have already dealt with \( and
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
539 therefore no longer care about \) will be invalid at any time.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
540 '\(\(64820 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
541 \(64744 . font-lock-comment-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
542 \(64736 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
543 \(64722 . font-lock-string-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
544 \(64630 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
545 \(64623 . font-lock-string-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
546 \(64449 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
547 \(64446 . font-lock-keyword-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
548 \(64406 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
549 \(64395 . font-lock-constant-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
550 \(64393 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
551 \(64386 . font-lock-keyword-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
552 \(64379 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
553 ;; big similar section elided. You get the idea.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
554 \(4285 . font-lock-constant-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
555 \(4285 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
556 \(4221 . font-lock-comment-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
557 \(4221 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
558 \(4197 . font-lock-constant-face\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
559 \(4197 . end\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
560 \(1 . font-lock-comment-face\)\)")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
561
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
562 (defvar hfy-tmpfont-stack nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
563 "An alist of derived fonts resulting from overlays.")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
564
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
565 (defconst hfy-hex-regex "[0-9A-Fa-f]")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
566
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
567 (defconst hfy-triplet-regex
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
568 (concat
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
569 "\\(" hfy-hex-regex hfy-hex-regex "\\)"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
570 "\\(" hfy-hex-regex hfy-hex-regex "\\)"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
571 "\\(" hfy-hex-regex hfy-hex-regex "\\)"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
572
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
573 (defun hfy-interq (set-a set-b)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
574 "Return the intersection \(using `eq'\) of 2 lists SET-A and SET-B."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
575 (let ((sa set-a) (interq nil) (elt nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
576 (while sa
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
577 (setq elt (car sa)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
578 sa (cdr sa))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
579 (if (memq elt set-b) (setq interq (cons elt interq)))) interq))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
580
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
581 (defun hfy-colour-vals (colour)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
582 "Where COLOUR is a colour name or #XXXXXX style triplet, return a
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
583 list of 3 (16 bit) rgb values for said colour.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
584 If a window system is unavailable, calls `hfy-fallback-colour-values'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
585 (if (string-match hfy-triplet-regex colour)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
586 (mapcar
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
587 (lambda (x) (* (string-to-number (match-string x colour) 16) 257))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
588 '(1 2 3))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
589 ;;(message ">> %s" colour)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
590 (if window-system
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
591 (if (fboundp 'color-values)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
592 (color-values colour)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
593 ;;(message "[%S]" window-system)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
594 (x-color-values colour))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
595 ;; blarg - tty colours are no good - go fetch some X colours:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
596 (hfy-fallback-colour-values colour))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
597
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
598 (defvar hfy-cperl-mode-kludged-p nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
599
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
600 (defun hfy-kludge-cperl-mode ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
601 "CPerl mode does its damndest not to do some of its fontification when not
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
602 in a windowing system - try to trick it..."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
603 (if (not hfy-cperl-mode-kludged-p)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
604 (progn (if (not window-system)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
605 (let ((window-system 'htmlfontify))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
606 (eval-and-compile (require 'cperl-mode))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
607 (setq cperl-syntaxify-by-font-lock t)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
608 (setq hfy-cperl-mode-kludged-p t))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
609
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
610 (defun hfy-opt (symbol) "Is option SYMBOL set." (memq symbol hfy-optimisations))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
611
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
612 (defun hfy-default-header (file style)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
613 "Default value for `hfy-page-header'.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
614 FILE is the name of the file.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
615 STYLE is the inline CSS stylesheet (or tag referring to an external sheet)."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
616 ;; (format "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
617 ;; <html>\n <head>\n <title>%s</title>\n %s\n </head>\n <body>\n" file style))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
618 (format "<?xml version=\"1.0\" encoding=\"utf-8\"?>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
619 <!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
620 \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
621 <html xmlns=\"http://www.w3.org/1999/xhtml\">
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
622 <head>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
623 <title>%s</title>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
624 %s
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
625 <script type=\"text/javascript\"><!--
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
626 // this function is needed to work around
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
627 // a bug in IE related to element attributes
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
628 function hasClass(obj)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
629 {
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
630 var result = false;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
631 if (obj.getAttributeNode(\"class\") != null)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
632 {
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
633 result = obj.getAttributeNode(\"class\").value;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
634 }
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
635 return result;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
636 }
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
637
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
638 function stripe(id)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
639 {
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
640 // the flag we'll use to keep track of
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
641 // whether the current row is odd or even
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
642 var even = false;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
643
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
644 // if arguments are provided to specify the colours
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
645 // of the even & odd rows, then use the them;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
646 // otherwise use the following defaults:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
647 var evenColor = arguments[1] ? arguments[1] : \"#fff\";
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
648 var oddColor = arguments[2] ? arguments[2] : \"#ddd\";
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
649
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
650 // obtain a reference to the desired table
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
651 // if no such table exists, abort
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
652 var table = document.getElementById(id);
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
653 if (! table) { return; }
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
654
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
655 // by definition, tables can have more than one tbody
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
656 // element, so we'll have to get the list of child
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
657 // &lt;tbody&gt;s
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
658 var tbodies = table.getElementsByTagName(\"tbody\");
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
659
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
660 // and iterate through them...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
661 for (var h = 0; h < tbodies.length; h++)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
662 {
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
663 // find all the &lt;tr&gt; elements...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
664 var trs = tbodies[h].getElementsByTagName(\"tr\");
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
665
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
666 // ... and iterate through them
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
667 for (var i = 0; i < trs.length; i++)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
668 {
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
669 // avoid rows that have a class attribute
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
670 // or backgroundColor style
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
671 if (! hasClass(trs[i]) &&
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
672 ! trs[i].style.backgroundColor)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
673 {
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
674 // get all the cells in this row...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
675 var tds = trs[i].getElementsByTagName(\"td\");
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
676
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
677 // and iterate through them...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
678 for (var j = 0; j < tds.length; j++)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
679 {
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
680 var mytd = tds[j];
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
681
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
682 // avoid cells that have a class attribute
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
683 // or backgroundColor style
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
684 if (! hasClass(mytd) &&
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
685 ! mytd.style.backgroundColor)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
686 {
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
687 mytd.style.backgroundColor =
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
688 even ? evenColor : oddColor;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
689 }
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
690 }
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
691 }
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
692 // flip from odd to even, or vice-versa
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
693 even = ! even;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
694 }
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
695 }
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
696 }
106270
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
697
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
698 function toggle_invis( name )
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
699 {
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
700 var filter =
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
701 { acceptNode:
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
702 function( node )
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
703 { var classname = node.id;
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
704 if( classname )
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
705 { var classbase = classname.substr( 0, name.length );
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
706 if( classbase == name ) { return NodeFilter.FILTER_ACCEPT; } }
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
707 return NodeFilter.FILTER_SKIP; } };
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
708 var walker = document.createTreeWalker( document.body ,
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
709 NodeFilter.SHOW_ELEMENT ,
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
710 filter ,
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
711 false );
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
712 while( walker.nextNode() )
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
713 {
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
714 var e = walker.currentNode;
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
715 if( e.style.display == \"none\" ) { e.style.display = \"inline\"; }
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
716 else { e.style.display = \"none\"; }
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
717 }
d059492ca39b Various minor fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106128
diff changeset
718 }
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
719 --> </script>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
720 </head>
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
721 <body onload=\"stripe('index'); return true;\">\n"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
722 file style))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
723
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
724 (defun hfy-default-footer (file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
725 "Default value for `hfy-page-footer'.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
726 FILE is the name of the file being rendered, in case it is needed."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
727 "\n </body>\n</html>\n")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
728
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
729 (defun hfy-link-style-string (style-string)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
730 "Replace the end of a css style declaration STYLE-STRING with the contents
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
731 of the variable `hfy-src-doc-link-style', removing text matching the regex
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
732 `hfy-src-doc-link-unstyle' first, if necessary."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
733 ;;(message "hfy-colour-vals");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
734 (if (string-match hfy-src-doc-link-unstyle style-string)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
735 (setq style-string (replace-match "" 'fixed-case 'literal style-string)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
736 (if (and (not (string-match hfy-src-doc-link-style style-string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
737 (string-match "} *$" style-string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
738 (concat (replace-match hfy-src-doc-link-style
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
739 'fixed-case
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
740 'literal
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
741 style-string) " }") style-string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
742
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
743 ;; utility functions - cast emacs style specification values into their
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
744 ;; css2 equivalents:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
745 (defun hfy-triplet (colour)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
746 "Takes a COLOUR name \(string\) and return a CSS rgb(R, G, B) triplet string.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
747 Uses the definition of \"white\" to map the numbers to the 0-255 range, so
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
748 if you\'ve redefined white, \(esp if you've redefined it to have a triplet
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
749 member lower than that of the colour you are processing, strange things
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
750 may happen\)."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
751 ;;(message "hfy-colour-vals");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
752 (let ((white (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals "white")))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
753 (rgb16 (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals colour))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
754 (if rgb16
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
755 ;;(apply 'format "rgb(%d, %d, %d)"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
756 ;; Use #rrggbb instead, it is smaller
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
757 (apply 'format "#%02x%02x%02x"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
758 (mapcar (lambda (X)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
759 (* (/ (nth X rgb16)
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
760 (nth X white)) 255))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
761 '(0 1 2))))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
762
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
763 (defun hfy-family (family) (list (cons "font-family" family)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
764 (defun hfy-bgcol (colour) (list (cons "background" (hfy-triplet colour))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
765 (defun hfy-colour (colour) (list (cons "color" (hfy-triplet colour))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
766 (defun hfy-width (width) (list (cons "font-stretch" (symbol-name width))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
767
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
768 (defcustom hfy-font-zoom 1.05
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
769 "Font scaling from Emacs to HTML."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
770 :type 'float
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
771 :group 'htmlfontify)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
772
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
773 (defun hfy-size (height)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
774 "Derive a CSS font-size specifier from an Emacs font :height attribute HEIGHT.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
775 Does not cope with the case where height is a function to be applied to
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
776 the height of the underlying font."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
777 (list
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
778 (cond
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
779 ;;(t (cons "font-size" ": 1em"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
780 ((floatp height)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
781 (cons "font-size" (format "%d%%" (* (* hfy-font-zoom height) 100))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
782 ((integerp height)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
783 (cons "font-size" (format "%dpt" (/ (* hfy-font-zoom height) 10 )))) )) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
784
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
785 (defun hfy-slant (slant)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
786 "Derive a font-style css specifier from the Emacs :slant attribute SLANT:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
787 CSS does not define the reverse-* styles, so just maps those to the
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
788 regular specifiers."
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
789 (list (cons "font-style"
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
790 (or (cdr (assq slant '((italic . "italic")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
791 (reverse-italic . "italic" )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
792 (oblique . "oblique")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
793 (reverse-oblique . "oblique"))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
794 "normal"))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
795
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
796 (defun hfy-weight (weight)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
797 "Derive a font-weight css specifier from an Emacs weight spec symbol WEIGHT."
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
798 (list (cons "font-weight" (cdr (assq weight '((ultra-bold . "900")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
799 (extra-bold . "800")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
800 (bold . "700")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
801 (semi-bold . "600")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
802 (normal . "500")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
803 (semi-light . "400")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
804 (light . "300")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
805 (extra-light . "200")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
806 (ultra-light . "100")))))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
807
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
808 (defun hfy-box-to-border-assoc (spec)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
809 (if spec
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
810 (let ((tag (car spec))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
811 (val (cadr spec)))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
812 (cons (case tag
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
813 (:color (cons "colour" val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
814 (:width (cons "width" val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
815 (:style (cons "style" val)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
816 (hfy-box-to-border-assoc (cddr spec))))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
817
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
818 (defun hfy-box-to-style (spec)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
819 (let* ((css (hfy-box-to-border-assoc spec))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
820 (col (cdr (assoc "colour" css)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
821 (s (cdr (assoc "style" css))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
822 (list
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
823 (if col (cons "border-color" (cdr (assoc "colour" css))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
824 (cons "border-width" (format "%dpx" (or (cdr (assoc "width" css)) 1)))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
825 (cons "border-style" (case s
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
826 (released-button "outset")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
827 (pressed-button "inset" )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
828 (t "solid" ))))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
829
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
830 (defun hfy-box (box)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
831 "Derive CSS border-* attributes from the Emacs :box attribute BOX."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
832 (if box
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
833 (cond
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
834 ((integerp box) (list (cons "border-width" (format "%dpx" box))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
835 ((stringp box) (list (cons "border" (format "solid %s 1px" box))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
836 ((listp box) (hfy-box-to-style box) ))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
837
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
838 (defun hfy-decor (tag val)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
839 "Derive CSS text-decoration specifiers from various Emacs font attributes.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
840 TAG is an Emacs font attribute key (eg :underline).
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
841 VAL is ignored."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
842 (list
106128
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
843 ;; FIXME: Why not '("text-decoration" . "underline")? --Stef
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
844 (case tag
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
845 (:underline (cons "text-decoration" "underline" ))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
846 (:overline (cons "text-decoration" "overline" ))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
847 (:strike-through (cons "text-decoration" "line-through")))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
848
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
849 (defun hfy-invisible (&optional val)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
850 "This text should be invisible.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
851 Do something in CSS to make that happen.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
852 VAL is ignored here."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
853 '(("display" . "none")))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
854
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
855 (defun hfy-combined-face-spec (face)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
856 "Return a `defface' style alist of possible specifications for FACE.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
857 Entries resulting from customisation \(`custom-set-faces'\) will take
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
858 precedence."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
859 (let ((spec nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
860 (setq spec (append (or (get face 'saved-face) (list))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
861 (or (get face 'face-defface-spec) (list))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
862 (if (and hfy-display-class hfy-default-face-def (eq face 'default))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
863 (setq spec (append hfy-default-face-def spec))) spec))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
864
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
865 (defun hfy-face-attr-for-class (face &optional class)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
866 "Return the face attributes for FACE.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
867 If CLASS is set, it must be a `defface' alist key \[see below\],
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
868 in which case the first face specification returned by `hfy-combined-face-spec'
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
869 which *doesn\'t* clash with CLASS is returned.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
870 \(A specification with a class of t is considered to match any class you
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
871 specify - this matches Emacs\' behaviour when deciding on which face attributes
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
872 to use, to the best of my understanding\).\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
873 If CLASS is nil, then you just get get whatever `face-attr-construct' returns,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
874 ie the current specification in effect for FACE.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
875 *NOTE* This function forces any face that is not \'default and which has
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
876 no :inherit property to inherit from \'default \( this is because \'default
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
877 is magical in that Emacs' fonts behave as if they inherit implicitly from
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
878 \'default, but no such behaviour exists in HTML/CSS \).\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
879 See `hfy-display-class' for details of valid values for CLASS."
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
880 (let ((face-spec
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
881 (if class
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
882 (let ((face-props (hfy-combined-face-spec face))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
883 (face-specn nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
884 (face-class nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
885 (face-attrs nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
886 (face-score -1)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
887 (face-match nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
888 (while face-props
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
889 (setq face-specn (car face-props)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
890 face-class (car face-specn)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
891 face-attrs (cdr face-specn)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
892 face-props (cdr face-props))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
893 ;; if the current element CEL of CLASS is t we match
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
894 ;; if the current face-class is t, we match
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
895 ;; if the cdr of CEL has a non-nil
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
896 ;; intersection with the cdr of the first member of
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
897 ;; the current face-class with the same car as CEL, we match
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
898 ;; if we actually clash, then we can't match
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
899 (let ((cbuf class)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
900 (cel nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
901 (key nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
902 (val nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
903 (x nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
904 (next nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
905 (score 0))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
906 (while (and cbuf (not next))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
907 (setq cel (car cbuf)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
908 cbuf (cdr cbuf)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
909 key (car cel)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
910 val (cdr cel)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
911 val (if (listp val) val (list val)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
912 (cond
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
913 ((or (eq cel t)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
914 (memq face-class '(t default))) ;Default match.
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
915 (setq score 0) (ignore "t match"))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
916 ((not (cdr (assq key face-class))) ;Neither good nor bad.
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
917 nil (ignore "non match, non collision"))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
918 ((setq x (hfy-interq val (cdr (assq key face-class))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
919 (setq score (+ score (length x)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
920 (ignore "intersection"))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
921 (t ;; nope.
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
922 (setq next t score -10) (ignore "collision")) ))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
923 (if (> score face-score)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
924 (progn
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
925 (setq face-match face-attrs
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
926 face-score score )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
927 (ignore "%d << %S/%S" score face-class class))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
928 (ignore "--- %d ---- (insufficient)" score)) ))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
929 ;; matched ? last attrs : nil
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
930 (if face-match
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
931 (if (listp (car face-match)) (car face-match) face-match)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
932 nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
933 ;; Unfortunately the default face returns a
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
934 ;; :background. Fortunately we can remove it, but how do we do
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
935 ;; that in a non-system specific way?
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
936 (let ((spec (face-attr-construct face))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
937 (new-spec nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
938 (if (not (memq :background spec))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
939 spec
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
940 (while spec
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
941 (let ((a (nth 0 spec))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
942 (b (nth 1 spec)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
943 (unless (and (eq a :background)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
944 (stringp b)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
945 (string= b "SystemWindow"))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
946 (setq new-spec (cons a (cons b new-spec)))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
947 (setq spec (cddr spec)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
948 new-spec)))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
949 (if (or (memq :inherit face-spec) (eq 'default face))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
950 face-spec
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
951 (nconc face-spec (list :inherit 'default))) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
952
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
953 ;; construct an assoc of (css-tag-name . css-tag-value) pairs
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
954 ;; from a face or assoc of face attributes:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
955
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
956 ;; Some tests etc:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
957 ;; (mumamo-message-with-face "testing face" 'highlight)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
958 ;; (mumamo-message-with-face "testing face" '(:foreground "red" :background "yellow"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
959 ;; (hfy-face-to-style-i '(:inherit default foreground-color "red"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
960 ;; default face=(:stipple nil :background "SystemWindow" :foreground
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
961 ;; "SystemWindowText" :inverse-video nil :box nil :strike-through
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
962 ;; nil :overline nil :underline nil :slant normal :weight normal
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
963 ;; :height 98 :width normal :family "outline-courier new")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
964 (defun hfy-face-to-style-i (fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
965 "The guts of `hfy-face-to-style': FN should be a `defface' font spec,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
966 as returned by `face-attr-construct' or `hfy-face-attr-for-class'. Note
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
967 that this function does not get font-sizes right if they are based on
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
968 inherited modifiers \(via the :inherit\) attribute, and any other
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
969 modifiers that are cumulative if they appear multiple times need to be
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
970 merged by the user - `hfy-flatten-style' should do this."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
971 ;;(message "hfy-face-to-style-i");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
972
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
973 ;; fn's value could be something like
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
974 ;; (:inherit
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
975 ;; ((foreground-color . "blue"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
976 ;; (foreground-color . "blue")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
977 ;; nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
978
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
979 (when fn
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
980 (let ((key (car fn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
981 (val (cadr fn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
982 (next (cddr fn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
983 (that nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
984 (this nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
985 (parent nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
986 (if (eq key :inherit)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
987 (let ((vs (if (listp val) val (list val))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
988 ;; (let ((x '(a b))) (setq x (append '(c d) x)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
989 ;; (let ((x '(a b))) (setq x (append '(c d) x)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
990 (dolist (v vs)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
991 (setq parent
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
992 (append
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
993 parent
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
994 (hfy-face-to-style-i
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
995 (hfy-face-attr-for-class v hfy-display-class)) ))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
996 (setq this
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
997 (if val (case key
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
998 (:family (hfy-family val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
999 (:width (hfy-width val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1000 (:weight (hfy-weight val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1001 (:slant (hfy-slant val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1002 (:foreground (hfy-colour val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1003 (:background (hfy-bgcol val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1004 (:box (hfy-box val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1005 (:height (hfy-size val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1006 (:underline (hfy-decor key val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1007 (:overline (hfy-decor key val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1008 (:strike-through (hfy-decor key val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1009 (:invisible (hfy-invisible val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1010 (:bold (hfy-weight 'bold))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1011 (:italic (hfy-slant 'italic))))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1012 (setq that (hfy-face-to-style-i next))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1013 ;;(lwarn t :warning "%S => %S" fn (nconc this that parent))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1014 (nconc this that parent))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1015
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1016 (defun hfy-size-to-int (spec)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1017 "Convert SPEC, a css font-size specifier, back to an Emacs :height attribute
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1018 value. Used while merging multiple font-size attributes."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1019 ;;(message "hfy-size-to-int");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1020 (list
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1021 (if (string-match "\\([0-9]+\\)\\(%\\|pt\\)" spec)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1022 (cond ((string= "%" (match-string 2 spec))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1023 (/ (string-to-number (match-string 1 spec)) 100.0))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1024 ((string= "pt" (match-string 2 spec))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1025 (* (string-to-number (match-string 1 spec)) 10)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1026 (string-to-number spec))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1027
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1028 ;; size is different, in that in order to get it right at all,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1029 ;; we have to trawl the inheritance path, accumulating modifiers,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1030 ;; _until_ we get to an absolute (pt) specifier, then combine the lot
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1031 (defun hfy-flatten-style (style)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1032 "Take STYLE (see `hfy-face-to-style-i', `hfy-face-to-style') and merge
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1033 any multiple attributes appropriately. Currently only font-size is merged
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1034 down to a single occurrence - others may need special handling, but I
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1035 haven\'t encountered them yet. Returns a `hfy-style-assoc'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1036 ;;(message "(hfy-flatten-style %S)" style) ;;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1037 (let ((n 0)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1038 (m (list 1))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1039 (x nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1040 (r nil))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1041 (dolist (css style)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1042 (if (string= (car css) "font-size")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1043 (progn
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1044 (when (not x) (setq m (nconc m (hfy-size-to-int (cdr css)))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1045 (when (string-match "pt" (cdr css)) (setq x t)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1046 (setq r (nconc r (list css)))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1047 ;;(message "r: %S" r)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1048 (setq n (apply '* m))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1049 (nconc r (hfy-size (if x (round n) (* n 1.0)))) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1050
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1051 (defun hfy-face-to-style (fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1052 "Take FN, a font or `defface' style font specification,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1053 \(as returned by `face-attr-construct' or `hfy-face-attr-for-class'\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1054 and return a `hfy-style-assoc'.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1055 See also: `hfy-face-to-style-i', `hfy-flatten-style'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1056 ;;(message "hfy-face-to-style");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1057 (let ((face-def (if (facep fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1058 (hfy-face-attr-for-class fn hfy-display-class) fn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1059 (final-style nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1060
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1061 (setq final-style (hfy-flatten-style (hfy-face-to-style-i face-def)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1062 ;;(message "%S" final-style)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1063 (if (not (assoc "text-decoration" final-style))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1064 (progn (setq final-style
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1065 ;; Fix-me: there is no need for this since
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1066 ;; text-decoration is not inherited.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1067 ;; but it's not wrong and if this ever changes it will
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1068 ;; be needed, so I think it's better to leave it in? -- v
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1069 (nconc final-style '(("text-decoration"."none"))))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1070 final-style))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1071
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1072 ;; strip redundant bits from a name. Technically, this could result in
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1073 ;; a collision, but it is pretty unlikely - will fix later...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1074 ;; also handle ephemeral fonts created by overlays, which don't actually
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1075 ;; have names:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1076 (defun hfy-face-or-def-to-name (fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1077 "Render a font symbol or `defface' font spec FN into a name \(string\)."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1078 ;;(message "generating name for %s" fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1079 (if (not (listp fn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1080 (format "%s" fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1081 (let* ((key (format "%s" fn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1082 (entry (assoc key hfy-tmpfont-stack))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1083 (base (cadr (memq :inherit fn)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1084 (tag (cdr entry)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1085 ;;(message "checking for key «%s» in font stack [%d]"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1086 ;; key (if entry 1 0))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1087 (if entry nil ;; noop
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1088 (setq tag (format "%04d" (length hfy-tmpfont-stack))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1089 entry (cons key tag)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1090 hfy-tmpfont-stack (cons entry hfy-tmpfont-stack)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1091 ;;(message " -> name: %s-%s" (or base 'default) tag)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1092 (format "%s-%s" (or base 'default) tag)) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1093
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1094 (defun hfy-css-name (fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1095 "Strip the boring bits from a font-name FN and return a CSS style name."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1096 ;;(message "hfy-css-name");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1097 (let ((face-name (hfy-face-or-def-to-name fn)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1098 (if (or (string-match "font-lock-\\(.*\\)" face-name)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1099 (string-match "cperl-\\(.*\\)" face-name)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1100 (string-match "^[Ii]nfo-\\(.*\\)" face-name))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1101 (progn
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1102 (setq face-name (match-string 1 face-name))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1103 (if (string-match "\\(.*\\)-face$" face-name)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1104 (setq face-name (match-string 1 face-name))) face-name)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1105 face-name)) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1106
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1107 ;; construct an assoc of (stripped-name . "{ css-stuff-here }") pairs
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1108 ;; from a face:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1109 (defun hfy-face-to-css (fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1110 "Take FN, a font or `defface' specification \(cf `face-attr-construct'\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1111 and return a CSS style specification.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1112 See also: `hfy-face-to-style'"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1113 ;;(message "hfy-face-to-css");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1114 (let ((css-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1115 (css-text nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1116 (seen nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1117 ;;(message "(hfy-face-to-style %S)" fn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1118 (setq css-list (hfy-face-to-style fn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1119 (setq css-text
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1120 (mapcar
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1121 (lambda (E)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1122 (if (car E)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1123 (unless (member (car E) seen)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1124 (push (car E) seen)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1125 (format " %s: %s; " (car E) (cdr E)))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1126 css-list))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1127 (cons (hfy-css-name fn) (format "{%s}" (apply 'concat css-text)))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1128
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1129 ;; extract a face from a list of char properties, if there is one:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1130 (defun hfy-p-to-face (props)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1131 "Given PROPS, a list of text-properties, return the value of the face
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1132 property, or nil."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1133 (if props
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1134 (if (string= (car props) "face")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1135 (let ((propval (cadr props)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1136 (if (and (listp propval) (not (cdr propval)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1137 (car propval)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1138 propval))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1139 (hfy-p-to-face (cddr props)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1140 nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1141
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1142 (defun hfy-p-to-face-lennart (props)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1143 "Given PROPS, a list of text-properties, return the value of the face
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1144 property, or nil."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1145 (when props
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1146 (let ((face (plist-get props 'face))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1147 (font-lock-face (plist-get props 'font-lock-face))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1148 (button (plist-get props 'button))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1149 ;;(face-rec (memq 'face props))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1150 ;;(button-rec (memq 'button props)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1151 )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1152 (if button
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1153 (let* ((category (plist-get props 'category))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1154 (face (when category (plist-get (symbol-plist category) 'face))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1155 face)
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1156 (or font-lock-face
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1157 face)))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1158
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1159 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1160 ;; (defun hfy-get-face-at (pos)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1161 ;; ;; (let ((face (get-char-property-and-overlay pos 'face)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1162 ;; ;; (when (and face (listp face)) (setq face (car face)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1163 ;; ;; (unless (listp face)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1164 ;; ;; face)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1165 ;; ;;(get-char-property pos 'face)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1166 ;; ;; Overlays are handled later
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1167 ;; (if (or (not show-trailing-whitespace)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1168 ;; (not (get-text-property pos 'hfy-show-trailing-whitespace)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1169 ;; (get-text-property pos 'face)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1170 ;; (list 'trailing-whitespace (get-text-property pos 'face)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1171 ;; )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1172
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1173 (defun hfy-prop-invisible-p (prop)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1174 "Is text property PROP an active invisibility property?"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1175 (or (and (eq buffer-invisibility-spec t) prop)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1176 (or (memq prop buffer-invisibility-spec)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1177 (assq prop buffer-invisibility-spec))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1178
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1179 (defun hfy-find-invisible-ranges ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1180 "Return a list of (start-point . end-point) cons cells of invisible regions."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1181 (let (invisible p i e s) ;; return-value pos invisible end start
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1182 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1183 (setq p (goto-char (point-min)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1184 (when (invisible-p p) (setq s p i t))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1185 (while (< p (point-max))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1186 (if i ;; currently invisible
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1187 (when (not (invisible-p p)) ;; but became visible
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1188 (setq e p
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1189 i nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1190 invisible (cons (cons s e) invisible)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1191 ;; currently visible:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1192 (when (invisible-p p) ;; but have become invisible
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1193 (setq s p i t)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1194 (setq p (next-char-property-change p)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1195 ;; still invisible at buffer end?
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1196 (when i
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1197 (setq e (point-max)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1198 invisible (cons (cons s e) invisible))) ) invisible))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1199
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1200 (defun hfy-invisible-name (point map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1201 "Generate a CSS style name for an invisible section of the buffer.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1202 POINT is the point inside the invisible region.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1203 MAP is the invisibility map as returned by `hfy-find-invisible-ranges'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1204 ;;(message "(hfy-invisible-name %S %S)" point map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1205 (let (name)
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1206 (dolist (range map)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1207 (when (and (>= point (car range))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1208 (< point (cdr range)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1209 (setq name (format "invisible-%S-%S" (car range) (cdr range)))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1210 name))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1211
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1212 ;; Fix-me: This function needs some cleanup by someone who understand
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1213 ;; all the formats that face properties can have.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1214 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1215 ;; overlay handling should be fine. haven't tested multiple stacked overlapping
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1216 ;; overlays recently, but the common case of a text property face + an overlay
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1217 ;; face produces the correct merged css style (or as close to it as css can get)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1218 ;; -- v
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1219 (defun hfy-face-at (p)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1220 "Find face in effect at point P.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1221 If overlays are to be considered \(see `hfy-optimisations'\) then this may
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1222 return a defface style list of face properties instead of a face symbol."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1223 ;;(message "hfy-face-at");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1224 ;; Fix-me: clean up, remove face-name etc
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1225 ;; not sure why we'd want to remove face-name? -- v
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1226 (let ((overlay-data nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1227 (base-face nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1228 ;; restored hfy-p-to-face as it handles faces like (bold) as
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1229 ;; well as face like 'bold - hfy-get-face-at doesn't dtrt -- v
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1230 (face-name (hfy-p-to-face (text-properties-at p)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1231 ;; (face-name (hfy-get-face-at p))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1232 (prop-seen nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1233 (extra-props nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1234 (text-props (text-properties-at p)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1235 ;;(message "face-name: %S" face-name)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1236 (when (and face-name (listp face-name) (facep (car face-name)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1237 ;;(message "face-name is a list %S" face-name)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1238 ;;(setq text-props (cons 'face face-name))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1239 (dolist (f face-name)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1240 (setq extra-props (if (listp f)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1241 ;; for things like (variable-pitch
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1242 ;; (:foreground "red"))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1243 (cons f extra-props)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1244 (cons :inherit (cons f extra-props)))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1245 (setq base-face (car face-name)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1246 face-name nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1247 ;; text-properties-at => (face (:foreground "red" ...))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1248 ;; or => (face (compilation-info underline)) list of faces
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1249 ;; overlay-properties
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1250 ;; format= (evaporate t face ((foreground-color . "red")))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1251
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1252 ;; SO: if we have turned overlays off,
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1253 ;; or if there's no overlay data
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1254 ;; just bail out and return whatever face data we've accumulated so far
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1255 (if (or (not (hfy-opt 'keep-overlays))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1256 (not (setq overlay-data (hfy-overlay-props-at p))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1257 (progn
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1258 ;;(message "· %d: %s; %S; %s"
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1259 ;; p face-name extra-props text-props)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1260 (or face-name base-face)) ;; no overlays or extra properties
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1261 ;; collect any face data and any overlay data for processing:
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1262 (when text-props
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1263 (push text-props overlay-data))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1264 (setq overlay-data (nreverse overlay-data))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1265 ;;(message "- %d: %s; %S; %s; %s"
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1266 ;; p face-name extra-props text-props overlay-data)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1267 ;; remember the basic face name so we don't keep repeating its specs:
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1268 (when face-name (setq base-face face-name))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1269 (dolist (P overlay-data)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1270 (let ((iprops (cadr (memq 'invisible P)))) ;FIXME: plist-get?
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1271 ;;(message "(hfy-prop-invisible-p %S)" iprops)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1272 (when (and iprops (hfy-prop-invisible-p iprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1273 (setq extra-props
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1274 (cons :invisible (cons t extra-props))) ))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1275 (let ((fprops (cadr (or (memq 'face P)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1276 (memq 'font-lock-face P)))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1277 ;;(message "overlay face: %s" fprops)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1278 (if (not (listp fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1279 (let ((this-face (if (stringp fprops) (intern fprops) fprops)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1280 (when (not (eq this-face base-face))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1281 (setq extra-props
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1282 (cons :inherit
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1283 (cons this-face extra-props))) ))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1284 (while fprops
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1285 (if (facep (car fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1286 (let ((face (car fprops)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1287 (when (stringp face) (setq face (intern fprops)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1288 (setq extra-props
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1289 (cons :inherit
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1290 (cons face
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1291 extra-props)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1292 (setq fprops (cdr fprops)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1293 (let (p v)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1294 ;; Sigh.
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1295 (if (listp (car fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1296 (if (nlistp (cdr (car fprops)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1297 (progn
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1298 ;; ((prop . val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1299 (setq p (caar fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1300 (setq v (cdar fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1301 (setq fprops (cdr fprops)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1302 ;; ((prop val))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1303 (setq p (caar fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1304 (setq v (cadar fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1305 (setq fprops (cdr fprops)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1306 (if (listp (cdr fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1307 (progn
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1308 ;; (:prop val :prop val ...)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1309 (setq p (car fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1310 (setq v (cadr fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1311 (setq fprops (cddr fprops)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1312 (if (and (listp fprops)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1313 (not (listp (cdr fprops))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1314 ;;(and (consp x) (cdr (last x)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1315 (progn
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1316 ;; (prop . val)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1317 (setq p (car fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1318 (setq v (cdr fprops))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1319 (setq fprops nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1320 (error "Eh... another format! fprops=%s" fprops) )))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1321 (setq p (case p
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1322 ;; These are all the properties handled
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1323 ;; in `hfy-face-to-style-i'.
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1324 ;;
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1325 ;; Are these translations right?
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1326 ;; yes, they are -- v
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1327 (family :family )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1328 (width :width )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1329 (height :height )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1330 (weight :weight )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1331 (slant :slant )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1332 (underline :underline )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1333 (overline :overline )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1334 (strike-through :strike-through)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1335 (box :box )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1336 (foreground-color :foreground)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1337 (background-color :background)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1338 (bold :bold )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1339 (italic :italic )
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1340 (t p)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1341 (if (memq p prop-seen) nil ;; noop
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1342 (setq prop-seen (cons p prop-seen)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1343 extra-props (cons p (cons v extra-props))))))))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1344 ;;(message "+ %d: %s; %S" p face-name extra-props)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1345 (if extra-props
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1346 (if (listp face-name)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1347 (nconc extra-props face-name)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1348 (nconc extra-props (face-attr-construct face-name)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1349 face-name)) ))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1350
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1351 (defun hfy-overlay-props-at (p)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1352 "Grab overlay properties at point P.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1353 The plists are returned in descending priority order."
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1354 (sort (mapcar #'overlay-properties (overlays-at p))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1355 (lambda (A B) (> (or (cadr (memq 'priority A)) 0) ;FIXME: plist-get?
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1356 (or (cadr (memq 'priority B)) 0)))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1357
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1358 ;; construct an assoc of (face-name . (css-name . "{ css-style }")) elements:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1359 (defun hfy-compile-stylesheet ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1360 "Trawl the current buffer, construct and return a `hfy-sheet-assoc'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1361 ;;(message "hfy-compile-stylesheet");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1362 (let ((pt (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1363 ;; Make the font stack stay:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1364 ;;(hfy-tmpfont-stack nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1365 (fn nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1366 (style nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1367 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1368 (goto-char pt)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1369 (while (< pt (point-max))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1370 (if (and (setq fn (hfy-face-at pt)) (not (assoc fn style)))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1371 (push (cons fn (hfy-face-to-css fn)) style))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1372 (setq pt (next-char-property-change pt))) )
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1373 (push (cons 'default (hfy-face-to-css 'default)) style)))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1374
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1375 (defun hfy-fontified-p ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1376 "`font-lock' doesn't like to say it\'s been fontified when in batch
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1377 mode, but we want to know if we should fontify or raw copy, so in batch
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1378 mode we check for non-default face properties. Otherwise we test
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1379 variable `font-lock-mode' and variable `font-lock-fontified' for truth."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1380 ;;(message "font-lock-fontified: %S" font-lock-fontified)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1381 ;;(message "noninteractive : %S" noninteractive)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1382 ;;(message "font-lock-mode : %S" font-lock-mode)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1383 (and font-lock-fontified
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1384 (if noninteractive
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1385 (let ((pt (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1386 (face-name nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1387 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1388 (goto-char pt)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1389 (while (and (< pt (point-max)) (not face-name))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1390 (setq face-name (hfy-face-at pt))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1391 (setq pt (next-char-property-change pt)))) face-name)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1392 font-lock-mode)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1393
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1394 ;; remember, the map is in reverse point order:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1395 ;; I wrote this while suffering the effects of a cold, and maybe a
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1396 ;; mild fever - I think it's correct, but it might be a little warped
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1397 ;; as my minfd keeps ... where was I? Oh yes, the bunnies...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1398 (defun hfy-merge-adjacent-spans (face-map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1399 "Where FACE-MAP is a `hfy-facemap-assoc' for the current buffer,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1400 this function merges adjacent style blocks which are of the same value
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1401 and are separated by nothing more interesting than whitespace.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1402 <span class=\"foo\">narf</span> <span class=\"foo\">brain</span>\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1403 \(as interpreted from FACE-MAP\) would become:\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1404 <span class=\"foo\">narf brain</span>\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1405 Returns a modified copy of FACE-MAP."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1406 (let ((tmp-map face-map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1407 (map-buf nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1408 (first-start nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1409 (first-stop nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1410 (last-start nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1411 (last-stop nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1412 (span-stop nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1413 (span-start nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1414 (reduced-map nil))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1415 ;;(push (car tmp-map) reduced-map)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1416 ;;(push (cadr tmp-map) reduced-map)
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1417 (while tmp-map
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1418 (setq first-start (cadddr tmp-map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1419 first-stop (caddr tmp-map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1420 last-start (cadr tmp-map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1421 last-stop (car tmp-map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1422 map-buf tmp-map
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1423 span-start last-start
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1424 span-stop last-stop )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1425 (while (and (equal (cdr first-start)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1426 (cdr last-start))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1427 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1428 (goto-char (car first-stop))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1429 (not (re-search-forward "[^ \t\n\r]" (car last-start) t))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1430 (setq map-buf (cddr map-buf)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1431 span-start first-start
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1432 first-start (cadddr map-buf)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1433 first-stop (caddr map-buf)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1434 last-start (cadr map-buf)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1435 last-stop (car map-buf)))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1436 (push span-stop reduced-map)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1437 (push span-start reduced-map)
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1438 (setq tmp-map (memq last-start tmp-map))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1439 (setq tmp-map (cdr tmp-map)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1440 (setq reduced-map (nreverse reduced-map))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1441
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1442 ;; remember to generate 'synthetic' </span> entries -
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1443 ;; emacs copes by just having a stack of styles in effect
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1444 ;; and only using the top one: html has a more simplistic approach -
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1445 ;; we have to explicitly end a style, there's no way of temporarily
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1446 ;; overriding it w. another one... (afaik)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1447 (defun hfy-compile-face-map ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1448 ;; no need for special <a> version.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1449 ;; IME hyperlinks don't get underlined, esp when you htmlfontify a whole
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1450 ;; source tree, so the <a> version is needed -- v
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1451 ;; Fix-me: save table for multi-buffer
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1452 "Compile and return a `hfy-facemap-assoc' for the current buffer."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1453 ;;(message "hfy-compile-face-map");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1454 (let ((pt (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1455 (pt-narrow 1)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1456 (fn nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1457 (map nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1458 (prev-tag nil)) ;; t if the last tag-point was a span-start
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1459 ;; nil if it was a span-stop
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1460 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1461 (goto-char pt)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1462 (while (< pt (point-max))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1463 (if (setq fn (hfy-face-at pt))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1464 (progn (if prev-tag (push (cons pt-narrow 'end) map))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1465 (push (cons pt-narrow fn) map)
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1466 (setq prev-tag t))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1467 (if prev-tag (push (cons pt-narrow 'end) map))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1468 (setq prev-tag nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1469 (setq pt (next-char-property-change pt))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1470 (setq pt-narrow (1+ (- pt (point-min)))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1471 (if (and map (not (eq 'end (cdar map))))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1472 (push (cons (- (point-max) (point-min)) 'end) map)))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1473 (if (hfy-opt 'merge-adjacent-tags) (hfy-merge-adjacent-spans map) map)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1474
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1475 (defun hfy-buffer ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1476 "Generate a buffer to hold the html output.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1477 The filename of this buffer is derived from the source \(current\) buffer\'s
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1478 variable `buffer-file-name', if it is set, plus `hfy-extn'.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1479 Otherwise a plausible filename is constructed from `default-directory',
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1480 `buffer-name' and `hfy-extn'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1481 (let* ((name (concat (buffer-name) hfy-extn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1482 (src (buffer-file-name))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1483 (buf (get-buffer-create name)))
106128
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1484 (with-current-buffer buf
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1485 (setq buffer-file-name
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1486 (if src (concat src hfy-extn)
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1487 (expand-file-name (if (string-match "^.*/\\([^/]*\\)$" name)
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1488 (match-string 1 name)
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1489 name))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1490 buf)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1491
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1492 (defun hfy-lookup (face style)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1493 "Get a CSS style name for FACE from STYLE."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1494 (cadr (assoc face style)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1495
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1496 (defun hfy-link-style (style-string)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1497 "Copy, alter and return a STYLE-STRING to make it suitable for a hyperlink.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1498 Uses `hfy-link-style-fun' to do this."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1499 (if (functionp hfy-link-style-fun)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1500 (funcall hfy-link-style-fun style-string)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1501 style-string))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1502
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1503 (defun hfy-sprintf-stylesheet (css file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1504 "Return the inline CSS style sheet for FILE as a string."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1505 (let ((stylesheet nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1506 (setq stylesheet
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1507 (concat
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1508 hfy-meta-tags
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1509 "\n<style type=\"text/css\"><!-- \n"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1510 ;; Fix-me: Add handling of page breaks here + scan for ^L
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1511 ;; where appropriate.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1512 (format "body %s\n" (cddr (assq 'default css)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1513 (apply 'concat
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1514 (mapcar
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1515 (lambda (style)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1516 (format
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1517 "span.%s %s\nspan.%s a %s\n"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1518 (cadr style) (cddr style)
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1519 (cadr style) (hfy-link-style (cddr style))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1520 css))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1521 " --></style>\n"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1522 (funcall hfy-page-header file stylesheet)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1523
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1524 ;; tag all the dangerous characters we want to escape
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1525 ;; (ie any "<> chars we _didn't_ put there explicitly for css markup)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1526 (defun hfy-html-enkludge-buffer ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1527 "Mark dangerous [\"\<\>] characters with the \'hfy-quoteme property.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1528 See also `hfy-html-dekludge-buffer'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1529 ;;(message "hfy-html-enkludge-buffer");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1530 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1531 (goto-char (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1532 (while (re-search-forward hfy-html-quote-regex nil t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1533 (put-text-property (match-beginning 0) (point) 'hfy-quoteme t))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1534
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1535 ;; dangerous char -> &entity;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1536 (defun hfy-html-quote (char-string)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1537 "Map CHAR-STRING to an html safe string (entity) if need be."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1538 ;;(message "hfy-html-quote");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1539 (or (cadr (assoc char-string hfy-html-quote-map)) char-string) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1540
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1541 ;; actually entity-ise dangerous chars.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1542 ;; note that we can't do this until _after_ we have inserted the css
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1543 ;; markup, since we use a position-based map to insert this, and if we
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1544 ;; enter any other text before we do this, we'd have to track another
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1545 ;; map of offsets, which would be tedious...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1546 (defun hfy-html-dekludge-buffer ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1547 "Transform all dangerous characters marked with the \'hfy-quoteme property
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1548 using `hfy-html-quote'\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1549 See also `hfy-html-enkludge-buffer'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1550 ;;(message "hfy-html-dekludge-buffer");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1551 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1552 (goto-char (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1553 (while (re-search-forward hfy-html-quote-regex nil t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1554 (if (get-text-property (match-beginning 0) 'hfy-quoteme)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1555 (replace-match (hfy-html-quote (match-string 1))) )) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1556
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1557 ;; Borrowed from font-lock.el
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1558 (defmacro hfy-save-buffer-state (varlist &rest body)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1559 "Bind variables according to VARLIST and eval BODY restoring buffer state.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1560 Do not record undo information during evaluation of BODY."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1561 (declare (indent 1) (debug let))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1562 (let ((modified (make-symbol "modified")))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1563 `(let* ,(append varlist
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1564 `((,modified (buffer-modified-p))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1565 (buffer-undo-list t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1566 (inhibit-read-only t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1567 (inhibit-point-motion-hooks t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1568 (inhibit-modification-hooks t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1569 deactivate-mark
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1570 buffer-file-name
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1571 buffer-file-truename))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1572 (progn
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1573 ,@body)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1574 (unless ,modified
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1575 (restore-buffer-modified-p nil)))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1576
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1577 (defun hfy-mark-trailing-whitespace ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1578 "Tag trailing whitespace with a hfy property if it is currently highlighted."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1579 (when show-trailing-whitespace
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1580 (let ((inhibit-read-only t))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1581 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1582 (goto-char (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1583 (hfy-save-buffer-state nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1584 (while (re-search-forward "[ \t]+$" nil t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1585 (put-text-property (match-beginning 0) (match-end 0)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1586 'hfy-show-trailing-whitespace t)))))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1587
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1588 (defun hfy-unmark-trailing-whitespace ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1589 "Undo the effect of `hfy-mark-trailing-whitespace'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1590 (when show-trailing-whitespace
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1591 (hfy-save-buffer-state nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1592 (remove-text-properties (point-min) (point-max)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1593 '(hfy-show-trailing-whitespace)))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1594
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1595 (defun hfy-fontify-buffer (&optional srcdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1596 "Implement the guts of `htmlfontify-buffer'.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1597 SRCDIR, if set, is the directory being htmlfontified.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1598 FILE, if set, is the file name."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1599 (if srcdir (setq srcdir (directory-file-name srcdir)))
106128
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1600 (let* ( (html-buffer (hfy-buffer))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1601 (css-sheet nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1602 (css-map nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1603 (invis-ranges nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1604 (rovl nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1605 (orig-ovls (overlays-in (point-min) (point-max)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1606 (rmin (when mark-active (region-beginning)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1607 (rmax (when mark-active (region-end ))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1608 (when (and mark-active
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1609 transient-mark-mode)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1610 (unless (and (= rmin (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1611 (= rmax (point-max)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1612 (setq rovl (make-overlay rmin rmax))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1613 (overlay-put rovl 'priority 1000)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1614 (overlay-put rovl 'face 'region)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1615 ;; copy the buffer, including fontification, and switch to it:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1616 (hfy-mark-trailing-whitespace)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1617 (setq css-sheet (hfy-compile-stylesheet )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1618 css-map (hfy-compile-face-map )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1619 invis-ranges (hfy-find-invisible-ranges))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1620 (hfy-unmark-trailing-whitespace)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1621 (when rovl
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1622 (delete-overlay rovl))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1623 (copy-to-buffer html-buffer (point-min) (point-max))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1624 (set-buffer html-buffer)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1625 ;; Apply overlay invisible spec
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1626 (setq orig-ovls
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1627 (sort orig-ovls
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1628 (lambda (A B)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1629 (> (or (cadr (memq 'priority (overlay-properties A))) 0)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1630 (or (cadr (memq 'priority (overlay-properties B))) 0)))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1631 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1632 ;; at this point, html-buffer retains the fontification of the parent:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1633 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1634 ;; we don't really need or want text in the html buffer to be invisible, as
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1635 ;; that can make it look like we've rendered invalid xhtml when all that's
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1636 ;; happened is some tags are in the invisible portions of the buffer:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1637 (setq buffer-invisibility-spec nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1638 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1639 ;; #####################################################################
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1640 ;; if we are in etags mode, add properties to mark the anchors and links
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1641 (if (and srcdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1642 (progn
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1643 (hfy-mark-tag-names srcdir file) ;; mark anchors
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1644 (hfy-mark-tag-hrefs srcdir file))) ;; mark links
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1645 ;; #####################################################################
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1646 ;; mark the 'dangerous' characters
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1647 ;;(message "marking dangerous characters")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1648 (hfy-html-enkludge-buffer)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1649 ;; trawl the position-based face-map, inserting span tags as we go
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1650 ;; note that we cannot change any character positions before this point
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1651 ;; or we will invalidate the map:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1652 ;; NB: This also means we have to trawl the map in descending file-offset
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1653 ;; order, obviously.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1654 ;; ---------------------------------------------------------------------
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1655 ;; Remember, inserting pushes properties to the right, which we don't
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1656 ;; actually want to happen for link properties, so we have to flag
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1657 ;; them and move them by hand - if you don't, you end up with
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1658 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1659 ;; <span class="foo"><a href="bar">texta</span><span class="bletch"></a>...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1660 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1661 ;; instead of:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1662 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1663 ;; <span class="foo"><a href="bar">texta</a></span><span class="bletch">...
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1664 ;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1665 ;; If my analysis of the problem is correct, we can detect link-ness by
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1666 ;; either hfy-linkp or hfy-endl properties at the insertion point, but I
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1667 ;; think we only need to relocate the hfy-endl property, as the hfy-linkp
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1668 ;; property has already served its main purpose by this point.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1669 ;;(message "mapcar over the CSS-MAP")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1670 (message "invis-ranges:\n%S" invis-ranges)
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1671 (dolist (point-face css-map)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1672 (let ((pt (car point-face))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1673 (fn (cdr point-face))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1674 (move-link nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1675 (goto-char pt)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1676 (setq move-link
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1677 (or (get-text-property pt 'hfy-linkp)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1678 (get-text-property pt 'hfy-endl )))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1679 (if (eq 'end fn)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1680 (insert "</span>")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1681 (if (not (and srcdir file))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1682 nil
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1683 (when move-link
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1684 (remove-text-properties (point) (1+ (point)) '(hfy-endl nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1685 (put-text-property pt (1+ pt) 'hfy-endl t) ))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1686 ;; if we have invisible blocks, we need to do some extra magic:
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1687 (if invis-ranges
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1688 (let ((iname (hfy-invisible-name pt invis-ranges))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1689 (fname (hfy-lookup fn css-sheet )))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1690 (when (assq pt invis-ranges)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1691 (insert
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1692 (format "<span onclick=\"toggle_invis('%s');\">" iname))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1693 (insert "…</span>"))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1694 (insert
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1695 (format "<span class=\"%s\" id=\"%s-%d\">" fname iname pt)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1696 (insert (format "<span class=\"%s\">" (hfy-lookup fn css-sheet))))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1697 (if (not move-link) nil
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1698 ;;(message "removing prop2 @ %d" (point))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1699 (if (remove-text-properties (point) (1+ (point)) '(hfy-endl nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1700 (put-text-property pt (1+ pt) 'hfy-endl t))))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1701 ;; #####################################################################
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1702 ;; Invisibility
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1703 ;; Maybe just make the text invisible in XHTML?
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1704 ;; DONE -- big block of obsolete invisibility code elided here -- v
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1705 ;; #####################################################################
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1706 ;; (message "checking to see whether we should link...")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1707 (if (and srcdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1708 (let ((lp 'hfy-link)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1709 (pt nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1710 (pr nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1711 (rr nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1712 ;; (message " yes we should.")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1713 ;; translate 'hfy-anchor properties to anchors
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1714 (setq pt (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1715 (while (setq pt (next-single-property-change pt 'hfy-anchor))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1716 (if (setq pr (get-text-property pt 'hfy-anchor))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1717 (progn (goto-char pt)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1718 (remove-text-properties pt (1+ pt) '(hfy-anchor nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1719 (insert (concat "<a name=\"" pr "\"></a>")))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1720 ;; translate alternate 'hfy-link and 'hfy-endl props to opening
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1721 ;; and closing links. (this should avoid those spurious closes
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1722 ;; we sometimes get by generating only paired tags)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1723 (setq pt (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1724 (while (setq pt (next-single-property-change pt lp))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1725 (if (not (setq pr (get-text-property pt lp))) nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1726 (goto-char pt)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1727 (remove-text-properties pt (1+ pt) (list lp nil))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1728 (case lp
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1729 (hfy-link
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1730 (if (setq rr (get-text-property pt 'hfy-inst))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1731 (insert (format "<a name=\"%s\"></a>" rr)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1732 (insert (format "<a href=\"%s\">" pr))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1733 (setq lp 'hfy-endl))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1734 (hfy-endl
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1735 (insert "</a>") (setq lp 'hfy-link)) ))) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1736
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1737 ;; #####################################################################
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1738 ;; transform the dangerous chars. This changes character positions
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1739 ;; since entities have > char length.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1740 ;; note that this deletes the dangerous characters, and therefore
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1741 ;; destroys any properties they may contain (such as 'hfy-endl),
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1742 ;; so we have to do this after we use said properties:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1743 ;; (message "munging dangerous characters")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1744 (hfy-html-dekludge-buffer)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1745 ;; insert the stylesheet at the top:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1746 (goto-char (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1747 ;;(message "inserting stylesheet")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1748 (insert (hfy-sprintf-stylesheet css-sheet file))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1749 (if (hfy-opt 'div-wrapper) (insert "<div class=\"default\">"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1750 (insert "\n<pre>")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1751 (goto-char (point-max))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1752 (insert "</pre>\n")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1753 (if (hfy-opt 'div-wrapper) (insert "</div>"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1754 ;;(message "inserting footer")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1755 (insert (funcall hfy-page-footer file))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1756 ;; call any post html-generation hooks:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1757 (run-hooks 'hfy-post-html-hooks)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1758 ;; return the html buffer
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1759 (set-buffer-modified-p nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1760 html-buffer))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1761
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1762 (defun hfy-force-fontification ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1763 "Try to force font-locking even when it is optimised away."
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1764 (run-hooks 'hfy-init-kludge-hook)
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1765 (eval-and-compile (require 'font-lock))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1766 (if (boundp 'font-lock-cache-position)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1767 (or font-lock-cache-position
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1768 (set 'font-lock-cache-position (make-marker))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1769 (if (not noninteractive)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1770 (progn
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1771 (message "hfy interactive mode (%S %S)" window-system major-mode)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1772 (when (and font-lock-defaults
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1773 font-lock-mode)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1774 (font-lock-fontify-region (point-min) (point-max) nil)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1775 (message "hfy batch mode (%s:%S)"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1776 (or (buffer-file-name) (buffer-name)) major-mode)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1777 (when font-lock-defaults
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1778 (font-lock-fontify-buffer)) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1779
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1780 (defun htmlfontify-buffer (&optional srcdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1781 "Create a new buffer, named for the current buffer + a .html extension,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1782 containing an inline css-stylesheet and formatted css-markup html
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1783 that reproduces the look of the current Emacs buffer as closely
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1784 as possible.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1785
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1786 Dangerous characters in the existing buffer are turned into html
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1787 entities, so you should even be able to do html-within-html
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1788 fontified display.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1789
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1790 You should, however, note that random control or eight-bit
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1791 characters such as ^L (\x0c) or ¤ (\xa4) won't get mapped yet.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1792
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1793 If the SRCDIR and FILE arguments are set, lookup etags derived
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1794 entries in the `hfy-tags-cache' and add html anchors and
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1795 hyperlinks as appropriate."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1796 (interactive)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1797 ;; pick up the file name in case we didn't receive it
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1798 (if (not file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1799 (progn (setq file (or (buffer-file-name) (buffer-name)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1800 (if (string-match "/\\([^/]*\\)$" file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1801 (setq file (match-string 1 file)))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1802
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1803 (if (not (hfy-opt 'skip-refontification))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1804 (save-excursion ;; Keep region
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1805 (hfy-force-fontification)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1806 (if (interactive-p) ;; display the buffer in interactive mode:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1807 (switch-to-buffer (hfy-fontify-buffer srcdir file))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1808 (hfy-fontify-buffer srcdir file)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1809
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1810 ;; recursive file listing
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1811 (defun hfy-list-files (directory)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1812 "Return a list of files under DIRECTORY.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1813 Strips any leading \"./\" from each filename."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1814 ;;(message "hfy-list-files");;DBUG
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
1815 ;; FIXME: this changes the dir of the currrent buffer. Is that right??
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1816 (cd directory)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1817 (mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1818 (split-string (shell-command-to-string hfy-find-cmd))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1819
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1820 ;; strip the filename off, return a directiry name
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1821 ;; not a particularly thorough implementaion, but it will be
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1822 ;; fed pretty carefully, so it should be Ok:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1823 (defun hfy-dirname (file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1824 "Return everything preceding the last \"/\" from a relative filename FILE,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1825 on the assumption that this will produce a relative directory name. Hardly
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1826 bombproof, but good enough in the context in which it is being used."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1827 ;;(message "hfy-dirname");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1828 (let ((f (directory-file-name file)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1829 (and (string-match "^\\(.*\\)/" f) (match-string 1 f))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1830
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1831 ;; create a directory, cf mkdir -p
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1832 (defun hfy-make-directory (dir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1833 "Approx equivalent of mkdir -p DIR."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1834 ;;(message "hfy-make-directory");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1835 (if (file-exists-p dir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1836 (if (file-directory-p dir) t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1837 (make-directory dir t)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1838
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1839 (defun hfy-text-p (srcdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1840 "Is SRCDIR/FILE text? Uses `hfy-istext-command' to determine this."
106128
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1841 (let* ((cmd (format hfy-istext-command (expand-file-name file srcdir)))
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1842 (rsp (shell-command-to-string cmd)))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1843 (if (string-match "text" rsp) t nil)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1844
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1845 ;; open a file, check fontification, if fontified, write a fontified copy
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1846 ;; to the destination directory, otherwise just copy the file:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1847 (defun hfy-copy-and-fontify-file (srcdir dstdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1848 "Open FILE in SRCDIR - if fontified, write a fontified copy to DSTDIR
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1849 adding an extension of `hfy-extn'. Fontification is actually done by
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1850 `htmlfontify-buffer'. If the buffer is not fontified, just copy it."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1851 ;;(message "hfy-copy-and-fontify-file");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1852 (let (;;(fast-lock-minimum-size hfy-fast-lock-save)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1853 ;;(font-lock-support-mode 'fast-lock-mode)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1854 ;;(window-system (or window-system 'htmlfontify))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1855 (target nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1856 (source nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1857 (html nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1858 (cd srcdir)
106128
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1859 (with-current-buffer (setq source (find-file-noselect file))
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1860 ;; FIXME: Shouldn't this use expand-file-name? --Stef
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1861 (setq target (concat dstdir "/" file))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1862 (hfy-make-directory (hfy-dirname target))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1863 (if (not (hfy-opt 'skip-refontification)) (hfy-force-fontification))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1864 (if (or (hfy-fontified-p) (hfy-text-p srcdir file))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1865 (progn (setq html (hfy-fontify-buffer srcdir file))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1866 (set-buffer html)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1867 (write-file (concat target hfy-extn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1868 (kill-buffer html))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1869 ;; #o0200 == 128, but emacs20 doesn't know that
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1870 (if (and (file-exists-p target) (not (file-writable-p target)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1871 (set-file-modes target (logior (file-modes target) 128)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1872 (copy-file (buffer-file-name source) target 'overwrite))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1873 (kill-buffer source)) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1874
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1875 ;; list of tags in file in srcdir
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1876 (defun hfy-tags-for-file (srcdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1877 "List of etags tags that have definitions in this FILE.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1878 Looks up the tags cache in `hfy-tags-cache' using SRCDIR as the key."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1879 ;;(message "hfy-tags-for-file");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1880 (let ((cache-entry (assoc srcdir hfy-tags-cache))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1881 (cache-hash nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1882 (tag-list nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1883 (if (setq cache-hash (cadr cache-entry))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1884 (maphash
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1885 (lambda (K V)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1886 (if (assoc file V)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1887 (setq tag-list (cons K tag-list)))) cache-hash))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1888 tag-list))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1889
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1890 ;; mark the tags native to this file for anchors
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1891 (defun hfy-mark-tag-names (srcdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1892 "Mark tags in FILE (lookup SRCDIR in `hfy-tags-cache') with the \'hfy-anchor
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1893 property, with a value of \"tag.line-number\"."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1894 ;;(message "(hfy-mark-tag-names %s %s)" srcdir file);;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1895 (let ((cache-entry (assoc srcdir hfy-tags-cache))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1896 (cache-hash nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1897 (if (setq cache-hash (cadr cache-entry))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1898 (mapcar
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1899 (lambda (TAG)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1900 (mapcar
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1901 (lambda (TLIST)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1902 (if (string= file (car TLIST))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1903 (let* ((line (cadr TLIST) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1904 (chr (caddr TLIST) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1905 (link (format "%s.%d" TAG line) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1906 (put-text-property (+ 1 chr)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1907 (+ 2 chr)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1908 'hfy-anchor link))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1909 (gethash TAG cache-hash)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1910 (hfy-tags-for-file srcdir file)))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1911
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1912 (defun hfy-relstub (file &optional start)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1913 "Return a \"../\" stub of the appropriate length for the current source
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1914 tree depth \(as determined from FILE \(a filename\)\).
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1915 START is the offset at which to start looking for the / character in FILE."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1916 ;;(message "hfy-relstub");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1917 (let ((c ""))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1918 (while (setq start (string-match "/" file start))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1919 (setq start (1+ start)) (setq c (concat c "../"))) c))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1920
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1921 (defun hfy-href-stub (this-file def-files tag)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1922 "Return an href stub for a tag href i THIS-FILE:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1923 If DEF-FILES \(list of files containing definitions for the tag in question\)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1924 contains only one entry, the href should link straight to that file.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1925 Otherwise, the link should be to the index file.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1926 We are not yet concerned with the file extensions/tag line number and so on at
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1927 this point.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1928 If `hfy-split-index' is set, and the href wil be to an index file rather than
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1929 a source file, append a .X to `hfy-index-file', where X is the uppercased
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1930 first character of TAG.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1931 See also: `hfy-relstub', `hfy-index-file'`'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1932 ;;(message "hfy-href-stub");;DBUG
106128
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1933 ;; FIXME: Why not use something like
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1934 ;; (file-relative-name (if ...) (file-name-directory this-file)) ? --Stef
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1935 (concat
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1936 (hfy-relstub this-file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1937 (if (= 1 (length def-files)) (car def-files)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1938 (if (not hfy-split-index) hfy-index-file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1939 (concat hfy-index-file "." (upcase (substring tag 0 1)))))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1940
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1941 (defun hfy-href (this-file def-files tag tag-map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1942 "Return a relative href to the tag in question, based on\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1943 THIS-FILE `hfy-link-extn' `hfy-extn' DEF-FILES TAG and TAG-MAP\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1944 THIS-FILE is the current source file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1945 DEF-FILES is a list of file containing possible link endpoints for TAG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1946 TAG is the TAG in question
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1947 TAG-MAP is the entry in `hfy-tags-cache'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1948 ;;(message "hfy-href");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1949 (concat
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1950 (hfy-href-stub this-file def-files tag)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1951 (or hfy-link-extn hfy-extn) "#" tag ;;(.src -> .html)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1952 (if (= 1 (length def-files))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1953 (concat "." (format "%d" (cadr (assoc (car def-files) tag-map)))))) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1954
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1955 (defun hfy-word-regex (string)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1956 "Return a regex that matches STRING as the first `match-string', with non
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1957 word characters on either side."
106128
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
1958 ;; FIXME: Should this use [^$[:alnum:]_] instead? --Stef
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1959 (concat "[^$A-Za-z_0-9]\\(" (regexp-quote string) "\\)[^A-Za-z_0-9]"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1960
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1961 ;; mark all tags for hyperlinking, except the tags at
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1962 ;; their own points of definition, iyswim:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1963 (defun hfy-mark-tag-hrefs (srcdir file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1964 "Mark href start points with the \'hfy-link prop \(value: href string\)\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1965 Mark href end points with the \'hfy-endl prop \(value t\)\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1966 Avoid overlapping links, and mark links in descending length of
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1967 tag name in order to prevent subtags from usurping supertags,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1968 \(eg \"term\" for \"terminal\").
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1969 SRCDIR is the directory being \"published\".
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1970 FILE is the specific file we are rendering."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1971 ;;(message "hfy-mark-tag-hrefs");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1972 (let ((cache-entry (assoc srcdir hfy-tags-cache))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1973 (list-cache (assoc srcdir hfy-tags-sortl))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1974 (rmap-cache (assoc srcdir hfy-tags-rmap ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1975 (no-comment (hfy-opt 'zap-comment-links))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1976 (no-strings (hfy-opt 'zap-string-links ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1977 (cache-hash nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1978 (tags-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1979 (tags-rmap nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1980 (case-fold-search nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1981 ;; extract the tag mapping hashes (fwd and rev) and the tag list:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1982 (if (and (setq cache-hash (cadr cache-entry))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1983 (setq tags-rmap (cadr rmap-cache ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1984 (setq tags-list (cadr list-cache )))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1985 (mapcar
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1986 (lambda (TAG)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1987 (let* ((start nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1988 (stop nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1989 (href nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1990 (name nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1991 (case-fold-search nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1992 (tmp-point nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1993 (maybe-start nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1994 (face-at nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1995 (rmap-entry nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1996 (rnew-elt nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1997 (rmap-line nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1998 (tag-regex (hfy-word-regex TAG))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1999 (tag-map (gethash TAG cache-hash))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2000 (tag-files (mapcar #'car tag-map)))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2001 ;; find instances of TAG and do what needs to be done:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2002 (goto-char (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2003 (while (search-forward TAG nil 'NOERROR)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2004 (setq tmp-point (point)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2005 maybe-start (- (match-beginning 0) 1))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2006 (goto-char maybe-start)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2007 (if (not (looking-at tag-regex))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2008 nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2009 (setq start (match-beginning 1))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2010 (setq stop (match-end 1))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2011 (setq face-at
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2012 (and (or no-comment no-strings) (hfy-face-at start)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2013 (if (listp face-at)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2014 (setq face-at (cadr (memq :inherit face-at))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2015 (if (or (text-property-any start (1+ stop) 'hfy-linkp t)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2016 (and no-comment (eq 'font-lock-comment-face face-at))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2017 (and no-strings (eq 'font-lock-string-face face-at)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2018 nil ;; already a link, NOOP
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2019
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2020 ;; set a reverse map entry:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2021 (setq rmap-line (line-number-at-pos)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2022 rmap-entry (gethash TAG tags-rmap)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2023 rnew-elt (list file rmap-line start)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2024 rmap-entry (cons rnew-elt rmap-entry)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2025 name (format "%s.%d" TAG rmap-line))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2026 (put-text-property start (1+ start) 'hfy-inst name)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2027 (puthash TAG rmap-entry tags-rmap)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2028
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2029 ;; mark the link. link to index if the tag has > 1 def
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2030 ;; add the line number to the #name if it does not:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2031 (setq href (hfy-href file tag-files TAG tag-map))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2032 (put-text-property start (1+ start) 'hfy-link href)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2033 (put-text-property stop (1+ stop ) 'hfy-endl t )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2034 (put-text-property start (1+ stop ) 'hfy-linkp t )))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2035 (goto-char tmp-point)) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2036 tags-list) )))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2037
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2038 (defun hfy-shell ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2039 "Return `shell-file-name', or \"/bin/sh\" if it is a non-bourne shell."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2040 (if (string-match "\\<bash\\>\\|\\<sh\\>\\|\\<dash\\>" shell-file-name)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2041 shell-file-name
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2042 (or hfy-shell-file-name "/bin/sh")))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2043
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2044 ;; cache the #(tag => file line point) entries for files under srcdir
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2045 ;; and cache the descending sorted list of tags in the relevant alist,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2046 ;; also keyed by srcdir:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2047 (defun hfy-load-tags-cache (srcdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2048 "Run `hfy-etags-cmd' on SRCDIR, then call `hfy-parse-tags-buffer'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2049 ;;(message "hfy-load-tags-cache");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2050 (let ((etags-buffer (get-buffer-create "*hfy-tags*"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2051 (etags-command (format hfy-etags-cmd hfy-etags-bin))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2052 (shell-file-name (hfy-shell)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2053 (cd srcdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2054 (shell-command etags-command etags-buffer)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2055 (hfy-parse-tags-buffer srcdir etags-buffer)) )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2056
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2057 ;; break this out from `hfy-load-tags-cache' to make the tar file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2058 ;; functionality easier to implement.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2059 ;; ( tar file functionality not merged here because it requires a
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2060 ;; hacked copy of etags capable of tagging stdin: if Francesco
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2061 ;; Potorti accepts a patch, or otherwise implements stdin tagging,
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2062 ;; then I will provide a `htmlfontify-tar-file' defun )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2063 (defun hfy-parse-tags-buffer (srcdir buffer)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2064 "Parse a BUFFER containing etags formatted output, loading the
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2065 `hfy-tags-cache' and `hfy-tags-sortl' entries for SRCDIR."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2066 (let ((cache-entry (assoc srcdir hfy-tags-cache))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2067 (tlist-cache (assoc srcdir hfy-tags-sortl))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2068 (trmap-cache (assoc srcdir hfy-tags-rmap ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2069 (cache-hash nil) (trmap-hash nil) (tags-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2070 (hash-entry nil) (tag-string nil) (tag-line nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2071 (tag-point nil) (new-entry nil) (etags-file nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2072
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2073 ;; (re)initialise the tag reverse map:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2074 (if trmap-cache (setq trmap-hash (cadr trmap-cache))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2075 (setq trmap-hash (make-hash-table :test 'equal))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2076 (setq hfy-tags-rmap (list (list srcdir trmap-hash) hfy-tags-rmap)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2077 (clrhash trmap-hash)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2078
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2079 ;; (re)initialise the tag cache:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2080 (if cache-entry (setq cache-hash (cadr cache-entry))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2081 (setq cache-hash (make-hash-table :test 'equal))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2082 (setq hfy-tags-cache (list (list srcdir cache-hash) hfy-tags-cache)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2083 (clrhash cache-hash)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2084
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2085 ;; cache the TAG => ((file line point) (file line point) ... ) entries:
106128
ed77a6edfaa1 * hfy-cmap.el (hfy-rgb-file): Use locate-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106126
diff changeset
2086 (with-current-buffer buffer
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2087 (goto-char (point-min))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2088
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2089 (while (and (looking-at "^\x0c") (= 0 (forward-line 1)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2090 ;;(message "^L boundary")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2091 (if (and (looking-at "^\\(.+\\),\\([0-9]+\\)$")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2092 (= 0 (forward-line 1)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2093 (progn
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2094 (setq etags-file (match-string 1))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2095 ;;(message "TAGS for file: %s" etags-file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2096 (while (and (looking-at hfy-etag-regex) (= 0 (forward-line 1)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2097 (setq tag-string (match-string 1))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2098 (if (= 0 (length tag-string)) nil ;; noop
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2099 (setq tag-line (round (string-to-number (match-string 2))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2100 (setq tag-point (round (string-to-number (match-string 3))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2101 (setq hash-entry (gethash tag-string cache-hash))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2102 (setq new-entry (list etags-file tag-line tag-point))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2103 (push new-entry hash-entry)
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2104 ;;(message "HASH-ENTRY %s %S" tag-string new-entry)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2105 (puthash tag-string hash-entry cache-hash)))) )))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2106
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2107 ;; cache a list of tags in descending length order:
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2108 (maphash (lambda (K V) (push K tags-list)) cache-hash)
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2109 (setq tags-list (sort tags-list (lambda (A B) (< (length B) (length A)))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2110
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2111 ;; put the tag list into the cache:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2112 (if tlist-cache (setcar (cdr tlist-cache) tags-list)
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2113 (push (list srcdir tags-list) hfy-tags-sortl))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2114
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2115 ;; return the number of tags found:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2116 (length tags-list) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2117
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2118 (defun hfy-prepare-index-i (srcdir dstdir filename &optional stub map)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2119 "Prepare a tags index buffer for SRCDIR.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2120 `hfy-tags-cache' must already have an entry for SRCDIR for this to work.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2121 `hfy-page-header', `hfy-page-footer', `hfy-link-extn' and `hfy-extn'
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2122 all play a part here.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2123 If STUB is set, prepare an \(appropriately named\) index buffer
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2124 specifically for entries beginning with STUB.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2125 If MAP is set, use that instead of `hfy-tags-cache'.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2126 FILENAME is the name of the file being indexed.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2127 DSTDIR is the output directory, where files will be written."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2128 ;;(message "hfy-write-index");;DBUG
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2129 (let ((cache-entry (assoc srcdir (or map hfy-tags-cache)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2130 (cache-hash nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2131 (tag-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2132 (index-file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2133 (concat filename (if stub (concat "." stub) "") hfy-extn))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2134 (index-buf nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2135 (if (not (and cache-entry
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2136 (setq cache-hash (cadr cache-entry))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2137 (setq index-buf (get-buffer-create index-file))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2138 nil ;; noop
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2139 (maphash (lambda (K V) (push K tag-list)) cache-hash)
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2140 (setq tag-list (sort tag-list 'string<))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2141 (set-buffer index-buf)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2142 (erase-buffer)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2143 (insert (funcall hfy-page-header filename "<!-- CSS -->"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2144 (insert "<table class=\"index\">\n")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2145
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2146 (dolist (TAG tag-list)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2147 (let ((tag-started nil))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2148 (dolist (DEF (gethash TAG cache-hash))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2149 (if (and stub (not (string-match (concat "^" stub) TAG)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2150 nil ;; we have a stub and it didn't match: NOOP
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2151 (let ((file (car DEF))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2152 (line (cadr DEF)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2153 (insert
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2154 (format
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2155 (concat
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2156 " <tr> \n"
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2157 " <td>%s</td> \n"
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2158 " <td><a href=\"%s%s\">%s</a></td> \n"
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2159 " <td><a href=\"%s%s#%s.%d\">%d</a></td>\n"
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2160 " </tr> \n")
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2161 (if (string= TAG tag-started) "&nbsp;"
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2162 (format "<a name=\"%s\">%s</a>" TAG TAG))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2163 file (or hfy-link-extn hfy-extn) file
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2164 file (or hfy-link-extn hfy-extn) TAG line line))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2165 (setq tag-started TAG))))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2166 (insert "</table>\n")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2167 (insert (funcall hfy-page-footer filename))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2168 (and dstdir (cd dstdir))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2169 (set-visited-file-name index-file)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2170 index-buf) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2171
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2172 (defun hfy-prepare-index (srcdir dstdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2173 "Return a list of index buffer\(s\), as determined by `hfy-split-index'.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2174 SRCDIR and DSTDIR are the source and output directories respectively."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2175 (if (not hfy-split-index)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2176 (list (hfy-prepare-index-i srcdir dstdir hfy-index-file nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2177 (let ((stub-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2178 (cache-hash nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2179 (index-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2180 (cache-entry (assoc srcdir hfy-tags-cache)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2181 (if (and cache-entry (setq cache-hash (cadr cache-entry)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2182 (maphash
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2183 (lambda (K V)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2184 (let ((stub (upcase (substring K 0 1))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2185 (if (member stub stub-list)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2186 nil ;; seen this already: NOOP
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2187 (setq
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2188 stub-list (cons stub stub-list)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2189 index-list (cons (hfy-prepare-index-i srcdir
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2190 dstdir
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2191 hfy-index-file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2192 stub)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2193 index-list)) ))) cache-hash) ) index-list)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2194
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2195 (defun hfy-prepare-tag-map (srcdir dstdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2196 "Prepare the counterpart\(s\) to the index buffer\(s\) - a list of buffers
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2197 with the same structure, but listing \( and linking to \) instances of tags
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2198 \( as opposed to their definitions \).\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2199 SRCDIR and DSTDIR are the source and output directories respectively.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2200 See: `hfy-prepare-index'
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2201 `hfy-split-index'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2202 (if (not hfy-split-index)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2203 (list (hfy-prepare-index-i srcdir
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2204 dstdir
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2205 hfy-instance-file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2206 nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2207 hfy-tags-rmap))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2208 (let ((stub-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2209 (cache-hash nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2210 (index-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2211 (cache-entry (assoc srcdir hfy-tags-rmap)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2212
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2213 (if (and cache-entry (setq cache-hash (cadr cache-entry)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2214 (maphash
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2215 (lambda (K V)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2216 (let ((stub (upcase (substring K 0 1))))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2217 (if (member stub stub-list)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2218 nil ;; seen this already: NOOP
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2219 (setq
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2220 stub-list (cons stub stub-list)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2221 index-list (cons (hfy-prepare-index-i srcdir
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2222 dstdir
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2223 hfy-instance-file
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2224 stub
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2225 hfy-tags-rmap)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2226 index-list)) ))) cache-hash) ) index-list)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2227
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2228 (defun hfy-subtract-maps (srcdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2229 "Internal function - strips definitions of tags from the instance map.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2230 SRCDIR is the directory being \"published\".
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2231 See: `hfy-tags-cache' and `hfy-tags-rmap'"
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2232 (let ((new-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2233 (old-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2234 (def-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2235 (exc-list nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2236 (fwd-map (cadr (assoc srcdir hfy-tags-cache)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2237 (rev-map (cadr (assoc srcdir hfy-tags-rmap )))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2238 (taglist (cadr (assoc srcdir hfy-tags-sortl))))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2239 (dolist (TAG taglist)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2240 (setq def-list (gethash TAG fwd-map)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2241 old-list (gethash TAG rev-map)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2242 exc-list (mapcar (lambda (P) (list (car P) (cadr P))) def-list)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2243 new-list nil)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2244 (dolist (P old-list)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2245 (or (member (list (car P) (cadr P)) exc-list)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2246 (push P new-list)))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2247 (puthash TAG new-list rev-map))))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2248
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2249 (defun htmlfontify-run-etags (srcdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2250 "Load the etags cache for SRCDIR.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2251 See `hfy-load-tags-cache'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2252 (interactive "D source directory: ")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2253 (setq srcdir (directory-file-name srcdir))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2254 (hfy-load-tags-cache srcdir))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2255
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2256 ;;(defun hfy-test-read-args (foo bar)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2257 ;; (interactive "D source directory: \nD target directory: ")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2258 ;; (message "foo: %S\nbar: %S" foo bar))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2259
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2260 (defun hfy-save-kill-buffers (buffer-list &optional dstdir)
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2261 (dolist (B buffer-list)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2262 (set-buffer B)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2263 (and dstdir (file-directory-p dstdir) (cd dstdir))
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2264 (save-buffer)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2265 (kill-buffer B)))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2266
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2267 (defun htmlfontify-copy-and-link-dir (srcdir dstdir &optional f-ext l-ext)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2268 "Trawl SRCDIR and write fontified-and-hyperlinked output in DSTDIR.
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2269 F-EXT and L-EXT specify values for `hfy-extn' and `hfy-link-extn'.\n
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2270 You may also want to set `hfy-page-header' and `hfy-page-footer'."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2271 (interactive "D source directory: \nD output directory: ")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2272 ;;(message "htmlfontify-copy-and-link-dir")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2273 (setq srcdir (directory-file-name srcdir))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2274 (setq dstdir (directory-file-name dstdir))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2275 (let ((source-files "SETME: list of source files, relative to srcdir")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2276 (tr-cache (assoc srcdir hfy-tags-rmap))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2277 (hfy-extn (or f-ext ".html"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2278 (hfy-link-extn (or l-ext ".html")))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2279 ;; oops, forgot to load etags for srcdir:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2280 (if tr-cache nil
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2281 (message "autoload of tags cache")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2282 (hfy-load-tags-cache srcdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2283 (setq tr-cache (assoc srcdir hfy-tags-rmap)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2284 ;; clear out the old cache:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2285 (clrhash (cadr tr-cache))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2286 (hfy-make-directory dstdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2287 (setq source-files (hfy-list-files srcdir))
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2288 (dolist (file source-files)
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2289 (hfy-copy-and-fontify-file srcdir dstdir file))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2290 (hfy-subtract-maps srcdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2291 (hfy-save-kill-buffers (hfy-prepare-index srcdir dstdir) dstdir)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2292 (hfy-save-kill-buffers (hfy-prepare-tag-map srcdir dstdir) dstdir) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2293
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2294 ;; name of the init file we want:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2295 (defun hfy-initfile ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2296 "Return the expected location of the htmlfontify specific init/custom file."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2297 (let* ((file (or (getenv "HFY_INITFILE") ".hfy.el")))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2298 (expand-file-name file "~") ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2299
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2300
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2301 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2302 ;; incomplete as yet : transfer hook settings to hfy init file:
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2303 ;; (defalias 'hfy-set-hooks 'custom-set-variables)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2304
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2305 ;; (defun hfy-pp-hook (H)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2306 ;; (and (string-match "-hook$" (symbol-name H))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2307 ;; (boundp H)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2308 ;; (symbol-value H)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2309 ;; (insert (format "\n '(%S %S)" H (symbol-value H)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2310 ;; )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2311 ;; )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2312
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2313 ;; (defun hfy-save-hooks ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2314 ;; (let ((custom-file (hfy-initfile)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2315 ;; (custom-save-delete 'hfy-set-hooks)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2316 ;; (let ((standard-output (current-buffer)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2317 ;; (princ "(hfy-set-hooks\n;;auto-generated, only one copy allowed\n")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2318 ;; (mapatoms 'hfy-pp-hook)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2319 ;; (insert "\n)")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2320 ;; )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2321 ;; )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2322 ;; )
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2323 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2324
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2325 (defalias 'hfy-init-progn 'progn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2326
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2327 (defun hfy-save-initvar (sym)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2328 (princ (format "(setq %s\n '" sym))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2329 (pp (symbol-value sym))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2330 (princ ")\n"))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2331
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2332 (defun htmlfontify-save-initfile ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2333 "Save the htmlfontify settings to the htmlfontify init file."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2334 (interactive)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2335 (let* ((start-pos nil)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2336 (custom-file (hfy-initfile))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2337 (standard-output (find-file-noselect custom-file 'nowarn)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2338 (save-excursion
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2339 (custom-save-delete 'hfy-init-progn)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2340 (setq start-pos (point))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2341 (princ "(hfy-init-progn\n;;auto-generated, only one copy allowed\n")
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2342 ;; FIXME: This saving&restoring of global customization
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2343 ;; variables can interfere with other customization settings for
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2344 ;; those vars (in .emacs or in Customize).
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2345 (mapc 'hfy-save-initvar
106271
8d51419ae1f3 Misc coding convention cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106270
diff changeset
2346 '(auto-mode-alist interpreter-mode-alist))
106126
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2347 (princ ")\n")
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2348 (indent-region start-pos (point) nil))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2349 (custom-save-all) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2350
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2351 (defun htmlfontify-load-initfile ()
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2352 "Load the htmlfontify specific init/custom file."
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2353 (interactive)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2354 (let ((file (hfy-initfile)))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2355 (load file 'NOERROR nil nil) ))
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2356
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2357 (provide 'htmlfontify)
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2358 ;;; htmlfontify.el ends here
10d66efa4c61 New files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2359