annotate lisp/w3/w3-draw.el @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1 ;;; w3-draw.el --- Emacs-W3 drawing functions for new display engine
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 ;; Author: wmperry
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3 ;; Created: 1996/08/25 17:12:32
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4 ;; Version: 1.17
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 ;; Keywords: faces, help, hypermedia
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
8 ;;; Copyright (c) 1993 - 1996 by William M. Perry (wmperry@cs.indiana.edu)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 ;;; This file is not part of GNU Emacs, but the same permissions apply.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 ;;; GNU Emacs is free software; you can redistribute it and/or modify
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 ;;; it under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ;;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ;;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 ;;; GNU Emacs is distributed in the hope that it will be useful,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 ;;; GNU General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 ;;; You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 ;;; along with GNU Emacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 ;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
28 ;;; This function will take a stream of HTML from w3-parse-buffer
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 ;;; and draw it out
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 (require 'w3-vars)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 (require 'w3-imap)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 (require 'w3-widget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 (require 'widget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 (require 'cl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 (if (featurep 'mule) (fset 'string-width 'length))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 (defmacro w3-get-state (tag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 (or (symbolp tag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 (error "Bad argument: %s" tag))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 (let ((index (length (memq tag w3-state-locator-variable))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 (` (aref w3-state-vector (, index)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 (put 'w3-get-state 'edebug-form-spec '(symbolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 (defmacro w3-put-state (tag val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 (or (symbolp tag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 (error "Bad argument: %s" tag))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 (let ((index (length (memq tag w3-state-locator-variable))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 (` (aset w3-state-vector (, index) (, val)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 (put 'w3-put-state 'edebug-form-spec '(symbolp form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 (defsubst w3-push-alignment (align)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 (if align
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 (w3-put-state :align (cons (cons tag align) (w3-get-state :align)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 (defsubst w3-pop-alignment ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 (let ((flubber (memq (assq tag (w3-get-state :align))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 (w3-get-state :align))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 ((null flubber) nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 ((cdr flubber)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 (w3-put-state :align (cdr flubber)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 (t (w3-put-state :align nil)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 (defsubst w3-current-alignment ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 (cdr-safe (car-safe (w3-get-state :align))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 (defconst w3-fill-prefixes-vector
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 (let ((len 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 (prefix-vector (make-vector 80 nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 (while (< len 80)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 (aset prefix-vector len (make-string len ? ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 (setq len (1+ len)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 prefix-vector))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 (defsubst w3-set-fill-prefix-length (len)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
79 (setq fill-prefix (if (< len (- (or w3-strict-width (window-width)) 4))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
80 (if (< len 80)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
81 (aref w3-fill-prefixes-vector len)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
82 (make-string len ? ))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
83 (url-warn
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
84 'html
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
85 "Runaway indentation! Too deep for window width!")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
86 fill-prefix)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 (defsubst w3-get-default-style-info (info)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 (and w3-current-stylesheet
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 (or
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
91 ;; Check for tag/id|name first!
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
92 (cdr-safe (assq info
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
93 (cdr-safe
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
94 (assoc (or (cdr-safe (assq 'id args))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
95 (cdr-safe (assq 'name args)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
96 (cdr-safe
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
97 (assq tag w3-current-stylesheet))))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
98
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
99 ;; Check for tag/class next
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 (cdr-safe (assq info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 (assoc (cdr-safe (assq 'class args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 (assq tag w3-current-stylesheet))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 ;; Then for global stuff with 'class'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 (cdr-safe (assq info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 (assoc (cdr-safe (assq 'class args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 (assq 'doc w3-current-stylesheet))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 ;; Fall back on the default styles for just this tag.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 (cdr-safe (assq info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 (assq 'internal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 (assq tag w3-current-stylesheet)))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
120 (defsubst w3-normalize-color (color)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 ((valid-color-name-p color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 ((valid-color-name-p (concat "#" color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 (concat "#" color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 ((string-match "[ \t\r\n]" color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 (w3-normalize-color
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 (mapconcat (function (lambda (x) (if (memq x '(?\t ?\r ?\n ? )) ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 (char-to-string x)))) color "")))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
130 ((valid-color-name-p (font-normalize-color color))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
131 (font-normalize-color color))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
132 (t
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 (w3-warn 'html (format "Bad color specification: %s" color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 (defun w3-pause ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 (w3-running-FSF19 (sit-for 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 (w3-running-xemacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 (if (and (not (sit-for 0)) (input-pending-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 (dispatch-event (next-command-event))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 (error nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 (t (sit-for 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 (defvar w3-end-tags
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 '((/ul . ul)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 (/lit . lit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 (/li . li)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 (/h1 . h1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 (/h2 . h2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 (/h3 . h3)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 (/h4 . h4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 (/h5 . h5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 (/h6 . h6)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 (/font0 . font0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 (/font1 . font1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 (/font2 . font2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 (/font3 . font3)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 (/font4 . font4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 (/font5 . font5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 (/font6 . font6)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 (/font7 . font7)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 (/ol . ol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 (/dl . dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 (/menu . menu)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 (/dir . dir)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 (/a . a)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 (defvar w3-face-cache nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 "Cache for w3-face-for-element")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 (defsubst w3-voice-for-element ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 (let ((temporary-voice (w3-get-default-style-info 'voice-spec)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
175 (and temporary-voice (cons tag temporary-voice))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 (defsubst w3-face-for-element ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 (let* ((font-spec (w3-get-default-style-info 'font-spec))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 (foreground (w3-get-default-style-info 'color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 (background (w3-get-default-style-info 'background))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 ;;(pixmap (w3-get-default-style-info 'pixmap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 (descr (list font-spec foreground background))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 (face (cdr-safe (assoc descr w3-face-cache))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 (if (or face (not (or foreground background font-spec)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 nil ; Do nothing, we got it already
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 (setq face (intern (format "%s" descr)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 ((not (fboundp 'make-face)) nil) ; Do nothing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 ((and (fboundp 'face-property) ; XEmacs 19.14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 (not (get 'face-property 'sysdep-defined-this)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 (setq face (make-face face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 "An Emacs-W3 face... don't edit by hand." t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 (t (make-face face)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 (and font-spec (set-face-font face font-spec))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 (and foreground (set-face-foreground face foreground))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 (and background (set-face-background face background))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 ;(set-face-background-pixmap face pixmap)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 (setq w3-face-cache (cons (cons descr face) w3-face-cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 (cons tag face)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 (defun w3-handle-single-tag (tag &optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 (and w3-draw-buffer (set-buffer w3-draw-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 (let ((opos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 (id (and (listp args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 (or (cdr-safe (assq 'name args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 (cdr-safe (assq 'id args))))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
209
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 ;; This allows _ANY_ tag, whether it is known or not, to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 ;; the target of a # reference in a URL
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 (if id
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 (setq w3-id-positions (cons
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 (cons (intern id)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 (set-marker (make-marker)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 w3-id-positions))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
219
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
220 (if (and (listp args) (cdr-safe (assq 'style args)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
221 (let ((unique-id (or id (url-create-unique-id)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
222 (sheet ""))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
223 (setq sheet (format "%s.%s { %s }\n" tag unique-id
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
224 (cdr-safe (assq 'style args)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
225 args (cons (cons 'id unique-id) args))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
226
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
227 (w3-handle-style (list (cons 'data sheet)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
228 (cons 'notation "css")))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 (if (and (w3-get-state :next-break)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 (not (memq tag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 '(p h1 h2 h3 h4 h5 h6 ol ul dl menu dir pre))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 (w3-handle-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 (w3-put-state :next-break nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 (setq w3-current-formatter (get tag 'w3-formatter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 ((eq 'w3-handle-text w3-current-formatter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 (w3-handle-text args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 (let ((data-before nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 (data-after nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 (if (and (not (eq tag 'text)) w3-current-stylesheet)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 (setq data-before (w3-get-default-style-info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 'insert.before))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 (let ((tag (cdr-safe (assq tag w3-end-tags))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 (setq data-after (and tag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 (w3-get-default-style-info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 'insert.after))))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
250 (if data-before (w3-handle-text data-before))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 (setq w3-current-formatter (get tag 'w3-formatter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 ((eq w3-current-formatter 'ack) nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 ((null w3-current-formatter) (w3-handle-unknown-tag tag args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 (t (funcall w3-current-formatter args)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
256 (if data-after (w3-handle-text data-after)))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 (if (not (eq tag 'text))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 (setq w3-last-tag tag))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 (goto-char opos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 ;;; Set up basic fonts/stuff
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 (defun w3-init-state ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 ;; Reset the state of an HTML drawing buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 (setq w3-state-vector (copy-sequence w3-state-vector))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 (setq w3-current-stylesheet (copy-tree w3-user-stylesheet))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 (let* ((tag 'html)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 (args nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 (face (cdr (w3-face-for-element))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
273 (if (not face)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
274 (setq tag 'body
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
275 face (cdr (w3-face-for-element))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 (and face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 (if (not (fboundp 'valid-specifier-locale-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 (w3-my-safe-copy-face face 'default (current-buffer)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 (setq w3-form-labels nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 (make-local-variable 'w3-image-widgets-waiting)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 (make-local-variable 'w3-active-voices)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 (make-local-variable 'inhibit-read-only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 (setq w3-image-widgets-waiting nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 inhibit-read-only t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 (if (not (get 'w3-state 'init)) (w3-draw-setup))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 (fillarray w3-state-vector 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 (w3-put-state :bogus nil) ; Make all fake ones return nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 (w3-put-state :text-mangler nil) ; Any text mangling routine
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 (w3-put-state :next-break nil) ; Next item needs a paragraph break
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 (w3-put-state :background nil) ; Netscapism - gag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 (w3-put-state :table nil) ; Table args
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 (w3-put-state :figdata nil) ; Data for <fig> tag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 (w3-put-state :figalt nil) ; Alt data for <fig> tag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 (w3-put-state :pre-start nil) ; Where current <pre> seg starts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 (w3-put-state :zone nil) ; Zone of current href?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 (w3-put-state :center nil) ; netscape tag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 (w3-put-state :select nil) ; Data for current select field
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 (w3-put-state :options nil) ; Options in current select field
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 (w3-put-state :nofill nil) ; non-nil if in pre or xmp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 (w3-put-state :nowrap nil) ; non-nil if in <p nowrap>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 (w3-put-state :href nil) ; Current link destination
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 (w3-put-state :name nil) ; Current link ID tag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 (w3-put-state :image nil) ; Current image destination
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 (w3-put-state :form nil) ; Current form information
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 (w3-put-state :optarg nil) ; Option arguments
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 (w3-put-state :w3-graphic nil) ; Image stuff for non-xemacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 (w3-put-state :lists '()) ; Types of list currently in.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 (w3-put-state :align nil) ; Current alignment of paragraphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 (w3-put-state :title nil) ; Whether we can have a title or not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 (w3-put-state :seen-this-url nil) ; whether we have seen this url or not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 (w3-put-state :needspace 'never) ; Spacing info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 (setq w3-active-faces nil) ; Face attributes to use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 (setq w3-active-voices nil) ; voice attributes to use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 (defun w3-draw-setup ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 (put 'w3-state 'init t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 (w3-init-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 ;;; Mapping HTML tags to functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 (put 'lit 'w3-formatter 'w3-handle-pre)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 (put '/lit 'w3-formatter 'w3-handle-/pre)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 (put 'li 'w3-formatter 'w3-handle-list-item)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 (put 'ul 'w3-formatter 'w3-handle-list-opening)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 (put 'ol 'w3-formatter 'w3-handle-list-opening)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 (put 'dl 'w3-formatter 'w3-handle-list-opening)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 (put '/dl 'w3-formatter 'w3-handle-list-ending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 (put '/ul 'w3-formatter 'w3-handle-list-ending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 (put '/ol 'w3-formatter 'w3-handle-list-ending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 (put 'menu 'w3-formatter 'w3-handle-list-opening)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 (put '/menu 'w3-formatter 'w3-handle-list-ending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 (put 'dir 'w3-formatter 'w3-handle-list-opening)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 (put '/dir 'w3-formatter 'w3-handle-list-ending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 (put 'dt 'w3-formatter 'w3-handle-table-term)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 (put 'dd 'w3-formatter 'w3-handle-table-definition)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 (put 'a 'w3-formatter 'w3-handle-hyperlink)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 (put '/a 'w3-formatter 'w3-handle-hyperlink-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 (put 'h1 'w3-formatter 'w3-handle-header)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 (put 'h2 'w3-formatter 'w3-handle-header)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 (put 'h3 'w3-formatter 'w3-handle-header)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 (put 'h4 'w3-formatter 'w3-handle-header)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 (put 'h5 'w3-formatter 'w3-handle-header)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 (put 'h6 'w3-formatter 'w3-handle-header)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 (put '/h1 'w3-formatter 'w3-handle-header-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 (put '/h2 'w3-formatter 'w3-handle-header-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 (put '/h3 'w3-formatter 'w3-handle-header-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 (put '/h4 'w3-formatter 'w3-handle-header-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 (put '/h5 'w3-formatter 'w3-handle-header-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 (put '/h6 'w3-formatter 'w3-handle-header-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 (put 'img 'w3-formatter 'w3-handle-image)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 (put 'kill_sgml 'w3-formatter 'w3-handle-kill-sgml)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 ;;; The main drawing routines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 (defun w3-handle-unknown-tag (tag args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 ;; A generic formatter for an unkown HTML tag. This will only be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 ;; called if a formatter was not found in TAGs property list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 ;; If a function named `w3-handle-TAG' is defined, then it will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 ;; stored in TAGs property list, so it will be found next time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 ;; the tag is run across.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 (let ((handler (intern-soft (concat "w3-handle-" (symbol-name tag))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 (end-tag-p (= (string-to-char (symbol-name tag)) ?/)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 ;; This stores the info in w3-end-tags for future use by the display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 ;; engine.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 (if end-tag-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 (setq w3-end-tags (cons (cons tag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 (intern (substring (symbol-name tag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 w3-end-tags)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 ;; For proper use of stylesheets, if no tag is found, then we should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 ;; at least call w3-handle-emphasis
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 ((and handler (fboundp handler))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 (put tag 'w3-formatter handler)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 (funcall handler args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 (end-tag-p
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
385 (put tag 'w3-formatter 'w3-handle-emphasis-end)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
386 (w3-handle-emphasis-end args))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 (t
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
388 (put tag 'w3-formatter 'w3-handle-emphasis)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
389 (w3-handle-emphasis args)))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 (defun w3-handle-text (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 ;; This is the main workhorse of the display engine.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 ;; It will figure out how a chunk of text should be displayed and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 ;; put all the necessary extents/overlays/regions around it."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 (or args (error "Impossible"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 (if (string= args "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 (w3-put-state :needspace nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 (let ((st (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 (mangler (w3-get-state :text-mangler))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 (sym nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 (insert args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 ;;(goto-char st)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 (cond ((w3-get-state :nofill)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 (goto-char st)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 (if (not (search-forward "\n" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 (subst-char-in-region st (point-max) ?\r ?\n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 (subst-char-in-region st (point-max) ?\r ? ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 (goto-char (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 (goto-char st)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 (while (re-search-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 " [ \t\n\r]+\\|[\t\n\r][ \t\n\r]*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 nil 'move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 (replace-match " "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 (goto-char st)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 (if (and (= ? (following-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 (or (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 (eq 'never (w3-get-state :needspace))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 (delete-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 (goto-char (point-max))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 (and mangler w3-delimit-emphasis
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 (fboundp mangler) (funcall mangler st (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 (let ((faces nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 (todo w3-active-faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 (voices w3-active-voices)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 (val nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 (cur nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 (while todo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 (setq cur (car todo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 todo (cdr todo))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 ((symbolp cur)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 ((listp (cdr-safe cur))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 (let ((x (cdr cur)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 (while x
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 (if (not (memq (car x) faces))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 (setq faces (cons (car x) faces)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 (setq x (cdr x)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 ((and (consp cur) (not (memq (cdr cur) faces)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 (setq faces (cons (cdr cur) faces)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 (t nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 (add-text-properties st (point) (list 'face faces))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 (if (car voices)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
445 (add-text-properties st (point) (list 'personality (cdar voices))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 (if (not (memq (char-after (1- (point))) '(? ?.)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 (w3-put-state :needspace t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 (defun w3-handle-plaintext (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 (let ((x (w3-get-state :nofill)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 (w3-put-state :nofill t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 (and args (cdr-safe (assq 'data args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 (w3-handle-text (cdr-safe (assq 'data args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 (setq w3-last-fill-pos (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 (defun w3-handle-/plaintext (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 (w3-put-state :nofill nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 ;;; Paragraph breaks, and other things that can cause linebreaks and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 ;;; alignment changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 (defun w3-handle-header (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 ;; Handle the creation of a header (of any level). Causes a full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 ;; paragraph break.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 (w3-handle-emphasis args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 (let ((name (or (cdr-safe (assq 'name args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 (cdr-safe (assq 'id args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 (align (cdr-safe (assq 'align args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 (mangler (nth 2 (cdr-safe (assq tag w3-header-chars-assoc)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 (w3-handle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 (if align
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 (setq align (intern (downcase align)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 (setq align (w3-get-default-style-info 'align)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 (let ((tag 'p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 (w3-pop-alignment))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 (w3-push-alignment align)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 (w3-put-state :text-mangler mangler)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 (if name (w3-put-state :name name))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 (defun w3-handle-header-end (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 ;; Handle the closing of a header (of any level). Causes a full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 ;; paragraph break.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 (w3-handle-emphasis-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 (let ((mangler (w3-get-state :text-mangler)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 (and mangler (funcall mangler nil nil t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 (w3-put-state :text-mangler nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 (w3-handle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 (let* ((info (car-safe (w3-get-state :lists)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 (type (and info (car-safe info))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 (if (and type fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 (insert fill-prefix (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 ((memq type '(ol dl)) " ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 (t " ")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 (let ((tag (cdr-safe (assoc tag w3-end-tags))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 (w3-pop-alignment)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 (defun w3-handle-pre (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 ;; Marks the start of a preformatted section of text. No paragraph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 ;; filling should be done from this point until a matching /pre has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 ;; been encountered.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 (w3-handle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 (w3-put-state :nofill t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 (w3-put-state :needspace t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 (w3-put-state :pre-start (set-marker (make-marker) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 (defun w3-handle-xmp (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 ;; Marks the start of a preformatted section of text. No paragraph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 ;; filling should be done from this point until a matching /pre has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 ;; been encountered.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (w3-handle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 (w3-put-state :nofill t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 (w3-put-state :needspace t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 (w3-put-state :pre-start (set-marker (make-marker) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 (if (and args (cdr-safe (assq 'data args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 (w3-handle-text (cdr-safe (assq 'data args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 (w3-handle-/xmp))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 (defun w3-handle-/pre (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 (if (not (w3-get-state :nofill))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 (w3-handle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 (w3-put-state :nofill nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 (let* ((info (car-safe (w3-get-state :lists)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 (type (and info (car-safe info)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 (st (w3-get-state :pre-start)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 (if (not (bolp)) (insert "\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 (if (and type fill-prefix st)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 (goto-char st)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 (while (re-search-forward "^" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 (insert fill-prefix (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 ((memq type '(ol dl)) " ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 (t " ")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 (setq w3-last-fill-pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 (insert fill-prefix (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 ((memq type '(ol dl)) " ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 (t " "))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 (setq w3-last-fill-pos (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 (let ((tag 'p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 (w3-handle-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 (setq w3-active-faces nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 (w3-put-state :pre-start nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 (fset 'w3-handle-/xmp 'w3-handle-/pre)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 (defun w3-handle-blockquote (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 ;; Start a section of quoted text. This is done by causing the text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 ;; to be indented from the right and left margins. Nested
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 ;; blockquotes will cause further indentation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 (let ((align (or (w3-get-default-style-info 'align) 'indent)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 (w3-handle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 (w3-push-alignment align))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 (w3-put-state :fillcol fill-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 (setq fill-column (max (- (or fill-column
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 (1- (or w3-strict-width (window-width)))) 8)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 10)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 (defun w3-handle-/blockquote (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 (let ((tag (cdr-safe (assoc tag w3-end-tags))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 (w3-pop-alignment))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 (setq fill-column (or (w3-get-state :fillcol) (1- (or w3-strict-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 (window-width)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 (w3-put-state :fillcol nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 (defun w3-handle-align (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 ;; Cause a single line break (like <BR>) and replace the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 ;; alignment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 (let ((align (intern (or (cdr-safe (assq 'role args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 (cdr-safe (assq 'align args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 (cdr-safe (assq 'style args))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 (w3-push-alignment align)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 (defun w3-handle-/align (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 (w3-pop-alignment))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 (defun w3-handle-hr (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 ;; Cause a line break and insert a horizontal rule across the page.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 (let* ((perc (or (cdr-safe (assq 'width args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 (w3-get-default-style-info 'width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 "100%"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 (old-align (w3-current-alignment))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 (talign (or (cdr-safe (assq 'textalign args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 (cdr-safe (assq 'text-align args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 (w3-get-default-style-info 'textalign)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 (w3-get-default-style-info 'text-align)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 (and old-align (symbol-name old-align))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 "center"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 (text (cdr-safe (assq 'label args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 (align (or (cdr-safe (assq 'align args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 (w3-get-default-style-info 'align)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 old-align
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 'center))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 (rule nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 (width nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 (if (stringp talign)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 (setq talign (intern (downcase talign))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 (if (stringp align)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 (setq align (intern (downcase align))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 (w3-push-alignment align)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 (setq perc (min (string-to-int perc) 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 width (/ (* (- (or w3-strict-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 (window-width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 w3-right-border) perc) 100))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 (if text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 ((>= (length text) width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 (setq rule (concat "-" text "-")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 ((eq talign 'right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 (setq rule (concat (make-string (- width 1 (length text))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 w3-horizontal-rule-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 text "-")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 ((eq talign 'center)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 (let ((half (make-string (/ (- width (length text)) 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 w3-horizontal-rule-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 (setq rule (concat half text half))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 ((eq talign 'left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 (setq rule (concat "-" text (make-string (- width 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 (length text))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 w3-horizontal-rule-char)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 (setq rule (make-string width w3-horizontal-rule-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 (w3-handle-text rule)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 (error nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 (w3-pop-alignment)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 (setq w3-last-fill-pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 (let* ((info (car-safe (w3-get-state :lists)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 (type (and info (car-safe info)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 (cur (w3-current-alignment)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 ;;((eq cur 'indent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 ;;(insert (make-string w3-indent-level ? )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 ((and type fill-prefix (eq w3-last-tag 'dt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 (insert fill-prefix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 ((and type fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 (insert fill-prefix (if (eq type 'ol) " " " ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 (t nil)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 (defun w3-handle-/p (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 ;; Marks the end of a paragraph. Only causes a paragraph break if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 ;; it is not followed by another paragraph or similar markup
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 ;; (headers, list openings, etc) that will already cause a new
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 ;; paragraph to be started.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 (w3-handle-emphasis-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 (let ((tag (cdr-safe (assoc tag w3-end-tags))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 (w3-handle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 (w3-pop-alignment)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 (defun w3-handle-p (&optional args)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
662 (if (or (not (memq w3-last-tag '(li tr td th dt dd)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 (memq tag '(ol ul dl menu dir)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 (let ((name (or (cdr-safe (assq 'name args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 (cdr-safe (assq 'id args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 (align (cdr-safe (assoc 'align args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 (w3-handle-emphasis-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 (w3-handle-emphasis args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 (w3-put-state :nowrap (assq 'nowrap args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 (setq align (if align
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 (intern (downcase align))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 (w3-get-default-style-info 'align)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 (and (eq tag 'p) (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 (w3-pop-alignment)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 (w3-push-alignment align)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 (if (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 (insert (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 ((and (eolp) (bolp)) "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 ((eolp) "\n\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 (t "\n")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 (setq w3-last-fill-pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 ((null fill-prefix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 ((string= fill-prefix ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 ((eq (car (car (w3-get-state :lists))) 'ol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 (insert fill-prefix " "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 (t (insert fill-prefix " ")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 (if name (w3-put-state :name name)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 (defun w3-handle-br (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 ;; Cause a single line break.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 ;; The alignment will only effect the chunk of text (generally to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 ;; the last <br> or <p> tag) immediately before the <br>. After
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 ;; that, the alignment will revert to the containers alignment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 (let* ((info (car-safe (w3-get-state :lists)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 (type (and info (car-safe info)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 (cur (w3-current-alignment)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 ;;((eq cur 'indent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 ;;(insert (make-string w3-indent-level ? )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 ((and type fill-prefix (eq w3-last-tag 'dt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 (insert fill-prefix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 ((and type fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 (insert fill-prefix (if (eq type 'ol) " " " ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 (t nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 (defun w3-handle-paragraph (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 (if (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 (let ((align (w3-current-alignment))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 (fill-prefix fill-prefix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 ((eq align 'indent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 (w3-set-fill-prefix-length
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 (+ (length fill-prefix);; works even if fill-prefix is nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 w3-indent-level)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 ((null fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 (setq fill-prefix ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 ((string= fill-prefix ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 ((eq (car (car (w3-get-state :lists))) 'ol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 (w3-set-fill-prefix-length (+ 4 (length fill-prefix))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 (w3-set-fill-prefix-length (+ 2 (length fill-prefix)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 (if (eq align 'indent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 (goto-char w3-last-fill-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 (insert fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 (goto-char (point-max))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 (if (and (> (current-column) fill-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 (not (w3-get-state :nowrap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 (not (w3-get-state :nofill)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 (fill-region-as-paragraph w3-last-fill-pos (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 (eq align 'justify)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 (if (not w3-last-fill-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 (setq w3-last-fill-pos (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 (skip-chars-backward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 (delete-region (point) (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 (if (< w3-last-fill-pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 ((or (eq align 'center) (w3-get-state :center))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 (center-region w3-last-fill-pos (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 ((eq align 'right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 (let ((x (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 (catch 'fill-exit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 (goto-char w3-last-fill-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 (while (re-search-forward "$" x t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 (if (/= (current-column) fill-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 (let ((buff (- fill-column (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 (setq x (+ x buff))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 (if (> buff 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 (insert (make-string buff ? )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 (end-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 (end-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 (if (eobp) (throw 'fill-exit t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 (error (throw 'fill-exit t))))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 (insert "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 (setq w3-last-fill-pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 (w3-put-state :needspace 'never))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 ;;; List handling code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 (defun w3-handle-list-ending (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 ;; Handles all the list terminators (/ol /ul /dl).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 ;; This just fills the last paragrpah, then reduces the depth in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 ;; `w3-state' and truncates `fill-prefix'"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 (w3-put-state :depth (max 0 (1- (w3-get-state :depth))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 (w3-put-state :next-break t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 (w3-set-fill-prefix-length (* (w3-get-state :depth) w3-indent-level))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 (w3-put-state :lists (cdr (w3-get-state :lists)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 (if (/= 0 (length fill-prefix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 (insert fill-prefix " ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 (defun w3-handle-list-opening (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 ;; Handles all the list openers (ol ul dl).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 ;; This just fills the last paragraph, then increases the depth in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 ;; `w3-state' and adds to `fill-prefix'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 (w3-handle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 (let ((style (and (not (assq 'style args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 (w3-get-default-style-info 'style))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 (if style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 (setq args (cons (cons 'style style) args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 ;; Default VALUE attribute for OL is 1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 (if (eq tag 'ol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 (or (assq 'value args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 (setq args (cons (cons 'value 1) args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 (w3-put-state :depth (1+ (w3-get-state :depth)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 (w3-set-fill-prefix-length (* (w3-get-state :depth) w3-indent-level))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 (insert "\n\n" fill-prefix " ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 (w3-put-state :lists (cons (cons tag (copy-alist args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 (w3-get-state :lists))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 (defun w3-handle-table-definition (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 (insert fill-prefix " "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 (defun w3-handle-table-term (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 (insert "\n" fill-prefix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 (defun w3-handle-list-item (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 (let* ((info (car (w3-get-state :lists)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 (type (car info))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 (endr (or (nth (1- (or (w3-get-state :depth) 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 (cdr (or (assoc type w3-list-chars-assoc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 (car w3-list-chars-assoc))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 "*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 (setq info (cdr info))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 ((assq 'plain info)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 ;; We still need to indent from the left margin for lists without
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 ;; bullets. This is especially important with nested lists.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 ;; Question: Do we want this to be equivalent to replacing the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 ;; bullet by a space (" ") or by indenting so that the text starts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 ;; where the bullet would have been? I've chosen the latter after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 ;; looking at both kinds of output.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 (insert fill-prefix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 ((eq type 'ol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 (let ((next (or (assq 'seqnum info) (assq 'value info)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 (type (cdr-safe (assq 'style info)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 (uppr (assq 'upper info))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 (tokn nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 (if (stringp (cdr next)) (setcdr next (string-to-int (cdr next))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 ((or (assq 'roman info)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 (member type '("i" "I")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 (setq tokn (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 (w3-pad-string (w3-decimal-to-roman (cdr next)) 3 ?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 'left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 endr)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 ((or (assq 'arabic info)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 (member type '("a" "A")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 (setq tokn (concat (w3-pad-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 (w3-decimal-to-alpha (cdr next)) 3 ? 'left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 endr)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 (setq tokn (concat (w3-pad-string (int-to-string (cdr next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 2 ? 'left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 endr))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 (if (assq 'uppercase info)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 (setq tokn (upcase tokn)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 (insert fill-prefix tokn " ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 (setcdr next (1+ (cdr next)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 (w3-put-state :needspace 'never)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 (insert fill-prefix endr " ")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 (defun w3-pad-string (str len pad side)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 ;; Pads a string STR to a certain length LEN, using fill character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 ;; PAD by concatenating PAD to SIDE of the string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 (let ((strlen (length str)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 ((>= strlen len) str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 ((eq side 'right) (concat str (make-string (- len strlen) pad)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 ((eq side 'left) (concat (make-string (- len strlen) pad) str)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 ;;; Routines to handle character-level formatting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 (defun w3-handle-q (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 (w3-handle-emphasis)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 (w3-handle-text (or (w3-get-default-style-info 'startquote) "\"")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 (defun w3-handle-/q (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 (let ((tag (cdr-safe (assoc tag w3-end-tags))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 (w3-handle-text (or (w3-get-default-style-info 'endquote) "\"")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 (w3-handle-emphasis-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 (defun w3-handle-emphasis (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 ;; Generic handler for character-based emphasis. Increments the state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 ;; of TAG (which must be bound by the calling procedure). This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 ;; checks all the various stylesheet mechanisms that may cause an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 ;; alignment shift as well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 (let ((align (or (w3-get-default-style-info 'align)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 (and (eq tag 'address) w3-right-justify-address 'right))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 (if (and align (not (memq tag '(h1 h2 h3 h4 h5 h6))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 (w3-push-alignment align))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 (let* ((spec (and w3-delimit-emphasis (assoc tag w3-style-tags-assoc)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 (class (cdr-safe (assq 'class args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 (face (w3-face-for-element))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 (voice (w3-voice-for-element))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 (beg (and spec (car (cdr spec)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 (if spec
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 (insert beg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 (if voice
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 (setq w3-active-voices (cons voice w3-active-voices)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 (if face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 (setq w3-active-faces (cons face w3-active-faces)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 (defun w3-handle-emphasis-end (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 ;; Generic handler for ending character-based emphasis. Decrements
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 ;; the state of TAG (which must be bound by the calling procedure).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 ;; Stylesheet mechanisms may cause arbitrary alignment changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 (let* ((tag (cdr-safe (assq tag w3-end-tags)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 (spec (and w3-delimit-emphasis (assq tag w3-style-tags-assoc)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 (end (and spec (cdr (cdr spec)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 (if (assq tag w3-active-voices)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 (setq w3-active-voices (cdr (memq (assq tag w3-active-voices)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 w3-active-voices)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 (setq w3-active-voices (delq tag w3-active-voices)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 (if (assq tag w3-active-faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 (setq w3-active-faces (cdr (memq (assq tag w3-active-faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 w3-active-faces)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 (setq w3-active-faces (delq tag w3-active-faces)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 (if spec (insert end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 (if (eq tag 'address)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 (w3-pop-alignment)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 ;;; HTML 3.0 compliance
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 (defun w3-handle-math (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 (w3-handle-br)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 (w3-handle-text "[START MATH - Not Implemented (Yet)]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 (w3-handle-br))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 (defun w3-handle-/math (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 (w3-handle-br)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 (w3-handle-text "[END MATH]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 (w3-handle-br))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
935 (defun w3-handle-tr (&optional args)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
936 (w3-handle-br))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
937
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
938 (defun w3-handle-/tr (&optional args)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
939 (w3-handle-br))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
940
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
941 (defun w3-handle-td (&optional args)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
942 (w3-handle-text " | "))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
943
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
944 (defun w3-handle-/td (&optional args)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
945 (w3-handle-text " | "))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
946
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
947 (defun w3-handle-th (&optional args)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
948 (w3-handle-text " | "))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
949
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
950 (defun w3-handle-/th (&optional args)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
951 (w3-handle-text " | "))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
952
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 (defun w3-handle-table (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 (w3-handle-br))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 (defun w3-handle-/table (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 (w3-handle-br))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 (defun w3-handle-div (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 (let ((align (cdr-safe (assq 'align args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 (w3-handle-emphasis args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 (setq align (and align (intern (downcase align))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 (w3-push-alignment align)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 (defun w3-handle-/div (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 (w3-handle-emphasis-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 (let ((tag (cdr-safe (assq tag w3-end-tags))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 (w3-pop-alignment)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 (defun w3-handle-note (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 (w3-handle-emphasis)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 (let ((align (or (w3-get-default-style-info 'align) 'indent)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 (w3-push-alignment align))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 (w3-handle-text (concat (or (cdr-safe (assq 'role args)) "CAUTION") ":")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 (defun w3-handle-/note (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 (w3-handle-emphasis-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 (let ((tag (cdr-safe (assoc tag w3-end-tags))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 (w3-pop-alignment)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 (defun w3-handle-fig (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 (w3-put-state :figdata args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 (w3-put-state :figalt (set-marker (make-marker) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 (defun w3-handle-caption (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 (defun w3-handle-/caption (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 (defun w3-handle-/fig (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 (let* ((data (w3-get-state :figdata))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 (src (cdr-safe (assq 'src data)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 (aln (cdr-safe (assq 'align data)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 (alt (if (w3-get-state :figalt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 (prog1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 (buffer-substring (w3-get-state :figalt) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 (delete-region (w3-get-state :figalt) (point)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 (ack nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 (setq w3-last-fill-pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 (if (not src)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 (w3-warn 'html "Malformed <fig> tag.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 (setq ack (list (cons 'src src)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 (cons 'alt alt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 (cons 'align aln)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 (w3-handle-pre nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 (w3-handle-image ack)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 (w3-handle-/pre nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 ;;; Netscape Compatibility
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 ; For some reason netscape treats </br> like <br> - ugh.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 (fset 'w3-handle-/br 'w3-handle-br)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1021 (defun w3-create-blank-pixmap (width height)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1022 (let ((retval
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1023 (concat "/* XPM */\n"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1024 "static char *pixmap[] = {\n"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1025 ;;"/* width height num_colors chars_per_pixel */\n"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1026 (format "\" %d %d 2 1\",\n" width height)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1027 ;;"/* colors */\n"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1028 "\". c #000000 s background\",\n"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1029 "\"# c #FFFFFF s foreground\",\n"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1030 ;;"/* pixels /*\n"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1031 ))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1032 (line (concat "\"" (make-string width ?.) "\"")))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1033 (while (/= 1 height)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1034 (setq retval (concat retval line ",\n")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1035 height (1- height)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1036 (concat retval line "\n};")))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1037
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1038 (defun w3-handle-spacer (&optional args)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1039 (let ((type (cdr-safe (assq 'type args)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1040 (size (cdr-safe (assq 'size args)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1041 (w (or (cdr-safe (assq 'width args)) 1))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1042 (h (or (cdr-safe (assq 'height args)) 1))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1043 (align (cdr-safe (assq 'align args)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1044 (glyph nil))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1045 (condition-case ()
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1046 (setq glyph (make-glyph
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1047 (vector 'xpm :data (w3-create-blank-pixmap w h))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1048 (error nil))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1049 )
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1050 )
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1051
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 (defun w3-handle-font (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 (let* ((sizearg (cdr-safe (assq 'size args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 (sizenum (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 ((null sizearg) nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 ((= ?+ (string-to-char sizearg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 (min (+ 3 (string-to-int (substring sizearg 1))) 7))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 ((= ?- (string-to-char sizearg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 (max (- 3 (string-to-int (substring sizearg 1))) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 ((string= sizearg (int-to-string (string-to-int sizearg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 (string-to-int sizearg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 (t nil)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1063 (family (cdr-safe (assq 'face args)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 (color (cdr-safe (assq 'color args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 (normcolor (if color (w3-normalize-color color)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1066 (w3-current-stylesheet (list
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1067 (list 'font
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1068 (list 'internal
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1069 (cons 'font-family family)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1070 (cons 'font-size-index sizenum)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1071 (cons 'foreground normcolor))))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1072 (w3-style-post-process-stylesheet w3-current-stylesheet)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 (w3-handle-emphasis args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 (defun w3-handle-/font (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 (w3-handle-emphasis-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 (defun w3-handle-center (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 (w3-push-alignment 'center))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 (defun w3-handle-/center (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 (let ((tag 'center))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 (w3-pop-alignment)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 ;;; Bonus HTML Tags just for fun :)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 (defun w3-handle-embed (&optional args)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1091 ;; This needs to be reimplemented!!!
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1092 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 (defun w3-handle-blink (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 ;; Keep track of all the buffers with blinking in them, and do GC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 ;; of this list whenever a new <blink> tag is encountered. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 ;; timer checks this list to see if any of the buffers are visible,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 ;; and only blinks the face if there are any visible. This cuts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 ;; down tremendously on the amount of X traffic, and frame !@#!age
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 ;; due to lots of face munging.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 (w3-handle-emphasis args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 (let ((buffs w3-blinking-buffs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 (name1 (buffer-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 (name2 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 (add t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 (setq w3-blinking-buffs nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 ;; Get rid of old buffers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 (while buffs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 (setq name2 (buffer-name (car buffs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 (if (null name2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 (setq w3-blinking-buffs (cons (car buffs) w3-blinking-buffs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 (if (string= name1 name2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 (setq add nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 (setq buffs (cdr buffs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 (if add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 (setq w3-blinking-buffs (cons (current-buffer) w3-blinking-buffs)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 (defun w3-handle-/blink (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 (w3-handle-emphasis-end args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 (defun w3-handle-peek (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 ;; Handle the peek tag. Valid attributes are:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 ;; VARIABLE:: any valid lisp variable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 ;; If VARIABLE is bound and non-nil, then the value of the variable is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 ;; inserted at point. This can handle variables whos values are any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 ;; arbitrary lisp type.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 (let* ((var-name (cdr-safe (assq 'variable args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 (var-sym (and var-name (intern var-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 (val (and var-sym (boundp var-sym) (symbol-value var-sym))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 ((null val) nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 ((stringp val) (w3-handle-text val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 (t (w3-handle-text (format "%S" val))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 (defun w3-rotate-region (st nd &optional rotation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 "Ceasar rotate a region between ST and ND using ROTATION as the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 amount to rotate the text. Defaults to caesar (13)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 (setq rotation (or rotation 13))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 (let (x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 (while (< st nd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 (setq x (char-after st))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 ((and (>= x ?a) (<= x ?z))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 (setq x (- x ?a)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 x (char-to-string (+ (% (+ x rotation) 26) ?a))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 ((and (>= x ?A) (<= x ?Z))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 (setq x (- x ?A)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 x (char-to-string (+ (% (+ x rotation) 26) ?A))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 (t (setq x nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 (if x (progn (goto-char st) (delete-char 1) (insert x)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 (setq st (1+ st))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 (defun w3-handle-kill-sgml (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 (w3-handle-text "SGML is the spawn of evil! It must be stopped!"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 (defun w3-handle-secret (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 (if (fboundp 'valid-specifier-locale-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 (let ((tag 'rot13))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 (w3-handle-emphasis))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 (w3-put-state :secret (set-marker (make-marker) (point)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 (defun w3-handle-/secret (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 "Close a secret region of text."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 (if (fboundp 'valid-specifier-locale-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 (let ((tag '/rot13))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 (w3-handle-emphasis-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 (if (integer-or-marker-p (w3-get-state :secret))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 (w3-rotate-region (w3-get-state :secret) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 (w3-put-state :secret nil)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 (defun w3-handle-hype (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 (if (and (or (featurep 'nas-sound) (featurep 'native-sound))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 (assoc 'hype sound-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 (play-sound 'hype 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 (w3-handle-text "Hey, has Marca A. told you how cool he is?")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 (defun w3-handle-yogsothoth (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 (w3-handle-image (list (cons 'src "href-to-yogsothoth-pic")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 (cons 'alt "YOGSOTHOTH LIVES!!!"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 (defun w3-handle-roach (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 (w3-handle-text "Man, I am so wasted..."))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 (defun w3-handle-/roach (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 (w3-handle-text (concat "So, you wanna get some "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 (or (cdr-safe (assq 'munchy args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 "nachos") "? ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 (defun w3-invert-face (face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 (let ((buffs w3-blinking-buffs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 (blink nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 (buff nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 (if buffs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 (while buffs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 (setq buff (car buffs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 ((bufferp buff)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 (if (buffer-name buff)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 (setq buff (car buffs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 (setq buff nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 ((stringp buff)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 (setq buff (get-buffer buff)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 (setq buff nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 (setq buffs (cdr buffs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 buff (and buff (get-buffer-window buff 'visible))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 buff (and buff (window-live-p buff)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 (if buff (setq buffs nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 blink t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 (if blink (invert-face face))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 (autoload 'sentence-ify "flame")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 (autoload 'string-ify "flame")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 (autoload '*flame "flame")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 (if (not (fboundp 'flatten)) (autoload 'flatten "flame"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 (defvar w3-cookie-cache nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 (defun w3-handle-cookie (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 (if (not (fboundp 'cookie))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 (w3-handle-text "Sorry, no cookies today.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 (let* ((url-working-buffer (url-generate-new-buffer-name " *cookie*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 (href (url-expand-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 (or (cdr-safe (assq 'src args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 (cdr-safe (assq 'href args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 (cdr-safe (assoc (cdr-safe (assq 'base args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 w3-base-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 (fname (or (cdr-safe (assoc href w3-cookie-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 (url-generate-unique-filename "%s.cki")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 (st (or (cdr-safe (assq 'start args)) "Loading cookies..."))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 (nd (or (cdr-safe (assq 'end args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 "Loading cookies... done.")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 (if (not (assoc href w3-cookie-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 (url-clear-tmp-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 (setq url-be-asynchronous nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 (url-retrieve href)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 (url-uncompress)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 (write-region (point-min) (point-max) fname 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 (setq w3-cookie-cache (cons (cons href fname) w3-cookie-cache))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 (w3-handle-text (cookie fname st nd)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 (defun w3-handle-flame (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 (w3-handle-text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 (sentence-ify
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 (string-ify
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 (append-suffixes-hack (flatten (*flame)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 (error nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 (defun w3-handle-pinhead (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 (if (fboundp 'yow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 (w3-handle-text (yow))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 ;;; Client-side Imagemaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 (defun w3-handle-map (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 (w3-put-state :map (cons (or (cdr-safe (assq 'name args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 (cdr-safe (assq 'id args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 "unnamed") nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 (defun w3-handle-/map (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 (and (w3-get-state :map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 (setq w3-imagemaps (cons (w3-get-state :map) w3-imagemaps)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 (w3-put-state :map nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 (defun w3-decode-area-coords (str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 (let (retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 (while (string-match "\\([ \t0-9]+\\),\\([ \t0-9]+\\)" str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 (setq retval (cons (vector (string-to-int (match-string 1 str))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 (string-to-int (match-string 2 str))) retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 str (substring str (match-end 0) nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 (if (string-match "\\([0-9]+\\)" str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 (setq retval (cons (vector (+ (aref (car retval) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 (string-to-int (match-string 1 str)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 (aref (car retval) 1)) retval)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 (nreverse retval)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 (defun w3-handle-area (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 (let ((type (downcase (or (cdr-safe (assq 'shape args)) "rect")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 (coords (w3-decode-area-coords (or (cdr-safe (assq 'coords args)) "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 (alt (cdr-safe (assq 'alt args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 (href (if (assq 'nohref args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 (url-expand-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 (or (cdr-safe (assq 'src args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 (cdr-safe (assq 'href args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 (cdr-safe (assoc (cdr-safe (assq 'base args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 w3-base-alist)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 (map (w3-get-state :map)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 ;; data structure in storage is a vector
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 ;; if (href == t) then no action should be taken
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 ;; [ type coordinates href (hopefully)descriptive-text]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 (setcdr map (cons (vector type coords href alt) (cdr map)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 ;;; Tags that don't really get drawn, etc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1304 (defun w3-handle-/html (&optional args)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1305 ;; Technically, we are not supposed to have any text outside the
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1306 ;; html element, so start ignoring everything.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1307 (put 'text 'w3-formatter 'ack))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1308
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 (defun w3-handle-body (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 (if (not w3-user-colors-take-precedence)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 (let* ((vlink (cdr-safe (assq 'vlink args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 (alink (cdr-safe (assq 'alink args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 (link (cdr-safe (assq 'link args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 (text (cdr-safe (assq 'text args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 (backg (cdr-safe (assq 'background args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 (rgb (or (cdr-safe (assq 'bgcolor args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 (cdr-safe (assq 'rgb args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 (temp-face nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 (sheet ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 (setq backg (url-expand-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 backg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 (cdr-safe (assoc (cdr-safe (assq 'base args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 w3-base-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 (if (or text rgb backg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326 (setq sheet "html {")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 (if text (setq sheet (format "%scolor: %s; " sheet
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 (w3-normalize-color text))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 (if rgb (setq sheet (format "%sbackground: %s; "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 sheet (w3-normalize-color rgb))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 (if backg (setq sheet (format "%sbackdrop: %s; "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 sheet backg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 (setq sheet (concat sheet " }\n"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 (if link
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 (setq sheet (format "%sa.link { color: %s }\n" sheet
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 (w3-normalize-color link))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 (if vlink
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 (setq sheet (format "%sa.visited { color: %s }\n" sheet
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 (w3-normalize-color vlink))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 (if alink
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 (setq sheet (format "%sa.active { color: %s }\n" sheet
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 (w3-normalize-color alink))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 (if (/= (length sheet) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 (w3-handle-style (list (cons 'data sheet)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345 (cons 'notation "css")))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 (defun w3-handle-cryptopts (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 (put 'text 'w3-formatter 'ack))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 (defun w3-handle-/cryptopts (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 (put 'text 'w3-formatter nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 (defun w3-handle-certs (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 (put 'text 'w3-formatter 'ack))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 (defun w3-handle-/certs (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 (put 'text 'w3-formatter nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 (defun w3-handle-base (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 (setq w3-base-alist (cons
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 (cons (or (cdr-safe (assq 'name args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 (cdr-safe (assq 'id args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 (or (cdr-safe (assq 'href args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 (cdr-safe (assq 'src args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 (url-view-url t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 w3-base-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 (defun w3-handle-isindex (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 (let ((prompt (or (cdr-safe (assq 'prompt args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 "Search on (+ separates keywords): "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 action)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 (setq action (url-expand-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 (or (cdr-safe (assq 'src args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 (cdr-safe (assq 'href args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 (url-view-url t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 (cdr-safe (assoc (cdr-safe (assq 'base args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 w3-base-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 (if (and prompt (string-match "[^: \t-]+$" prompt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 (setq prompt (concat prompt ": ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 (if w3-use-forms-index
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 (w3-handle-hr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 (w3-handle-form (list (cons 'action action)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 (cons 'enctype "application/x-w3-isindex")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 (cons 'method "get")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 (w3-handle-text (concat prompt " "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 (w3-handle-input (list (cons 'type "text")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 (cons 'name "isindex")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 (setq w3-current-isindex (cons action prompt))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 (defun w3-handle-meta (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 (let* ((equiv (cdr-safe (assq 'http-equiv args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 (value (cdr-safe (assq 'content args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 (node (and equiv (assoc (setq equiv (downcase equiv))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 url-current-mime-headers))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 (if equiv
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 (setq url-current-mime-headers (cons (cons equiv value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 url-current-mime-headers)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 ;; Special-case the Set-Cookie header
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 (if (and equiv (string= (downcase equiv) "set-cookie"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 (url-cookie-handle-set-cookie value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 ;; Special-case the refresh header
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 (if (and equiv (string= (downcase equiv) "refresh"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 (url-handle-refresh-header value))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 (defun w3-handle-link (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 (let* ((dest (cdr-safe (assq 'href args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 (type (if (assq 'rel args) "Parent of" "Child of"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 (desc (or (cdr-safe (assq 'rel args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 (cdr-safe (assq 'rev args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 (node-1 (assoc type w3-current-links))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 (node-2 (and node-1 desc (assoc desc (cdr node-1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 (base (cdr-safe (assq 'base args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 (if dest
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 (setq dest (url-expand-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 dest
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 (cdr-safe (assoc base w3-base-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 (node-2 ; Add to old value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 (setcdr node-2 (cons dest (cdr node-2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 (node-1 ; first rel/rev
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 (setcdr node-1 (cons (cons desc (list dest)) (cdr node-1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 (t (setq w3-current-links
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 (cons (cons type (list (cons desc (list dest))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 w3-current-links))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 (if (and dest desc (member (downcase desc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 '("style" "stylesheet")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 (w3-handle-style (list (cons 'src dest))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 (defun w3-maybe-start-image-download (widget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 (let* ((src (widget-get widget 'src))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 (cached-glyph (w3-image-cached-p src)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 (if (and cached-glyph (w3-glyphp cached-glyph))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1435 (setq w3-image-widgets-waiting (cons widget w3-image-widgets-waiting))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 ((or w3-delay-image-loads (not (fboundp 'valid-specifier-domain-p)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1438 (w3-add-delayed-graphic widget))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 ((not (w3-image-loadable-p src nil)) ; Hey, we can't load it!
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1440 (w3-warn 'images (format "Skipping image %s" (url-basepath src t)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1441 (w3-add-delayed-graphic widget))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 (t ; Grab the images
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 (let (
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 (url-request-method "GET")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 (old-asynch url-be-asynchronous)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 (url-request-data nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 (url-request-extra-headers nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 (url-source t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 (url-mime-accept-string (substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 (mapconcat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 (lambda (x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 (if x
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 (concat (car x) ",")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 w3-allowed-image-types "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 0 -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 (url-working-buffer (generate-new-buffer-name " *W3GRAPH*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 (setq-default url-be-asynchronous t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 (setq w3-graphics-list (cons (cons src (make-glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 w3-graphics-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 (set-buffer (get-buffer-create url-working-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 (setq url-current-callback-data (list widget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 url-be-asynchronous t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 url-current-callback-func 'w3-finalize-image-download)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 (url-retrieve src))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 (setq-default url-be-asynchronous old-asynch)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 (defun w3-finalize-image-download (widget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 (let ((glyph nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 (url (widget-get widget 'src))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 (node nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 (buffer (widget-get widget 'buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 (message "Enhancing image...")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 (setq glyph (image-normalize (cdr-safe (assoc url-current-mime-type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 w3-image-mappings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 (buffer-string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 (message "Enhancing image... done")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 (kill-buffer (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 ((w3-image-invalid-glyph-p glyph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 (w3-warn 'image (format "Reading of %s failed." url)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 ((eq (aref glyph 0) 'xbm)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 (let ((temp-fname (url-generate-unique-filename "%s.xbm")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 (set-buffer (generate-new-buffer " *xbm-garbage*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 (insert (aref glyph 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 (setq glyph temp-fname)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 (write-region (point-min) (point-max) temp-fname)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 (kill-buffer (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 (setq glyph (make-glyph (list (cons 'x glyph))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 (delete-file temp-fname)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 (error nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 (setq glyph (make-glyph glyph))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 (setq node (assoc url w3-graphics-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 (if node
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 (set-glyph-image (cdr node) (glyph-image glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 (setq w3-graphics-list (cons (cons url glyph) w3-graphics-list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 (if (and (buffer-name buffer) ; Dest. buffer exists
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 (w3-glyphp glyph)) ; got a valid glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 (set-buffer buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 (if (eq major-mode 'w3-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 (widget-value-set widget glyph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 (setq w3-image-widgets-waiting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 (cons widget w3-image-widgets-waiting)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 (defun w3-handle-image (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 (let* ((parms args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 (height (cdr-safe (assq 'height parms)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 (width (cdr-safe (assq 'width parms)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 (src (or (cdr-safe (assq 'src parms))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 "Error Image"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 (our-alt (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 ((null w3-auto-image-alt) "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 ((eq t w3-auto-image-alt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 (concat "[IMAGE(" (url-basepath src t) ")] "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 ((stringp w3-auto-image-alt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 (format w3-auto-image-alt (url-basepath src t)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 (alt (or (cdr-safe (assq 'alt parms))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 our-alt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 (ismap (and (assq 'ismap args) 'ismap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 (usemap (cdr-safe (assq 'usemap args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 (dest (w3-get-state :href))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 (base (cdr-safe (assq 'base args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 (widget nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 (zone (w3-get-state :zone))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 (align (intern (or (cdr-safe (assq 'align parms)) "middle"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 (setq src (url-expand-file-name src
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 (cdr-safe (assoc base w3-base-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 (if dest
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 (w3-handle-hyperlink-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 (setq widget
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 (widget-create 'image
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 'src src ; Where to load the image from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 'alt alt ; Textual replacement
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 'ismap ismap ; Is it a server-side map?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 'usemap usemap ; Is it a client-side map?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 'href dest ; Hyperlink destination
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 (widget-put widget 'buffer (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 (w3-maybe-start-image-download widget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 (if dest
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 (w3-handle-hyperlink (list (cons 'href dest))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 (defun w3-handle-title (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 (if (w3-get-state :title)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 (w3-put-state :title nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 (put 'text 'w3-formatter 'w3-handle-title-text))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 (defun w3-handle-title-text (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 (w3-put-state :title
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 (concat (w3-get-state :title) args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 (defun w3-handle-/title (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 (put 'text 'w3-formatter nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 (let ((ttl (w3-get-state :title)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1564 (if (not (stringp ttl))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1565 nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 (setq ttl (w3-fix-spaces ttl))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 (if (and ttl (string= ttl ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 (setq ttl (w3-fix-spaces (url-view-url t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 (rename-buffer (url-generate-new-buffer-name ttl))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 ;; Make the URL show in list-buffers output
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 (make-local-variable 'list-buffers-directory)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 (setq list-buffers-directory (url-view-url t))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1573 (w3-put-state :title t))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 (fset 'w3-handle-/head 'w3-handle-/title)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 (defun w3-handle-hyperlink (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 (let* ((href-node (assq 'href args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 (href (cdr href-node))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 (title (cdr-safe (assq 'title args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 (base (cdr-safe (assq 'base args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 (name (or (cdr-safe (assq 'id args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 (cdr-safe (assq 'name args)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 (if href
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 (setq href (url-expand-file-name href (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 (assoc base w3-base-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 (setcdr href-node href)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 (w3-put-state :seen-this-url (url-have-visited-url href))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 (w3-put-state :zone (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 (w3-put-state :link-args args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 (if title (w3-put-state :link-title title))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 (if href (w3-put-state :href href))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 (if name (w3-put-state :name name))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 (defun w3-follow-hyperlink (widget &rest ignore)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1597 (let* ((target (widget-get widget 'target))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1598 (href (widget-get widget 'href))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1599 (tag 'a)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1600 (args '((class . "visited")))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1601 (face (cdr (w3-face-for-element)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1602 (old-face (and (widget-get widget :from)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1603 (get-text-property (widget-get widget :from) 'face)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1604 (faces (cond
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1605 ((and old-face (consp old-face)) (cons face old-face))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1606 (old-face (cons face (list old-face)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1607 (t (list face)))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 (if target (setq target (intern (downcase target))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1609 (put-text-property (widget-get widget :from) (widget-get widget :to)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1610 'face faces)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 (case target
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 ((_blank external)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 (w3-fetch-other-frame href))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 (_top
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615 (delete-other-windows)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 (w3-fetch href))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 (otherwise
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 (w3-fetch href)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1620 (defun w3-balloon-help-callback (object &optional event)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1621 (let* ((widget (widget-at (extent-start-position object)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1622 (href (and widget (widget-get widget 'href))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1623 (if href
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1624 (url-truncate-url-for-viewing href)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1625 nil)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1626
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 (defun w3-handle-hyperlink-end (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 (let* ((href (w3-get-state :href))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 (old-args (w3-get-state :link-args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 (name (w3-get-state :name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 (zone (w3-get-state :zone))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 (btdt (and href (w3-get-state :seen-this-url)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 (tag 'a)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 (args (list (cons 'class (if btdt "visited" "link"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 (face (cdr (w3-face-for-element)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 (old-face (and zone (get-text-property zone 'face)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 (faces (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 ((and old-face (consp old-face)) (cons face old-face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639 (old-face (cons face (list old-face)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 (t (list face)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 (if (not href)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 (add-text-properties zone (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 (list 'mouse-face 'highlight
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 'button
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 (append
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 (list 'push :args nil :value "" :tag ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 :notify 'w3-follow-hyperlink
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 :from (set-marker (make-marker) zone)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 :to (set-marker (make-marker) (point))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1651 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 (alist-to-plist old-args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653 'face faces
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1654 'balloon-help 'w3-balloon-help-callback
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655 'title (cons
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 (set-marker (make-marker) zone)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657 (set-marker (make-marker) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 'help-echo href))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 (w3-put-state :zone nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 (w3-put-state :href nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 (w3-put-state :name nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 (if (and w3-link-info-display-function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 (fboundp w3-link-info-display-function))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664 (let ((info (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 (funcall w3-link-info-display-function href)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 (error nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 (if (and info (stringp info))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 (w3-handle-text info)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 (defvar w3-tab-alist nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 "An assoc list of tab stops and their respective IDs")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 (make-variable-buffer-local 'w3-tab-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 (defun w3-handle-tab (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 (let* ((id (cdr-safe (assq 'id args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 (to (cdr-safe (assq 'to args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 (pos (cdr-safe (assoc to w3-tab-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 (id ; Define a new tab stop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 (setq w3-tab-alist (cons (cons id (current-column)) w3-tab-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 ((and to pos) ; Go to a currently defined tabstop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 (while (<= (current-column) pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 (insert " ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 (to ; Tabstop 'to' is no defined yet
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 (w3-warn 'html (format "Unkown tab stop -- `%s'" to)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 (t ; Just do a tab
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 (insert (make-string w3-indent-level ? ))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 ;;; Some bogus shit for pythia
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 (defun w3-handle-margin (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 (if (assq 'reset args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 (w3-handle-/blockquote nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 (w3-handle-blockquote nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 (fset 'w3-handle-l 'w3-handle-br)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 ;;; Guts of the forms interface for the new display engine
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 (defun w3-handle-form (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 (let ((actn (cdr-safe (assq 'action args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 (enct (cdr-safe (assq 'enctype args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 (meth (cdr-safe (assq 'method args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 (if (not meth) (setq args (cons (cons 'method "GET") args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 (if (not actn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 (setq args (cons (cons 'action
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709 (or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 (cdr-safe (assoc (cdr-safe (assq 'base args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 w3-base-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 (url-view-url t))) args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 (setcdr (assq 'action args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 (url-expand-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 actn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 (cdr-safe (assoc (cdr-safe (assq 'base args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 w3-base-alist)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 (if (not enct)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 (setq args
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 (cons (cons 'enctype "application/x-www-form-urlencoded")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 (w3-put-state :form args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 (defun w3-handle-/form (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 (w3-put-state :form nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 (w3-put-state :formnum (1+ (w3-get-state :formnum)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 (defun w3-handle-keygen (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 (w3-form-add-element 'keygen
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 (or (cdr-safe (assq 'name args)) "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 1000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 (w3-get-state :form)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 (w3-get-state :formnum)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 (w3-face-for-element)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 (defun w3-handle-input (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 (if (or (not (w3-get-state :form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 (w3-get-state :select))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 (w3-warn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747 'html
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 "<input> outside of a <form> or inside <select> construct - ERROR!!")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 (let* ((type (intern (downcase (or (cdr-safe (assq 'type args)) "text"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 (name (cdr-safe (assq 'name args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 (value (or (cdr-safe (assq 'value args)) ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 (size (string-to-int (or (cdr-safe (assq 'size args)) "20")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 (maxlength (cdr (assoc 'maxlength args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 (default value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 (action (w3-get-state :form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 (options)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 (num (w3-get-state :formnum))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758 (id (cdr-safe (assq 'id args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 (checked (assq 'checked args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 (face (w3-face-for-element)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 (if (and (string-match "^[ \t\n\r]+$" value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 (not (eq type 'hidden)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 (setq value ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 (if maxlength (setq maxlength (string-to-int maxlength)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 (if (and name (string-match "[\r\n]" name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 (setq name (mapconcat (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 (lambda (x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 (if (memq x '(?\r ?\n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770 (char-to-string x))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 name "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 (if (memq type '(checkbox radio)) (setq default checked))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 (if (and (eq type 'checkbox) (string= value ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 (setq value "on"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775 (w3-form-add-element type name value size maxlength default action
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 options num id checked face))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 (defun w3-handle-/select (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 (if (not (and (w3-get-state :form)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 (w3-get-state :select)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 (w3-warn 'html
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 "</select> outside of a <form> or <select> construct - ERROR!!")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 (put 'text 'w3-formatter 'w3-handle-text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 (let* ((args (w3-get-state :select))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 (tag 'input)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 (face (w3-face-for-element))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 (opts (w3-get-state :options))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 (form (w3-get-state :form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789 (max-size nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 (type "OPTION")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 (default nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 (tmp nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 (id (cdr-safe (assq 'id args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794 (checked nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 (setq tmp (reverse opts))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 (if (assq 'multiple args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 (let ((tag 'ul) ; Convert to a list of checkboxes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 (nam (or (cdr-safe (assq 'name args)) "option"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 (old (w3-get-state :align))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 (first nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 (w3-put-state :options nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 (w3-put-state :select nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 (w3-handle-list-opening)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 (w3-put-state :align nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 (while tmp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 (w3-handle-list-item)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 (w3-handle-input (list (cons 'type "checkbox")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 (cons 'name nam)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 (cons 'value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 (or (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 (assq 'value (car tmp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 (assoc 'ack (car tmp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 "unknown"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 (if (or (assq 'checked (car tmp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 (assq 'selected (car tmp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 (cons 'checked "checked"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 (w3-handle-text (concat " " (or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 (cdr-safe (assq 'ack (car tmp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 "unknown")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 (setq tmp (cdr tmp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 (w3-handle-list-ending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 (w3-put-state :align old))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 (while (and (not default) tmp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 (if (or (assq 'checked (car tmp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 (assq 'selected (car tmp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 (setq default (car tmp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 (setq tmp (cdr tmp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 (setq default (cdr (assq 'ack (or default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 (nth (1- (length opts)) opts))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 checked (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 (lambda (x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 (cons (cdr-safe (assq 'ack x))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 (or (cdr-safe (assq 'value x))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 (cdr-safe (assq 'ack x))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 opts)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 max-size (car (sort (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 (lambda (x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 (length (cdr-safe (assq 'ack x)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 opts)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 '>)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 (if (and form args opts)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 (let ((pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 (siz (max max-size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 (or (cdr-safe (assq 'size args)) "0")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 (w3-form-add-element 'option
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 (or (cdr-safe (assq 'name args)) "option")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 siz
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 (or (cdr-safe (assq 'maxlength args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 "1000"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 (w3-get-state :form)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 checked
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 (w3-get-state :formnum)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 nil checked face)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 (w3-put-state :options nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 (w3-put-state :select nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 (defun w3-handle-option-data (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 (let ((text (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 ((null args) nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 ((stringp args) args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 ((listp args) (mapconcat 'identity args " ")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 (if text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 (setq text (url-strip-leading-spaces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 (url-eat-trailing-space text)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 (w3-put-state :options (cons (cons (cons 'ack text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875 (w3-get-state :optargs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 (w3-get-state :options))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 (put 'text 'w3-formatter 'w3-handle-text))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 (defun w3-handle-option (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 (if (not (and (w3-get-state :form)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 (w3-get-state :select)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 (w3-warn 'html
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 "<option> outside of a <form> or <select> construct - ERROR!!")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 (w3-put-state :optargs args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 (put 'text 'w3-formatter 'w3-handle-option-data)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887 (defun w3-handle-select (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888 (if (not (w3-get-state :form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 (w3-warn 'html "<select> outside of a <FORM> construct - ERROR!!")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 (w3-put-state :select args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 (defun w3-handle-textarea (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 (if (not (w3-get-state :form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 (w3-warn 'html "<textarea> outside of a <FORM> construct - ERROR!!")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 (let ((node (assq 'maxlength args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 ((null node)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 (setq args (cons (cons 'maxlength nil) args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 ((null (cdr-safe node))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 ((string= (downcase (cdr-safe node)) "unlimited")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 (setcdr node nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 (let* (
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 (face (let ((tag 'input)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 (args nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 (w3-face-for-element)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 (value (cdr-safe (assq 'data args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 (type "TEXTAREA")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910 (name (cdr-safe (assq 'name args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 (size (string-to-int (or (cdr-safe (assq 'size args)) "20")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 (maxlength (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913 (or (cdr (assq 'maxlength args)) "10000")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914 (default nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 (action (w3-get-state :form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 (options)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 (pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 (num (w3-get-state :formnum))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919 (id (cdr-safe (assq 'id args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 (checked (assq 'checked args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 (setq default value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922 pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 (put 'text 'w3-formatter 'w3-handle-text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 (w3-form-add-element 'multiline name value size maxlength default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 action options num id checked face))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 (defun w3-handle-label-text (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 (setcdr (w3-get-state :label-text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 (concat (cdr (w3-get-state :label-text)) args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 (w3-handle-text args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 (defun w3-handle-/label (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 (let ((num (w3-get-state :formnum))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 (dat (w3-get-state :label-text)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 (setq w3-form-labels (cons (cons (format "%d:%s" num (car dat))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 (cdr dat))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 w3-form-labels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 (put 'text 'w3-formatter 'w3-handle-text)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940 (defun w3-handle-label (&optional args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 (if (not (w3-get-state :form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 (w3-warn 'html "<label> outside of a <FORM> construct - ERROR!!")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 (put 'text 'w3-formatter 'w3-handle-label-text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 (w3-put-state :label-text (cons (or (cdr-safe (assq 'for args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 "Unknown label") ""))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 ;;; For displaying the buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 (defun w3-show-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 (let ((potential-title
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 (and (not (w3-get-state :title))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 (url-generate-new-buffer-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 (url-basepath url-current-file t)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 (if (and potential-title (string= potential-title ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 (setq potential-title
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 (url-generate-new-buffer-name url-current-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 (if (and potential-title (not (string= potential-title "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 (rename-buffer potential-title)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 (setq inhibit-read-only nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 (if url-find-this-link
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 (w3-find-specific-link url-find-this-link))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 (let* ((tag 'html)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 (args nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 (face (cdr (w3-face-for-element))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1966 (if (not face)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1967 (setq tag 'body
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1968 face (cdr (w3-face-for-element))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 (and face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 (if (not (fboundp 'valid-specifier-locale-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 (w3-my-safe-copy-face face 'default (current-buffer))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 (defun w3-parse-header-link-items ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 ;; Parse `url-current-mime-headers' and look for any <link> items
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 (let ((items url-current-mime-headers)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 (node nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 (url nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 (type nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 (args nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 (title nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 (label nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 (while items
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 (setq node (car items)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 items (cdr items))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 (if (string= (car node) "link")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 (setq args (mm-parse-args (cdr node))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 type (if (assoc "rel" args) "rel" "rev")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 label (cdr-safe (assoc type args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 title (cdr-safe (assoc "title" args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 url (car-safe (rassoc nil args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 (if (string-match "^<.*>$" url)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 (setq url (substring url 1 -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 (and url label type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 (w3-handle-link (list (cons "href" url)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 (cons type label)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 (cons "title" title)))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 (defun w3-refresh-buffer (&rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 "Redraw the current buffer - this does not refetch or reparse the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 document, but uses the stored parse data."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 (let ((buffer-read-only nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 (if (get-buffer url-working-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 (kill-buffer url-working-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 (error "Not yet reimplemented... sorry.")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 (defun w3-prepare-buffer (&rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 ;; The text/html viewer - does all the drawing and displaying of the buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 ;; that is necessary to go from raw HTML to a good presentation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 (let ((active-minibuffer-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 (if (minibuffer-window-active-p (minibuffer-window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014 (minibuffer-window))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015 (let ((pop-up-windows nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 (if active-minibuffer-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 (let* ((current-buffer (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 (window (get-buffer-window current-buffer t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 (cond (window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 (and (fboundp 'select-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 (fboundp 'window-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 (select-frame (window-frame window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 (select-window window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 ((and (fboundp 'selected-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 (fboundp 'window-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 (eq (selected-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 (window-frame (minibuffer-window))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 ;; on minibuffer-only-frame
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 (select-frame (previous-frame))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 (select-window (frame-first-window (selected-frame))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 ((fboundp 'frame-first-window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 (select-window (frame-first-window))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 (set-buffer current-buffer))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 (let* ((source (buffer-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 (parse (w3-preparse-buffer (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 (buff (car parse)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 (set-buffer-modified-p nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 (kill-buffer (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 (set-buffer buff)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 (setq w3-current-source source
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041 w3-current-parse w3-last-parse-tree)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 (w3-parse-header-link-items)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 (w3-handle-paragraph)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 (if (and (boundp 'w3-image-widgets-waiting) w3-image-widgets-waiting)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 (let (url glyph widget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 (while w3-image-widgets-waiting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 (setq widget (car w3-image-widgets-waiting)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 w3-image-widgets-waiting (cdr w3-image-widgets-waiting)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 url (widget-get widget 'src)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 glyph (cdr-safe (assoc url w3-graphics-list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 (widget-value-set widget glyph))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 (w3-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 (w3-handle-annotations)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056 (w3-handle-headers)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 (set-buffer-modified-p nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 (switch-to-buffer (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 (or active-minibuffer-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 (let ((window nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 (pop-up-windows nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 (display-buffer (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 (if (or w3-running-FSF19 w3-running-xemacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 (setq window (get-buffer-window (current-buffer) t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 (setq window (get-buffer-window (current-buffer))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 (select-window window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068 (if (and (fboundp 'select-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 (fboundp 'window-frame))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 (select-frame (window-frame window)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 (w3-show-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 (if url-keep-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 (let ((url (url-view-url t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 (if (not (url-hashtablep url-history-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 (setq url-history-list (url-make-hashtable 131)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 (url-puthash url (buffer-name) url-history-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 (if (fboundp 'w3-shuffle-history-menu)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 (w3-shuffle-history-menu)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 (cond (active-minibuffer-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 (select-window active-minibuffer-window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 (sit-for 0)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 (defun w3-handle-headers ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 ;; Insert any headers the user wants to see into the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 (let ((show w3-show-headers)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 (cur nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 (hdrs nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 (tag 'ol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 (header nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 (w3-last-fill-pos (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 (val nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 (first t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 (if (eq show t) (setq show '(".*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 (while show
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 (setq cur (car show)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 show (cdr show)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099 hdrs url-current-mime-headers)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 (while hdrs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 (setq header (car (car hdrs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 val (cdr (car hdrs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 hdrs (cdr hdrs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 (if (numberp val) (setq val (int-to-string val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 (if (and (/= 0 (length header))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 (string-match cur header))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 (if first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110 (w3-handle-hr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 (w3-handle-list-opening '(("value" . 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 (setq tag 'li
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 first nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 (w3-handle-list-item)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 (w3-handle-text (concat (capitalize header)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 ": " val))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 (if (not first) ; We showed some headers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 (setq tag '/ol
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119 tag (w3-handle-list-ending)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121 (defun w3-handle-annotations ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 ;; Insert personal annotations into the current buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 (let ((annos (w3-fetch-personal-annotations))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 (tag nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 (if (not annos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 nil ; No annotations
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 (goto-char (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 ((eq w3-annotation-position 'bottom) (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 ((eq w3-annotation-position 'top) (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 (t (message "Bad value for w3-annotation-position")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 (point-max))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 (w3-handle-div '((class . "annotations")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 (w3-handle-hr '((width . "75%")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 (label . " Personal Annotations ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 (align . "center")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 (setq tag 'ol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 (w3-handle-list-opening)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 (while annos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 (w3-handle-list-item)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 (w3-handle-hyperlink (list (cons 'href (car (car annos)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 (w3-handle-text (cdr (car annos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 (w3-handle-hyperlink-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 (setq annos (cdr annos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 (w3-handle-list-ending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 (w3-handle-hr '((width . "75%")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 (align . "center")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 (w3-handle-/div)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 (defun w3-fetch-personal-annotations ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 ;; Grab any personal annotations for the current url
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 (let ((url (url-view-url t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 (anno w3-personal-annotations)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 (annolist nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 (if (assoc url anno)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 (while anno
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 (if (equal (car (car anno)) url)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 (setq annolist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 (cons
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 (cons
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 (format "file:%s%s/PAN-%s.html"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 (if (= ?/ (string-to-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 w3-personal-annotation-directory)) ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 "/")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 w3-personal-annotation-directory
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 (car (car (cdr (car anno)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 (car (cdr (car (cdr (car anno))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 annolist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169 (setq anno (cdr anno))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 annolist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172 (defun w3-normalize-spaces (string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 ;; nuke spaces at the beginning
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 (if (string-match "^[ \t\r\n]+" string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 (setq string (substring string (match-end 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 ;; nuke spaces in the middle
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 (while (string-match "[ \t\r\n][ \r\t\n]+" string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 (setq string (concat (substring string 0 (1+ (match-beginning 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 (substring string (match-end 0)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 ;; nuke spaces at the end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 (if (string-match "[ \t\n\r]+$" string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 (setq string (substring string 0 (match-beginning 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187 (defun w3-upcase-region (st nd &optional end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 (and st nd (upcase-region st nd)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 (provide 'w3-draw)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191