annotate lisp/w3/w3-display.el @ 46:6a22abad6937 r19-15

Import from CVS: tag r19-15
author cvs
date Mon, 13 Aug 2007 08:55:31 +0200
parents 8d2a9b52c682
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1 ;;; w3-display.el --- display engine v99999
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2 ;; Author: wmperry
46
6a22abad6937 Import from CVS: tag r19-15
cvs
parents: 44
diff changeset
3 ;; Created: 1997/03/26 15:24:53
6a22abad6937 Import from CVS: tag r19-15
cvs
parents: 44
diff changeset
4 ;; Version: 1.157
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
5 ;; Keywords: faces, help, hypermedia
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
6
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
8 ;;; Copyright (c) 1996 by William M. Perry (wmperry@cs.indiana.edu)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
9 ;;; Copyright (c) 1996, 1997 Free Software Foundation, Inc.
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
10 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
11 ;;;
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
12 ;;; This file is part of GNU Emacs.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
13 ;;;
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
14 ;;; GNU Emacs is free software; you can redistribute it and/or modify
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
15 ;;; it under the terms of the GNU General Public License as published by
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
16 ;;; the Free Software Foundation; either version 2, or (at your option)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
17 ;;; any later version.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
18 ;;;
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
19 ;;; GNU Emacs is distributed in the hope that it will be useful,
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
20 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
21 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
22 ;;; GNU General Public License for more details.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
23 ;;;
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
24 ;;; You should have received a copy of the GNU General Public License
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
25 ;;; along with GNU Emacs; see the file COPYING. If not, write to the
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
26 ;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
27 ;;; Boston, MA 02111-1307, USA.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
28 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
29 (require 'cl)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
30 (require 'css)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
31 (require 'font)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
32 (require 'w3-widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
33 (require 'w3-imap)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
34
22
8fc7fe29b841 Import from CVS: tag r19-15b94
cvs
parents: 20
diff changeset
35 (define-widget-keywords :emacspeak-help)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
36 (autoload 'sentence-ify "flame")
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
37 (autoload 'string-ify "flame")
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
38 (autoload '*flame "flame")
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
39 (if (not (fboundp 'flatten)) (autoload 'flatten "flame"))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
40 (defvar w3-cookie-cache nil)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
41
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
42 (defmacro w3-d-s-var-def (var)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
43 (` (make-variable-buffer-local (defvar (, var) nil))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
44
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
45 (w3-d-s-var-def w3-display-label-marker)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
46 (w3-d-s-var-def w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
47 (w3-d-s-var-def w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
48 (w3-d-s-var-def w3-display-list-stack)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
49 (w3-d-s-var-def w3-display-form-id)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
50 (w3-d-s-var-def w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
51 (w3-d-s-var-def w3-display-font-family-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
52 (w3-d-s-var-def w3-display-font-weight-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
53 (w3-d-s-var-def w3-display-font-variant-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
54 (w3-d-s-var-def w3-display-font-size-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
55 (w3-d-s-var-def w3-face-color)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
56 (w3-d-s-var-def w3-face-background-color)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
57 (w3-d-s-var-def w3-active-faces)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
58 (w3-d-s-var-def w3-active-voices)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
59 (w3-d-s-var-def w3-current-form-number)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
60 (w3-d-s-var-def w3-face-font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
61 (w3-d-s-var-def w3-face-font-weight)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
62 (w3-d-s-var-def w3-face-font-variant)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
63 (w3-d-s-var-def w3-face-font-size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
64 (w3-d-s-var-def w3-face-font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
65 (w3-d-s-var-def w3-face-font-size)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
66 (w3-d-s-var-def w3-face-font-style)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
67 (w3-d-s-var-def w3-face-font-spec)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
68 (w3-d-s-var-def w3-face-text-decoration)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
69 (w3-d-s-var-def w3-face-face)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
70 (w3-d-s-var-def w3-face-descr)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
71 (w3-d-s-var-def w3-face-pixmap)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
72 (w3-d-s-var-def w3-display-css-properties)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
73
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
74 (eval-when-compile
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
75 (defmacro w3-get-attribute (attr)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
76 (` (cdr-safe (assq (, attr) args))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
77
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
78 (defmacro w3-get-face-info (info &optional other)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
79 (let ((var (intern (format "w3-face-%s" info))))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
80 (` (push (w3-get-style-info (quote (, info)) node
46
6a22abad6937 Import from CVS: tag r19-15
cvs
parents: 44
diff changeset
81 (or (cdr-safe (assq (quote (, other))
6a22abad6937 Import from CVS: tag r19-15
cvs
parents: 44
diff changeset
82 (nth 1 node)))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
83 (car (, var))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
84 (, var)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
85
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
86 (defmacro w3-pop-face-info (info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
87 (let ((var (intern (format "w3-face-%s" info))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
88 (` (pop (, var)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
89
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
90 (defmacro w3-get-all-face-info ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
91 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
92 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
93 (w3-get-face-info font-family)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
94 (w3-get-face-info font-style)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
95 (w3-get-face-info font-weight)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
96 (w3-get-face-info font-variant)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
97 (w3-get-face-info font-size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
98 (w3-get-face-info text-decoration)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
99 ;;(w3-get-face-info pixmap)
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
100 (w3-get-face-info color color)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
101 (w3-get-face-info background-color bgcolor)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
102 (setq w3-face-font-spec (make-font
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
103 :weight (car w3-face-font-weight)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
104 :family (car w3-face-font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
105 :size (car w3-face-font-size))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
106
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
107 (defmacro w3-pop-all-face-info ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
108 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
109 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
110 (w3-pop-face-info font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
111 (w3-pop-face-info font-weight)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
112 (w3-pop-face-info font-variant)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
113 (w3-pop-face-info font-size)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
114 (w3-pop-face-info font-style)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
115 (w3-pop-face-info text-decoration)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
116 ;;(w3-pop-face-info pixmap)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
117 (w3-pop-face-info color)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
118 (w3-pop-face-info background-color))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
119
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
120 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
121
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
122 (defvar w3-display-same-buffer nil)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
123 (defvar w3-face-cache nil "Cache for w3-face-for-element")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
124 (defvar w3-face-index 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
125 (defvar w3-image-widgets-waiting nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
126
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
127 (make-variable-buffer-local 'w3-last-fill-pos)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
128
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
129 (defconst w3-fill-prefixes-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
130 (let ((len 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
131 (prefix-vector (make-vector 80 nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
132 (while (< len 80)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
133 (aset prefix-vector len (make-string len ? ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
134 (setq len (1+ len)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
135 prefix-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
136
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
137 (defconst w3-line-breaks-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
138 (let ((len 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
139 (breaks-vector (make-vector 10 nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
140 (while (< len 10)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
141 (aset breaks-vector len (make-string len ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
142 (setq len (1+ len)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
143 breaks-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
144
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
145 (defun w3-pause ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
146 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
147 (w3-running-FSF19 (sit-for 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
148 (w3-running-xemacs
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
149 (sit-for 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
150 ;; (if (and (not (sit-for 0)) (input-pending-p))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
151 ;; (condition-case ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
152 ;; (dispatch-event (next-command-event))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
153 ;; (error nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
154 (t (sit-for 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
155
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
156 (defmacro w3-get-pad-string (len)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
157 (` (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
158 ((< (, len) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
159 "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
160 ((< (, len) 80)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
161 (aref w3-fill-prefixes-vector (, len)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
162 (t (make-string (, len) ? )))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
163
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
164 (defsubst w3-set-fill-prefix-length (len)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
165 (setq fill-prefix (if (< len (- (or w3-strict-width (window-width)) 4))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
166 (w3-get-pad-string len)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
167 (url-warn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
168 'html
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
169 "Runaway indentation! Too deep for window width!")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
170 fill-prefix)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
171
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
172 (defsubst w3-get-style-info (info node &optional default)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
173 (or (cdr-safe (assq info w3-display-css-properties)) default))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
174
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
175 (defun w3-decode-area-coords (str)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
176 (let (retval)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
177 (while (string-match "\\([ \t0-9]+\\),\\([ \t0-9]+\\)" str)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
178 (setq retval (cons (vector (string-to-int (match-string 1 str))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
179 (string-to-int (match-string 2 str))) retval)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
180 str (substring str (match-end 0) nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
181 (if (string-match "\\([0-9]+\\)" str)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
182 (setq retval (cons (vector (+ (aref (car retval) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
183 (string-to-int (match-string 1 str)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
184 (aref (car retval) 1)) retval)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
185 (nreverse retval)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
186
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
187 (defun w3-normalize-color (color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
188 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
189 ((valid-color-name-p color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
190 color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
191 ((valid-color-name-p (concat "#" color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
192 (concat "#" color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
193 ((string-match "[ \t\r\n]" color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
194 (w3-normalize-color
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
195 (mapconcat (function (lambda (x) (if (memq x '(?\t ?\r ?\n ? )) ""
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
196 (char-to-string x)))) color "")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
197 ((valid-color-name-p (font-normalize-color color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
198 (font-normalize-color color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
199 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
200 (w3-warn 'html (format "Bad color specification: %s" color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
201 nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
202
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
203 (defsubst w3-voice-for-element (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
204 (if (featurep 'emacspeak)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
205 (let (family gain left right pitch pitch-range stress richness voice)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
206 (setq family (w3-get-style-info 'voice-family node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
207 gain (w3-get-style-info 'gain node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
208 left (w3-get-style-info 'left-volume node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
209 right (w3-get-style-info 'right-volume node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
210 pitch (w3-get-style-info 'pitch node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
211 pitch-range (w3-get-style-info 'pitch-range node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
212 stress (w3-get-style-info 'stress node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
213 richness (w3-get-style-info 'richness node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
214 (if (or family gain left right pitch pitch-range stress richness)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
215 (setq voice (dtk-personality-from-speech-style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
216 (make-dtk-speech-style :family (or family 'paul)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
217 :gain (or gain 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
218 :left-volume (or left 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
219 :right-volume (or right 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
220 :average-pitch (or pitch 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
221 :pitch-range (or pitch-range 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
222 :stress (or stress 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
223 :richness (or richness 5))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
224 (setq voice nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
225 (or voice (car w3-active-voices)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
226
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
227 (defun w3-make-face-emacs19 (name &optional doc-string temporary)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
228 "Defines and returns a new FACE described by DOC-STRING.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
229 If the face already exists, it is unmodified.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
230 If TEMPORARY is non-nil, this face will cease to exist if not in use."
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
231 (make-face name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
232
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
233 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
234 ((not (fboundp 'make-face))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
235 (fset 'w3-make-face 'ignore))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
236 (w3-running-xemacs
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
237 (fset 'w3-make-face 'make-face))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
238 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
239 (fset 'w3-make-face 'w3-make-face-emacs19)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
240
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
241 (defsubst w3-face-for-element (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
242 (w3-get-all-face-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
243 (if (car w3-face-text-decoration)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
244 (set-font-style-by-keywords w3-face-font-spec
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
245 (car w3-face-text-decoration)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
246 (if w3-face-font-variant
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
247 (set-font-style-by-keywords w3-face-font-spec
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
248 (car w3-face-font-variant)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
249 (if w3-face-font-style
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
250 (set-font-style-by-keywords w3-face-font-spec
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
251 (car w3-face-font-style)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
252 (setq w3-face-descr (list w3-face-font-spec
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
253 (car w3-face-color)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
254 (car w3-face-background-color))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
255 w3-face-face (cdr-safe (assoc w3-face-descr w3-face-cache)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
256 (if (or w3-face-face (not (or (car w3-face-color)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
257 (car w3-face-background-color)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
258 w3-face-font-spec)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
259 nil ; Do nothing, we got it already
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
260 (setq w3-face-face
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
261 (w3-make-face (intern (format "w3-style-face-%05d" w3-face-index))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
262 "An Emacs-W3 face... don't edit by hand." t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
263 w3-face-index (1+ w3-face-index))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
264 (if w3-face-font-spec
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
265 (font-set-face-font w3-face-face w3-face-font-spec))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
266 (if (car w3-face-color)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
267 (font-set-face-foreground w3-face-face (car w3-face-color)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
268 (if (car w3-face-background-color)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
269 (font-set-face-background w3-face-face (car w3-face-background-color)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
270 ;;(set-face-background-pixmap w3-face-face w3-face-pixmap)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
271 (setq w3-face-cache (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
272 (cons w3-face-descr w3-face-face)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
273 w3-face-cache)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
274 w3-face-face)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
275
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
276 (defun w3-normalize-spaces (string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
277 ;; nuke spaces in the middle
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
278 (while (string-match "[ \t\r\n][ \r\t\n]+" string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
279 (setq string (concat (substring string 0 (1+ (match-beginning 0)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
280 (substring string (match-end 0)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
281
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
282 ;; nuke spaces at the beginning
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
283 (if (string-match "^[ \t\r\n]+" string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
284 (setq string (substring string (match-end 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
285
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
286 ;; nuke spaces at the end
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
287 (if (string-match "[ \t\n\r]+$" string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
288 (setq string (substring string 0 (match-beginning 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
289 string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
290
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
291
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
292 (defsubst w3-display-line-break (n)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
293 (if (or
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
294 (memq (car w3-display-whitespace-stack) '(pre nowrap)) ; Been told
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
295 (= w3-last-fill-pos (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
296 (> w3-last-fill-pos (point-max)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
297 (if (/= (preceding-char) ?\n) (setq n (1+ n))) ; at least put one line in
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
298 (let ((fill-column (max (1+ (length fill-prefix)) fill-column))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
299 width)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
300 (case (car w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
301 (center
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
302 (fill-region-as-paragraph w3-last-fill-pos (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
303 (center-region w3-last-fill-pos (point-max)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
304 ((justify full)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
305 (fill-region-as-paragraph w3-last-fill-pos (point) t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
306 (right
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
307 (fill-region-as-paragraph w3-last-fill-pos (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
308 (goto-char w3-last-fill-pos)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
309 (catch 'fill-exit
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
310 (while (re-search-forward ".$" nil t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
311 (if (>= (setq width (current-column)) fill-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
312 nil ; already justified, or error
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
313 (beginning-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
314 (insert-char ? (- fill-column width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
315 (end-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
316 (if (eobp)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
317 (throw 'fill-exit t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
318 (condition-case ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
319 (forward-char 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
320 (error (throw 'fill-exit t))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
321 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
322 (otherwise ; Default is left justification
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
323 (fill-region-as-paragraph w3-last-fill-pos (point)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
324 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
325 (setq n (1- n)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
326 (setq w3-last-fill-pos (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
327 (insert (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
328 ((<= n 0) "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
329 ((< n 10)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
330 (aref w3-line-breaks-vector n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
331 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
332 (make-string n ?\n)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
333
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
334 (defsubst w3-munge-line-breaks-p ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
335 (eq (car w3-display-whitespace-stack) 'pre))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
336
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
337 (defvar w3-display-nil-face (w3-make-face nil "Stub face... don't ask." t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
338
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
339 (defvar w3-scratch-start-point nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
340
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
341 (defsubst w3-handle-string-content (string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
342 (setq w3-scratch-start-point (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
343 (insert string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
344 (if (w3-munge-line-breaks-p)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
345 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
346 (goto-char w3-scratch-start-point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
347 (if (not (search-forward "\n" nil t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
348 (subst-char-in-region w3-scratch-start-point (point-max) ?\r ?\n)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
349 (subst-char-in-region w3-scratch-start-point (point-max) ?\r ? )))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
350 (goto-char w3-scratch-start-point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
351 (while (re-search-forward
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
352 " [ \t\n\r]+\\|[\t\n\r][ \t\n\r]*"
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
353 nil 'move)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
354 (replace-match " "))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
355 (goto-char w3-scratch-start-point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
356 (if (and (memq (preceding-char) '(? ?\t ?\r ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
357 (looking-at "[ \t\r\n]"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
358 (delete-region (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
359 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
360 (skip-chars-forward " \t\r\n")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
361 (point)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
362 (goto-char (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
363 (add-text-properties w3-scratch-start-point
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
364 (point) (list 'face w3-active-faces
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
365 'html-stack w3-display-open-element-stack
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
366 'start-open t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
367 'end-open t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
368 'rear-nonsticky t
22
8fc7fe29b841 Import from CVS: tag r19-15b94
cvs
parents: 20
diff changeset
369 'duplicable t))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
370 (if (car w3-active-voices)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
371 (add-text-properties w3-scratch-start-point (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
372 (list 'personality (car w3-active-voices))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
373 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
374
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
375 (defun w3-display-get-cookie (args)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
376 (if (not (fboundp 'cookie))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
377 "Sorry, no cookies today."
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
378 (let* ((href (or (w3-get-attribute 'href) (w3-get-attribute 'src)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
379 (fname (or (cdr-safe (assoc href w3-cookie-cache))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
380 (url-generate-unique-filename "%s.cki")))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
381 (st (or (cdr-safe (assq 'start args)) "Loading cookies..."))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
382 (nd (or (cdr-safe (assq 'end args)) "Loading cookies... done.")))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
383 (if (not (file-exists-p fname))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
384 (save-excursion
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
385 (set-buffer (generate-new-buffer " *cookie*"))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
386 (url-insert-file-contents href)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
387 (write-region (point-min) (point-max) fname 5)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
388 (setq w3-cookie-cache (cons (cons href fname) w3-cookie-cache))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
389 (cookie fname st nd))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
390
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
391 (defun w3-widget-echo (widget &rest ignore)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
392 (let ((url (widget-get widget 'href))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
393 (name (widget-get widget 'name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
394 (text (buffer-substring (widget-get widget :from)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
395 (widget-get widget :to)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
396 (title (widget-get widget 'title))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
397 (check w3-echo-link)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
398 (msg nil))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
399 (if url
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
400 (setq url (url-truncate-url-for-viewing url)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
401 (if name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
402 (setq name (concat "anchor:" name)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
403 (if (not (listp check))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
404 (setq check (cons check '(title url text name))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
405 (catch 'exit
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
406 (while check
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
407 (and (boundp (car check))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
408 (stringp (symbol-value (car check)))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
409 (> (length (symbol-value (car check))) 0)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
410 (throw 'exit (symbol-value (car check))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
411 (pop check)))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
412
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
413 (defun w3-follow-hyperlink (widget &rest ignore)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
414 (let* ((target (or (widget-get widget 'target)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
415 w3-base-target))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
416 (href (widget-get widget 'href)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
417 (if target (setq target (intern (downcase target))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
418 (case target
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
419 ((_blank external)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
420 (w3-fetch-other-frame href))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
421 (_top
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
422 (delete-other-windows)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
423 (w3-fetch href))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
424 (otherwise
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
425 (w3-fetch href target)))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
426
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
427 (defun w3-balloon-help-callback (object &optional event)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
428 (let* ((widget (widget-at (extent-start-position object)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
429 (href (and widget (widget-get widget 'href))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
430 (if href
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
431 (url-truncate-url-for-viewing href)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
432 nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
433
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
434
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
435 ;; Various macros
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
436 (eval-when-compile
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
437 (defmacro w3-handle-empty-tag ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
438 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
439 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
440 (push (cons tag args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
441 (push content content-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
442 (setq content nil))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
443
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
444 (defmacro w3-handle-content (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
445 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
446 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
447 (push (cons tag args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
448 (push content content-stack)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
449 (setq content (nth 2 (, node))))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
450
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
451 (defmacro w3-display-handle-list-type ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
452 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
453 (case (car break-style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
454 (list-item
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
455 (let ((list-style (w3-get-style-info 'list-style-type node))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
456 (list-num (if (car w3-display-list-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
457 (incf (car w3-display-list-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
458 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
459 (margin (1- (car left-margin-stack)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
460 (indent (w3-get-style-info 'text-indent node 0)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
461 (if (> indent 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
462 (setq margin (+ margin indent))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
463 (setq margin (max 0 (- margin indent))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
464 (beginning-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
465 (case list-style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
466 ((disc circle square)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
467 (insert (format (format "%%%dc" margin)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
468 (or (cdr-safe (assq list-style w3-bullets))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
469 ?o))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
470 ((decimal lower-roman upper-roman lower-alpha upper-alpha)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
471 (let ((x (case list-style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
472 (lower-roman
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
473 (w3-decimal-to-roman list-num))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
474 (upper-roman
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
475 (upcase
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
476 (w3-decimal-to-roman list-num)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
477 (lower-alpha
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
478 (w3-decimal-to-alpha list-num))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
479 (upper-alpha
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
480 (upcase
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
481 (w3-decimal-to-alpha list-num)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
482 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
483 (int-to-string list-num)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
484 (insert (format (format "%%%ds." margin) x))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
485 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
486 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
487 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
488 (insert (w3-get-pad-string margin)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
489 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
490 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
491 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
492 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
493 (insert (w3-get-pad-string (+ (car left-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
494 (w3-get-style-info 'text-indent node 0)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
495 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
496 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
497 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
498
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
499 (defmacro w3-display-set-margins ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
500 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
501 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
502 (push (+ (w3-get-style-info 'margin-left node 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
503 (car left-margin-stack)) left-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
504 (push (-
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
505 (car right-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
506 (w3-get-style-info 'margin-right node 0)) right-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
507 (setq fill-column (car right-margin-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
508 (w3-set-fill-prefix-length (car left-margin-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
509 (w3-display-handle-list-type))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
510
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
511 (defmacro w3-display-restore-margins ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
512 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
513 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
514 (pop right-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
515 (pop left-margin-stack))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
516
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
517 (defmacro w3-display-handle-break ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
518 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
519 (case (car break-style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
520 (block ; Full paragraph break
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
521 (if (eq (cadr break-style) 'list-item)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
522 (setf (cadr break-style) 'line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
523 (w3-display-line-break 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
524 (w3-display-set-margins)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
525 (push
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
526 (w3-get-style-info 'white-space node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
527 (car w3-display-whitespace-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
528 w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
529 (push
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
530 (or (w3-get-attribute 'align)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
531 (w3-get-style-info 'text-align node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
532 (car w3-display-alignment-stack)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
533 w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
534 (and w3-do-incremental-display (w3-pause)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
535 ((line list-item) ; Single line break
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
536 (w3-display-line-break 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
537 (w3-display-set-margins)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
538 (push
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
539 (w3-get-style-info 'white-space node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
540 (car w3-display-whitespace-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
541 w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
542 (push
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
543 (w3-get-style-info 'text-align node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
544 (or (w3-get-attribute 'align)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
545 (car w3-display-alignment-stack)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
546 w3-display-alignment-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
547 (otherwise ; Assume 'inline' rendering as default
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
548 nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
549 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
550 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
551
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
552 (defmacro w3-display-progress-meter ()
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
553 (`
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
554 (url-lazy-message "Drawing... %c" (aref "/|\\-" (random 4)))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
555
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
556 (defmacro w3-display-handle-end-break ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
557 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
558 (case (pop break-style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
559 (block ; Full paragraph break
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
560 (w3-display-line-break 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
561 (w3-display-restore-margins)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
562 (pop w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
563 (pop w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
564 (and w3-do-incremental-display (w3-pause)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
565 ((line list-item) ; Single line break
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
566 (w3-display-restore-margins)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
567 (w3-display-line-break 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
568 (pop w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
569 (pop w3-display-alignment-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
570 (otherwise ; Assume 'inline' rendering as default
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
571 nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
572 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
573 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
574 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
575
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
576 ;; <link> handling
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
577 (defun w3-parse-link (args)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
578 (let* ((type (if (w3-get-attribute 'rel) 'rel 'rev))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
579 (desc (w3-get-attribute type))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
580 (dc-desc (and desc (downcase desc))) ; canonical case
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
581 (dest (w3-get-attribute 'href))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
582 (plist (alist-to-plist args))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
583 (node-1 (assq type w3-current-links))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
584 (node-2 (and node-1 desc (or (assoc desc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
585 (cdr node-1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
586 (assoc dc-desc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
587 (cdr node-1)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
588 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
589 ;; Canonicalize the case of link types we may look for
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
590 ;; specifically (toolbar etc.) since that's done with
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
591 ;; assoc. See `w3-mail-document-author' and
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
592 ;; `w3-link-toolbar', at least.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
593 (if (member dc-desc w3-defined-link-types)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
594 (setq desc dc-desc))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
595 (if dest ; ignore if HREF missing
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
596 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
597 (node-2 ; Add to old value
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
598 (setcdr node-2 (cons plist (cdr node-2))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
599 (node-1 ; first rel/rev
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
600 (setcdr node-1 (cons (cons desc (list plist))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
601 (cdr node-1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
602 (t (setq w3-current-links
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
603 (cons (cons type (list (cons desc (list plist))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
604 w3-current-links)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
605 (setq desc (and desc (intern dc-desc)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
606 (case desc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
607 ((style stylesheet)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
608 (if w3-honor-stylesheets
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
609 (w3-handle-style plist)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
610 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
611 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
612 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
613 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
614 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
615
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
616
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
617 ;; Image handling
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
618 (defun w3-maybe-start-image-download (widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
619 (let* ((src (widget-get widget 'src))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
620 (cached-glyph (w3-image-cached-p src)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
621 (cond
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
622 ((and cached-glyph
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
623 (widget-glyphp cached-glyph)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
624 (not (eq 'nothing
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
625 (image-instance-type
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
626 (glyph-image-instance cached-glyph)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
627 (setq w3-image-widgets-waiting (cons widget w3-image-widgets-waiting)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
628 ((or w3-delay-image-loads ; Delaying images
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
629 (not (fboundp 'valid-specifier-domain-p)) ; Can't do images
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
630 (eq (device-type) 'tty)) ; Why bother?
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
631 (w3-add-delayed-graphic widget))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
632 ((not (w3-image-loadable-p src nil)) ; Hey, we can't load it!
22
8fc7fe29b841 Import from CVS: tag r19-15b94
cvs
parents: 20
diff changeset
633 (message "Skipping image %s" (url-basepath src t))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
634 (w3-add-delayed-graphic widget))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
635 (t ; Grab the images
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
636 (let (
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
637 (url-request-method "GET")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
638 (old-asynch url-be-asynchronous)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
639 (url-request-data nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
640 (url-request-extra-headers nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
641 (url-source t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
642 (url-mime-accept-string (substring
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
643 (mapconcat
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
644 (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
645 (lambda (x)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
646 (if x
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
647 (concat (car x) ",")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
648 "")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
649 w3-allowed-image-types "")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
650 0 -1))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
651 (url-working-buffer (generate-new-buffer-name " *W3GRAPH*")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
652 (setq-default url-be-asynchronous t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
653 (setq w3-graphics-list (cons (cons src (make-glyph))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
654 w3-graphics-list))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
655 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
656 (set-buffer (get-buffer-create url-working-buffer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
657 (setq url-current-callback-data (list widget)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
658 url-be-asynchronous t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
659 url-current-callback-func 'w3-finalize-image-download)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
660 (url-retrieve src))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
661 (setq-default url-be-asynchronous old-asynch))))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
662
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
663 (defun w3-finalize-image-download (widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
664 (let ((glyph nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
665 (url (widget-get widget 'src))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
666 (node nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
667 (buffer (widget-get widget 'buffer)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
668 (message "Enhancing image...")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
669 (setq glyph (image-normalize (cdr-safe (assoc url-current-mime-type
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
670 w3-image-mappings))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
671 (buffer-string)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
672 (message "Enhancing image... done")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
673 (kill-buffer (current-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
674 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
675 ((w3-image-invalid-glyph-p glyph)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
676 (setq glyph nil)
22
8fc7fe29b841 Import from CVS: tag r19-15b94
cvs
parents: 20
diff changeset
677 (message "Reading of %s failed." url))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
678 ((eq (aref glyph 0) 'xbm)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
679 (let ((temp-fname (url-generate-unique-filename "%s.xbm")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
680 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
681 (set-buffer (generate-new-buffer " *xbm-garbage*"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
682 (erase-buffer)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
683 (insert (aref glyph 2))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
684 (setq glyph temp-fname)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
685 (write-region (point-min) (point-max) temp-fname)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
686 (kill-buffer (current-buffer)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
687 (setq glyph (make-glyph (list (cons 'x glyph))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
688 (condition-case ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
689 (delete-file temp-fname)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
690 (error nil))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
691 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
692 (setq glyph (make-glyph glyph))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
693 (setq node (assoc url w3-graphics-list))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
694 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
695 ((and node glyph)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
696 (set-glyph-image (cdr node) (glyph-image glyph)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
697 (glyph
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
698 (setq w3-graphics-list (cons (cons url glyph) w3-graphics-list)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
699 (t nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
700
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
701 (if (and (buffer-name buffer) ; Dest. buffer exists
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
702 (widget-glyphp glyph)) ; got a valid glyph
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
703 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
704 (set-buffer buffer)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
705 (if (eq major-mode 'w3-mode)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
706 (widget-value-set widget glyph)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
707 (setq w3-image-widgets-waiting
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
708 (cons widget w3-image-widgets-waiting)))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
709
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
710 (defmacro w3-node-visible-p ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
711 (` (not (eq (car break-style) 'none))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
712
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
713 (defmacro w3-handle-image ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
714 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
715 (let* ((height (w3-get-attribute 'height))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
716 (width (w3-get-attribute 'width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
717 (src (or (w3-get-attribute 'src) "Error Image"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
718 (our-alt (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
719 ((null w3-auto-image-alt) "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
720 ((eq t w3-auto-image-alt)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
721 (concat "[IMAGE(" (url-basepath src t) ")] "))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
722 ((stringp w3-auto-image-alt)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
723 (format w3-auto-image-alt (url-basepath src t)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
724 (alt (or (w3-get-attribute 'alt) our-alt))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
725 (c nil)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
726 (ismap (and (assq 'ismap args) 'ismap))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
727 (usemap (w3-get-attribute 'usemap))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
728 (base (w3-get-attribute 'base))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
729 (href (and hyperlink-info (widget-get (cadr hyperlink-info) 'href)))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
730 (target (and hyperlink-info (widget-get (cadr hyperlink-info) 'target)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
731 (widget nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
732 (align (or (w3-get-attribute 'align)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
733 (w3-get-style-info 'vertical-align node))))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
734 (while (setq c (string-match "[\C-i\C-j\C-l\C-m]" alt))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
735 (aset alt c ? ))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
736 (if (assq '*table-autolayout w3-display-open-element-stack)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
737 (insert alt)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
738 (setq widget (widget-create 'image
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
739 :value-face w3-active-faces
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
740 'src src ; Where to load the image from
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
741 'alt alt ; Textual replacement
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
742 'ismap ismap ; Is it a server-side map?
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
743 'usemap usemap ; Is it a client-side map?
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
744 'href href ; Hyperlink destination
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
745 'target target
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
746 ))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
747 (widget-put widget 'buffer (current-buffer))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
748 (w3-maybe-start-image-download widget)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
749 (if (widget-get widget :from)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
750 (add-text-properties (widget-get widget :from)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
751 (widget-get widget :to)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
752 (list 'html-stack w3-display-open-element-stack)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
753 (goto-char (point-max))))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
754
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
755 ;; The table handling
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
756
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
757 (defvar w3-table-ascii-border-chars
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
758 [nil nil nil ?/ nil ?- ?\\ ?- nil ?\\ ?| ?| ?/ ?- ?| ?+]
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
759 "*Vector of ascii characters to use to draw table borders.
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
760 This vector is used when terminal characters are unavailable")
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
761
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
762 (defvar w3-table-glyph-border-chars
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
763 [nil nil nil 11 nil 2 7 14 nil 3 8 6 1 15 4 5]
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
764 "Vector of characters to use to draw table borders.
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
765 This vector is used when terminal characters are used via glyphs")
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
766
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
767 (defvar w3-table-graphic-border-chars
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
768 [nil nil nil ?j nil ?q ?m ?v nil ?k ?x ?u ?l ?w ?t ?n]
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
769 "Vector of characters to use to draw table borders.
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
770 This vector is used when terminal characters are used directly")
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
771
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
772 (defvar w3-table-border-chars w3-table-ascii-border-chars
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
773 "Vector of characters to use to draw table borders.
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
774 w3-setup-terminal-chars sets this to one of
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
775 w3-table-ascii-border-chars,
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
776 w3-table-glyph-border-chars, or
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
777 w3-table-graphic-border-chars.")
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
778
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
779 (defsubst w3-table-lookup-char (l u r b)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
780 (aref w3-table-border-chars (logior (if l 1 0)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
781 (if u 2 0)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
782 (if r 4 0)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
783 (if b 8 0))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
784
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
785 (defvar w3-terminal-properties nil)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
786
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
787 (defsubst w3-insert-terminal-char (character &optional count inherit)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
788 (if w3-terminal-properties
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
789 (set-text-properties (point)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
790 (progn
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
791 (insert-char (or character ? )
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
792 (or count 1) inherit)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
793 (point))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
794 w3-terminal-properties)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
795 (insert-char (or character ? ) (or count 1) inherit)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
796
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
797 (defsubst w3-horizontal-rule-char nil
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
798 (or w3-horizontal-rule-char (w3-table-lookup-char t nil t nil)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
799
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
800 (defun w3-setup-terminal-chars nil
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
801 "Try to find the best set of characters to draw table borders with.
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
802 On a console, this can trigger some Emacs display bugs.
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
803
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
804 Initializes a number of variables:
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
805 w3-terminal-properties to either nil or a list of properties including 'face
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
806 w3-table-border-chars to one of the the three other vectors"
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
807 (interactive)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
808 (setq w3-table-border-chars w3-table-ascii-border-chars
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
809 w3-terminal-properties nil)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
810 (cond
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
811 ((and w3-use-terminal-characters
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
812 (eq (device-type) 'x))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
813 (if (find-face 'w3-table-hack-x-face) nil
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
814 (make-face 'w3-table-hack-x-face)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
815 (font-set-face-font 'w3-table-hack-x-face
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
816 (make-font :family "terminal")))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
817 (cond
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
818 ((not (face-differs-from-default-p 'w3-table-hack-x-face))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
819 nil)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
820 ((and w3-use-terminal-glyphs (fboundp 'face-id))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
821 (let ((id (face-id 'w3-table-hack-x-face))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
822 (c (length w3-table-border-chars)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
823 (while (> (decf c) 0)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
824 (if (aref w3-table-glyph-border-chars c)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
825 (aset standard-display-table (aref w3-table-glyph-border-chars c)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
826 (vector (+ (* 256 id)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
827 (aref w3-table-graphic-border-chars c))))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
828 (setq w3-table-border-chars w3-table-glyph-border-chars
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
829 w3-terminal-properties nil)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
830 (t
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
831 (setq w3-table-border-chars w3-table-graphic-border-chars
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
832 w3-terminal-properties (list 'start-open t
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
833 'end-open t
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
834 'rear-nonsticky t
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
835 'w3-table-border t
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
836 'face 'w3-table-hack-x-face)))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
837 ((and w3-use-terminal-characters-on-tty
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
838 (eq (device-type) 'tty))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
839 (let ((c (length w3-table-border-chars)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
840 (while (> (decf c) 0)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
841 (and (aref w3-table-glyph-border-chars c)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
842 (aref w3-table-graphic-border-chars c)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
843 (standard-display-g1 (aref w3-table-glyph-border-chars c)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
844 (aref w3-table-graphic-border-chars c)))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
845 (setq w3-table-border-chars w3-table-glyph-border-chars
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
846 w3-terminal-properties (list 'w3-table-border t)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
847 (t
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
848 nil))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
849 w3-table-border-chars)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
850
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
851 (defun w3-unsetup-terminal-characters nil
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
852 (interactive)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
853 (w3-excise-terminal-characters (buffer-list))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
854 (standard-display-default 1 15)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
855 (setq w3-table-border-chars w3-table-ascii-border-chars))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
856
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
857 (defun w3-excise-terminal-characters (buffs)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
858 "Replace hacked characters with ascii characters in buffers BUFFS.
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
859 Should be run before restoring w3-table-border-chars to ascii characters.
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
860 This will only work if we used glyphs rather than text properties"
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
861 (interactive (list (list (current-buffer))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
862 (let ((inhibit-read-only t)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
863 (tr (make-string 16 ? ))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
864 (i 0))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
865 (while (< i (length tr))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
866 (aset tr i i)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
867 (setq i (1+ i)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
868 (setq i 0)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
869 (while (< i (length w3-table-border-chars))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
870 (and (aref w3-table-border-chars i)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
871 (< (aref w3-table-border-chars i) 16)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
872 (aset tr
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
873 (aref w3-table-glyph-border-chars i)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
874 (aref w3-table-ascii-border-chars i)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
875 (setq i (1+ i)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
876 (mapcar (function (lambda (buf)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
877 (save-excursion
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
878 (set-buffer buf)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
879 (if (eq major-mode 'w3-mode)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
880 (translate-region (point-min)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
881 (point-max)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
882 tr)))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
883 buffs)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
884
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
885
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
886 (defvar w3-display-table-cut-words-p nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
887 "*Whether to cut words that are oversized in table cells")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
888
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
889 (defvar w3-display-table-force-borders nil
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
890 "*Whether to always draw table borders
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
891 Can sometimes make the structure of a document clearer")
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
892
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
893 (defun w3-display-table-cut ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
894 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
895 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
896 (let ((offset -1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
897 (while (< offset 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
898 (end-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
899 (setq offset (- fill-column (current-column)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
900 (cond ((< offset 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
901 (condition-case nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
902 (progn (forward-char offset)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
903 (insert ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
904 (error (setq offset 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
905 ((not (eobp))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
906 (forward-line 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
907 (setq offset -1)))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
908
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
909
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
910 (defun w3-display-fix-widgets ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
911 ;; Make markers belong to the right buffer
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
912 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
913 (let ((st (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
914 (nd nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
915 (widget nil) parent
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
916 (to-marker nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
917 (from-marker nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
918 (while (setq st (next-single-property-change st 'button))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
919 (setq nd (or (next-single-property-change st 'button) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
920 widget (widget-at st)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
921 to-marker (and widget (widget-get widget :to))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
922 from-marker (and widget (widget-get widget :from))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
923 parent (and widget (widget-get widget :parent))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
924 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
925 (if (not widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
926 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
927 (widget-put widget :from (set-marker (make-marker) st))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
928 (widget-put widget :to (set-marker (make-marker) nd))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
929 (if (not parent)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
930 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
931 (widget-put parent :from (set-marker (make-marker) st))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
932 (widget-put parent :to (set-marker (make-marker) nd))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
933 (if (condition-case ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
934 (get-text-property (1+ nd) 'button)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
935 (error nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
936 (setq st nd)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
937 (setq st (min (point-max) (1+ nd))))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
938
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
939 (defun w3-size-of-tree (tree minmax)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
940 (declare (special args))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
941 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
942 (save-restriction
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
943 (narrow-to-region (point) (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
944 ;; XXX fill-column set to 1 fails when fill-prefix is set
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
945 ;; XXX setting fill-column at all isn't really right
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
946 ;; for example <hr>s shouldn't be especially wide
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
947 ;; we should set a flag that makes w3 never wrap a line
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
948 (let ((fill-column (cond ((eq minmax 'min)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
949 3)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
950 ((eq minmax 'max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
951 400)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
952 (fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
953 (w3-last-fill-pos (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
954 a retval
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
955 (w3-do-incremental-display nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
956 (hr-regexp (concat "^"
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
957 (regexp-quote
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
958 (make-string 5 (w3-horizontal-rule-char)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
959 "*$"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
960 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
961 ;;(push 'left w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
962 (push (if (eq minmax 'max) 'nowrap) w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
963 (while tree
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
964 (push (cons '*td args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
965 (w3-display-node (pop tree)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
966 (pop w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
967 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
968 (while (re-search-forward hr-regexp nil t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
969 (replace-match "" t t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
970 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
971 (while (not (eobp))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
972 ;; loop invariant: at beginning of uncounted line
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
973 (end-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
974 (skip-chars-backward " ")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
975 (setq retval (cons (current-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
976 retval))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
977 (beginning-of-line 2))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
978 (if (= (point-min) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
979 (setq retval 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
980 (setq retval (apply 'max (cons 0 retval))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
981 (delete-region (point-min) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
982 retval))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
983
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
984 (defun w3-display-table-dimensions (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
985 ;; fill-column sets maximum width
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
986 (declare (special args))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
987 (let (min-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
988 max-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
989 rows cols
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
990 ;;(w3-form-elements (and (boundp 'w3-form-elements) w3-form-elements))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
991 (table-info (assq 'w3-table-info (cadr node))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
992
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
993 (if table-info
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
994 (setq min-vector (nth 1 table-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
995 max-vector (nth 2 table-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
996 rows (nth 3 table-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
997 cols (nth 4 table-info))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
998
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
999 (push (cons '*table-autolayout args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1000 (let (content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1001 cur
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1002 (table-spans (list nil)) ; don't make this '(nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1003 ptr
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1004 col
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1005 constraints
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1006
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1007 colspan rowspan min max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1008 (setq content (nth 2 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1009 (setq rows 0 cols 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1010 (while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1011 (setq cur (pop content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1012 (if (stringp cur)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1013 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1014 (case (car cur)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1015 (tr
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1016 (setq col 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1017 (setq rows (1+ rows))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1018 (setq ptr table-spans)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1019 (mapcar
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1020 (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1021 (lambda (td)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1022 (setq colspan (string-to-int (or (cdr-safe (assq 'colspan (nth 1 td))) "1"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1023 rowspan (string-to-int (or (cdr-safe (assq 'rowspan (nth 1 td))) "1"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1024 min (w3-size-of-tree (nth 2 td) 'min)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1025 max (w3-size-of-tree (nth 2 td) 'max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1026 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1027 (while (eq (car-safe (car-safe (cdr ptr))) col)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1028 (setq col (+ col (cdr (cdr (car (cdr ptr))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1029 (if (= 0 (decf (car (cdr (car (cdr ptr))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1030 (pop (cdr ptr))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1031 (setq ptr (cdr ptr))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1032 (push (list col colspan min max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1033 constraints)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1034 (if (= rowspan 1) nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1035 (push (cons col (cons (1- rowspan) colspan)) (cdr ptr))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1036 (setq ptr (cdr ptr)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1037 (setq col (+ col colspan))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1038 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1039 (nth 2 cur))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1040 (while (cdr ptr)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1041 (if (= 0 (decf (car (cdr (car (cdr ptr))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1042 (pop (cdr ptr))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1043 (setq ptr (cdr ptr))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1044 (setq cols (max cols col))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1045 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1046 (caption
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1047 nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1048 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1049 (setq content (nth 2 cur)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1050 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1051 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1052 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1053 (setq constraints (sort constraints
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1054 (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1055 (lambda (a b)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1056 (< (cadr a) (cadr b)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1057 min-vector (make-vector cols 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1058 max-vector (make-vector cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1059 (let (start end i mincellwidth maxcellwidth)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1060 (mapcar (function (lambda (c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1061 (cond ((= (cadr c) 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1062 (aset min-vector (car c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1063 (max (aref min-vector (car c))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1064 (nth 2 c)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1065 (aset max-vector (car c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1066 (max (aref max-vector (car c))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1067 (nth 3 c))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1068 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1069 (setq start (car c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1070 end (+ (car c) (cadr c))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1071 mincellwidth 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1072 maxcellwidth 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1073 i start)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1074 (while (< i end)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1075 (setq mincellwidth (+ mincellwidth
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1076 (aref min-vector i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1077 maxcellwidth (+
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1078 maxcellwidth
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1079 (aref max-vector i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1080 i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1081 (setq i start)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1082 (if (= mincellwidth 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1083 ;; if existing width is 0 divide evenly
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1084 (while (< i end)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1085 (aset min-vector i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1086 (/ (nth 2 c) (cadr c)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1087 (aset max-vector i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1088 (/ (nth 3 c) (cadr c)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1089 (setq i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1090 ;; otherwise weight it by existing widths
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1091 (while (< i end)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1092 (aset min-vector i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1093 (max (aref min-vector i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1094 (/ (* (nth 2 c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1095 (aref min-vector i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1096 mincellwidth)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1097 (aset max-vector i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1098 (max (aref max-vector i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1099 (/ (* (nth 3 c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1100 (aref max-vector i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1101 maxcellwidth)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1102 (setq i (1+ i))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1103 ))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1104 constraints)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1105 (push (cons 'w3-table-info
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1106 (list min-vector max-vector rows cols))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1107 (cadr node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1108 (pop w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1109
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1110 (let (max-width
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1111 min-width
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1112 ret-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1113 col
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1114 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1115
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1116
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1117 (setq max-width (apply '+ (append max-vector (list cols 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1118 (setq min-width (apply '+ (append min-vector (list cols 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1119
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1120 ;; the comments in the cond are excerpts from rfc1942 itself
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1121 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1122 ;; 1. The minimum table width is equal to or wider than the available
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1123 ;; space. In this case, assign the minimum widths and allow the
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1124 ;; user to scroll horizontally. For conversion to braille, it will
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1125 ;; be necessary to replace the cells by references to notes
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1126 ;; containing their full content. By convention these appear
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1127 ;; before the table.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1128 ((>= min-width fill-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1129 (setq ret-vector min-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1130
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1131 ;; 2. The maximum table width fits within the available space. In
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1132 ;; this case, set the columns to their maximum widths.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1133 ((<= max-width fill-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1134 (setq ret-vector max-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1135
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1136 ;; 3. The maximum width of the table is greater than the available
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1137 ;; space, but the minimum table width is smaller. In this case,
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1138 ;; find the difference between the available space and the minimum
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1139 ;; table width, lets call it W. Lets also call D the difference
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1140 ;; between maximum and minimum width of the table.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1141
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1142 ;; For each column, let d be the difference between maximum and
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1143 ;; minimum width of that column. Now set the column's width to the
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1144 ;; minimum width plus d times W over D. This makes columns with
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1145 ;; large differences between minimum and maximum widths wider than
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1146 ;; columns with smaller differences.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1147 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1148 (setq ret-vector (make-vector cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1149 (let ((W (- fill-column min-width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1150 (D (- max-width min-width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1151 d extra)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1152 (setq col 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1153 (while (< col (length ret-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1154 (setq d (- (aref max-vector col)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1155 (aref min-vector col)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1156 (aset ret-vector col
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1157 (+ (aref min-vector col)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1158 (/ (* d W) D)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1159 (setq col (1+ col)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1160 (setq extra (- fill-column
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1161 (apply '+ (append ret-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1162 (list (length ret-vector) 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1163 col 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1164 (while (and (< col (length ret-vector)) (> extra 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1165 (if (= 1 (- (aref max-vector col) (aref ret-vector col) ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1166 (aset ret-vector col (1+ (aref ret-vector col))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1167 (setq extra (1- extra)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1168 col (1+ col)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1169 )))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1170 (list rows cols ret-vector))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1171
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1172 (defun w3-display-table (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1173 (let* ((dimensions (w3-display-table-dimensions node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1174 (num-cols (max (cadr dimensions) 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1175 (num-rows (max (car dimensions) 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1176 (column-dimensions (caddr dimensions))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1177 (table-width (apply '+ (append column-dimensions (list num-cols 1)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1178 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1179 ((or (<= (cadr dimensions) 0) (<= (car dimensions) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1180 ;; We have an invalid table
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1181 nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1182 ((assq '*table-autolayout w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1183 ;; don't bother displaying the table if all we really need is the size
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1184 (progn (insert-char ?T table-width) (insert "\n")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1185 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1186 (let* ((tag (nth 0 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1187 (args (nth 1 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1188 (border-node (cdr-safe (assq 'border args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1189 (border (or w3-display-table-force-borders
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1190 (and border-node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1191 (or (/= 0 (string-to-int border-node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1192 (string= "border" border-node)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1193 (w3-table-border-chars
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1194 (if border
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1195 w3-table-border-chars
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1196 (make-vector (length w3-table-border-chars) ? )))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1197 valign align
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1198 (content (nth 2 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1199 (avgwidth (/ (- fill-column num-cols num-cols) num-cols))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1200 (formatted-cols (make-vector num-cols nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1201 (table-rowspans (make-vector num-cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1202 (table-colspans (make-vector num-cols 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1203 (prev-colspans (make-vector num-cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1204 (prev-rowspans (make-vector num-cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1205 (table-colwidth (make-vector num-cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1206 (fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1207 (height nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1208 (cur-height nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1209 (cols nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1210 (rows nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1211 (row 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1212 (this-rectangle nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1213 (i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1214 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1215
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1216 (push (cons tag args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1217
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1218 (if (memq 'nowrap w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1219 (setq fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1220 (case (car w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1221 (center
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1222 (w3-set-fill-prefix-length
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1223 (max 0 (/ (- fill-column table-width) 2))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1224 (right
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1225 (w3-set-fill-prefix-length
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1226 (max 0 (- fill-column table-width))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1227 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1228 (setq fill-prefix ""))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1229 (while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1230 (case (caar content)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1231 (tr
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1232 (setq w3-display-css-properties (css-get
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1233 (nth 0 (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1234 (nth 1 (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1235 w3-current-stylesheet
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1236 w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1237 (setq cols (nth 2 (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1238 valign (or (cdr-safe (assq 'valign (nth 1 (car content))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1239 (w3-get-style-info 'vertical-align node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1240 align (or (cdr-safe (assq 'align (nth 1 (car content))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1241 (w3-get-style-info 'text-align node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1242 content (cdr content)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1243 row (1+ row))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1244 (if (and valign (stringp valign))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1245 (setq valign (intern (downcase valign))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1246 ;; this is iffy
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1247 ;;(if align (push (intern (downcase align)) w3-display-alignment-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1248 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1249 (save-restriction
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1250 (narrow-to-region (point) (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1251 (setq fill-column avgwidth
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1252 inhibit-read-only t
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1253 w3-last-fill-pos (point-min)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1254 i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1255 ;; skip over columns that have leftover content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1256 (while (and (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1257 (/= 0 (aref table-rowspans i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1258 (setq i (+ i (max 1 (aref table-colspans i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1259 (while cols
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1260 (let* ((node (car cols))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1261 (attributes (nth 1 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1262 (colspan (string-to-int
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1263 (or (cdr-safe (assq 'colspan attributes))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1264 "1")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1265 (rowspan (string-to-int
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1266 (or (cdr-safe (assq 'rowspan attributes))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1267 "1")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1268 fill-column column-width
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1269 (fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1270 (w3-do-incremental-display nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1271 (indent-tabs-mode nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1272 c e
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1273 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1274
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1275 (aset table-colspans i colspan)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1276 (aset table-rowspans i rowspan)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1277
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1278 (setq fill-column 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1279 (setq c i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1280 e (+ i colspan))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1281 (while (< c e)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1282 (setq fill-column (+ fill-column
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1283 (aref column-dimensions c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1284 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1285 c (1+ c)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1286 (setq fill-column (1- fill-column))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1287 (aset table-colwidth i fill-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1288
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1289 (setq w3-last-fill-pos (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1290 (push (cons (nth 0 node) (nth 1 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1291 w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1292 (w3-display-node node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1293 (setq fill-column (aref table-colwidth i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1294 (if w3-display-table-cut-words-p
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1295 (w3-display-table-cut))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1296 (setq cols (cdr cols))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1297 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1298 (skip-chars-forward "\t\n\r")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1299 (beginning-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1300 (delete-region (point-min) (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1301 (goto-char (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1302 (skip-chars-backward " \t\n\r")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1303 (delete-region (point) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1304 (if (>= fill-column (current-column))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1305 (insert-char ? (- fill-column (current-column))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1306 (aset formatted-cols i (extract-rectangle (point-min) (point-max)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1307 (delete-region (point-min) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1308 (let ((j (1- colspan)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1309 (while (> j 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1310 (aset table-colspans (+ i j) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1311 (setq j (1- j))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1312 (setq i (+ i colspan))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1313 ;; skip over columns that have leftover content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1314 (while (and (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1315 (/= 0 (aref table-rowspans i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1316 (setq i (+ i (max 1 (aref table-colspans i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1317 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1318
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1319 ;; finish off the columns
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1320 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1321 (aset table-colwidth i (aref column-dimensions i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1322 (aset table-colspans i 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1323 (setq i (1+ i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1324 (while (and (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1325 (/= 0 (aref table-rowspans i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1326 (setq i (+ i (max 1 (aref table-colspans i))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1327
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1328 ;; on the last row empty any pending rowspans per the rfc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1329 (if content nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1330 (fillarray table-rowspans 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1331
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1332 ;; Find the tallest rectangle that isn't a rowspanning cell
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1333 (setq height 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1334 i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1335 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1336 (if (= 1 (aref table-rowspans i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1337 (setq height (max height (length (aref formatted-cols i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1338 (setq i (+ i (max 1 (aref table-colspans i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1339
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1340 ;; Make all rectangles the same height
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1341 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1342 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1343 (setq this-rectangle (aref formatted-cols i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1344 (if (> height (length this-rectangle))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1345 (let ((colspan-fill-line
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
1346 (make-string (abs (aref table-colwidth i)) ? )))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1347 (case valign
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1348 ((center middle)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1349 (aset formatted-cols i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1350 (append (make-list (/ (- height (length this-rectangle)) 2)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1351 colspan-fill-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1352 this-rectangle)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1353 (bottom
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1354 (aset formatted-cols i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1355 (append (make-list (- height (length this-rectangle))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1356 colspan-fill-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1357 this-rectangle))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1358 (setq i (+ i (max 1 (aref table-colspans i)))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1359
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1360
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1361 ;; fix broken colspans (this should only matter on illegal tables)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1362 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1363 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1364 (if (= (aref table-colspans i) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1365 (aset table-colspans i 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1366 (setq i (+ i (aref table-colspans i))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1367
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1368 ;; Insert a separator
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1369 (insert fill-prefix)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1370 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1371 (let (rflag bflag tflag lflag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1372 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1373
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1374 (setq rflag (= (aref prev-rowspans i) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1375 (setq bflag (/= (aref table-colspans i) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1376 (setq tflag (/= (aref prev-colspans i) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1377
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1378 (w3-insert-terminal-char (w3-table-lookup-char lflag tflag rflag bflag))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1379 (setq lflag t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1380 (cond ((= (aref prev-rowspans i) 0)
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1381 (w3-insert-terminal-char
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1382 (w3-table-lookup-char t nil t nil)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1383 (aref column-dimensions i))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1384 (setq i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1385 ((car (aref formatted-cols i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1386 (insert (pop (aref formatted-cols i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1387 (setq lflag nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1388 (setq i (+ i (max (aref table-colspans i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1389 (aref prev-colspans i) 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1390 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1391 (insert-char ? (aref table-colwidth i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1392 (setq lflag nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1393 (setq i (+ i (max (aref table-colspans i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1394 (aref prev-colspans i) 1))))))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1395 (w3-insert-terminal-char (w3-table-lookup-char lflag (/= row 1) nil t))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1396 (insert "\n"))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1397
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1398 ;; recalculate height (in case we've shortened a rowspanning cell
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1399 (setq height 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1400 i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1401 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1402 (if (= 1 (aref table-rowspans i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1403 (setq height (max height (length (aref formatted-cols i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1404 (setq i (+ i (max 1 (aref table-colspans i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1405
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1406 ;; Insert a row back in original buffer
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1407 (while (> height 0)
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1408 (insert fill-prefix)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1409 (w3-insert-terminal-char (w3-table-lookup-char nil t nil t))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1410 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1411 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1412 (if (car (aref formatted-cols i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1413 (insert (pop (aref formatted-cols i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1414 (insert-char ? (aref table-colwidth i)))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1415 (w3-insert-terminal-char (w3-table-lookup-char nil t nil t))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1416 (setq i (+ i (max (aref table-colspans i) 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1417 (insert "\n")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1418 ;;(and w3-do-incremental-display (w3-pause))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1419 (setq height (1- height)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1420
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1421 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1422 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1423 (if (> (aref table-rowspans i) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1424 (decf (aref table-rowspans i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1425 (incf i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1426
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1427 (setq prev-rowspans (copy-seq table-rowspans))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1428 (setq prev-colspans (copy-seq table-colspans))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1429
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1430 (and w3-do-incremental-display (w3-pause))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1431
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1432 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1433 (caption
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1434 (let ((left (length fill-prefix))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1435 (fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1436 (fill-column table-width)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1437 (start (point)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1438 (w3-display-node (pop content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1439 (indent-rigidly start (point) left)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1440 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1441 (delete-horizontal-space)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1442 (setq content (nth 2 (car content))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1443 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1444 (if (= (length column-dimensions) 0) nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1445 (insert fill-prefix)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1446 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1447 (let (tflag lflag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1448 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1449 (setq tflag (/= (aref prev-colspans i) 0))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1450 (w3-insert-terminal-char (w3-table-lookup-char lflag tflag t nil))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1451 (setq lflag t)
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1452 (w3-insert-terminal-char
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1453 (w3-table-lookup-char t nil t nil)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1454 (aref column-dimensions i))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1455 (setq i (1+ i)))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1456 (w3-insert-terminal-char
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1457 (w3-table-lookup-char t t nil nil))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1458 (insert "\n")))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1459 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1460 (pop w3-display-open-element-stack)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1461
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1462
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1463
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1464 (defun w3-display-create-unique-id ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1465 (let* ((date (current-time-string))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1466 (dateinfo (and date (timezone-parse-date date)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1467 (timeinfo (and date (timezone-parse-time (aref dateinfo 3)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1468 (if (and dateinfo timeinfo)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1469 (concat (aref dateinfo 0) ; Year
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1470 (aref dateinfo 1) ; Month
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1471 (aref dateinfo 2) ; Day
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1472 (aref timeinfo 0) ; Hour
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1473 (aref timeinfo 1) ; Minute
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1474 (aref timeinfo 2) ; Second
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1475 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1476 "HoplesSLYCoNfUSED")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1477
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1478 (defun w3-display-chop-into-table (node cols)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1479 ;; Chop the content of 'node' up into 'cols' columns suitable for inclusion
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1480 ;; as the content of a table
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1481 (let ((content (nth 2 node))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1482 (items nil)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1483 (rows nil))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1484 (setq cols (max cols 1))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1485 (while content
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1486 (push (list 'td nil (list (pop content))) items)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1487 (if (= (length items) cols)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1488 (setq rows (cons (nreverse items) rows)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1489 items nil)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1490 (if items ; Store any leftovers
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1491 (setq rows (cons (nreverse items) rows)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1492 items nil))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1493 (while rows
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1494 (push (list 'tr nil (pop rows)) items))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1495 items))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1496
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1497 (defun w3-display-normalize-form-info (args)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1498 (let* ((plist (alist-to-plist args))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1499 (type (intern (downcase
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1500 (or (plist-get plist 'type) "text"))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1501 (name (plist-get plist 'name))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1502 (value (or (plist-get plist 'value) ""))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1503 (size (if (plist-get plist 'size)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1504 (string-to-int (plist-get plist 'size))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1505 (maxlength (if (plist-get plist 'maxlength)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1506 (string-to-int
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1507 (plist-get plist 'maxlength))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1508 (default value)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1509 (checked (assq 'checked args)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1510 (if (memq type '(checkbox radio)) (setq default checked))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1511 (if (and (eq type 'checkbox) (string= value ""))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1512 (setq value "on"))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1513 (if (and (not (memq type '(submit reset button)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1514 (not name))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1515 (setq name (symbol-name type)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1516 (while (and name (string-match "[\r\n]+" name))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1517 (setq name (concat (substring name 0 (match-beginning 0))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1518 (substring name (match-end 0) nil))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1519 (setq plist (plist-put plist 'type type)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1520 plist (plist-put plist 'name name)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1521 plist (plist-put plist 'value value)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1522 plist (plist-put plist 'size size)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1523 plist (plist-put plist 'default default)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1524 plist (plist-put plist 'internal-form-number w3-current-form-number)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1525 plist (plist-put plist 'action w3-display-form-id)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1526 plist (plist-put plist 'maxlength maxlength))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1527 plist))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1528
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1529 (defun w3-display-node (node &optional nofaces)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1530 (let (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1531 (content-stack (list (list node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1532 (right-margin-stack (list fill-column))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1533 (left-margin-stack (list 0))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1534 (inhibit-read-only t)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1535 (widget-push-button-gui nil)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1536 node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1537 insert-before
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1538 insert-after
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1539 tag
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1540 args
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1541 content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1542 hyperlink-info
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1543 break-style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1544 cur
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1545 id
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1546 class
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1547 last-element
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1548 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1549 (while content-stack
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1550 (setq content (pop content-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1551 (pop w3-active-faces)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1552 (pop w3-active-voices)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1553 (w3-display-progress-meter)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1554 (setq last-element (pop w3-display-open-element-stack))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1555 (case (car last-element)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1556 ;; Any weird, post-display-of-content stuff for specific tags
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1557 ;; goes here. Couldn't think of any better way to do this when we
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1558 ;; are iterative. *sigh*
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1559 (a
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1560 (if (not hyperlink-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1561 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1562 (add-text-properties (car hyperlink-info) (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1563 (list
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1564 'mouse-face 'highlight
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1565 'duplicable t
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1566 'start-open t
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1567 'end-open t
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1568 'rear-nonsticky t
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1569 'help-echo 'w3-balloon-help-callback
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1570 'balloon-help 'w3-balloon-help-callback))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1571 (fillin-text-property (car hyperlink-info) (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1572 'button 'button (cadr hyperlink-info))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1573 (widget-put (cadr hyperlink-info) :to (set-marker
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1574 (make-marker) (point))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1575 (setq hyperlink-info nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1576 ((ol ul dl dir menu)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1577 (pop w3-display-list-stack))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1578 (label
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1579 (if (and (markerp w3-display-label-marker)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1580 (marker-position w3-display-label-marker)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1581 (marker-buffer w3-display-label-marker))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1582 (push (cons (or (cdr-safe (assq 'for (cdr last-element)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1583 (cdr-safe (assq 'id (cdr last-element)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1584 "unknown")
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1585 (buffer-substring w3-display-label-marker (point)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1586 w3-form-labels)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1587 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1588 nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1589 (if (car insert-after)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1590 (w3-handle-string-content (car insert-after)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1591 (pop insert-after)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1592 (w3-display-handle-end-break)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1593 (w3-pop-all-face-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1594 ;; Handle the element's content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1595 (while content
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1596 (w3-display-progress-meter)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1597 (if (stringp (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1598 (w3-handle-string-content (pop content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1599 (setq node (pop content)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1600 tag (nth 0 node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1601 args (nth 1 node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1602 id (or (w3-get-attribute 'name)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1603 (w3-get-attribute 'id))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1604 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1605 ;; This little bit of magic takes care of inline styles.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1606 ;; Evil Evil Evil, but it appears to work.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1607 (if (w3-get-attribute 'style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1608 (let ((unique-id (or (w3-get-attribute 'id)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1609 (w3-display-create-unique-id)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1610 (sheet "")
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1611 (class (assq 'class args)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1612 (setq sheet (format "%s.%s { %s }\n" tag unique-id
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1613 (w3-get-attribute 'style)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1614 (if class
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1615 (setcdr class (cons unique-id (cdr class)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1616 (setf (nth 1 node) (cons (cons 'class (list unique-id))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1617 (nth 1 node))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1618 (setf (nth 1 node) (cons (cons 'id unique-id) (nth 1 node)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1619 (w3-handle-style (list 'data sheet
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1620 'notation "css"))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1621 (setq w3-display-css-properties (css-get
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1622 (nth 0 node)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1623 (nth 1 node)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1624 w3-current-stylesheet
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1625 w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1626 (if nofaces
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1627 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1628 (push (w3-face-for-element node) w3-active-faces)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1629 (push (w3-voice-for-element node) w3-active-voices))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1630 (push (w3-get-style-info 'display node) break-style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1631 (push (w3-get-style-info 'insert-after node) insert-after)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1632 (setq insert-before (w3-get-style-info 'insert-before node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1633 (w3-display-handle-break)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1634 (if (w3-node-visible-p)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1635 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1636 (setq insert-before nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1637 tag '*invisible)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1638 (setcar insert-after nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1639 (if insert-before
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1640 (w3-handle-string-content insert-before))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1641 (setq insert-before nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1642 (if id
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1643 (setq w3-id-positions (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1644 (cons (intern id)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1645 (set-marker (make-marker)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1646 (point-max)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1647 w3-id-positions)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1648 (case tag
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1649 (a ; Hyperlinks
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1650 (let* (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1651 (title (w3-get-attribute 'title))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1652 (name (or (w3-get-attribute 'id)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1653 (w3-get-attribute 'name)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1654 (btdt nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1655 class
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1656 (before nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1657 (after nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1658 (face nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1659 (voice nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1660 (st nil))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1661 (if (w3-get-attribute 'href)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1662 (setq st (point)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1663 hyperlink-info (list
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1664 st
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1665 (append
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1666 (list 'link :args nil
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1667 :value "" :tag ""
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1668 :action 'w3-follow-hyperlink
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1669 :from (set-marker
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1670 (make-marker) st)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1671 :help-echo 'w3-widget-echo
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1672 :emacspeak-help 'w3-widget-echo
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1673 )
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1674 (alist-to-plist args)))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1675 (w3-handle-content node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1676 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1677 )
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1678 ((ol ul dl menu)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1679 (push (if (w3-get-attribute 'seqnum)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1680 (1- (string-to-int (w3-get-attribute 'seqnum)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1681 0) w3-display-list-stack)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1682 (w3-handle-content node))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1683 (dir
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1684 (push 0 w3-display-list-stack)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1685 (setq node
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1686 (list tag args
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1687 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1688 (list 'table nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1689 (w3-display-chop-into-table node 3)))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1690 (w3-handle-content node))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1691 (multicol
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1692 (setq node (list tag args
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1693 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1694 (list 'table nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1695 (w3-display-chop-into-table node 2)))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1696 (w3-handle-content node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1697 (img ; inlined image
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1698 (w3-handle-image)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1699 (w3-handle-empty-tag))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1700 (frameset
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1701 (if w3-display-frames
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1702 (progn
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1703 (push (list 'frameset
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1704 (or (assq 'cols args) (assq 'rows args)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1705 w3-frameset-structure)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1706 (w3-handle-content node))
32
e04119814345 Import from CVS: tag r19-15b99
cvs
parents: 30
diff changeset
1707 (w3-handle-content node)))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1708 (frame
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1709 (if w3-display-frames
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1710 (let* ((href (or (w3-get-attribute 'src)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1711 (w3-get-attribute 'href)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1712 (name (or (w3-get-attribute 'name)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1713 (w3-get-attribute 'title)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1714 (w3-get-attribute 'alt)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1715 "Unknown frame name")))
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1716 (push (list 'frame name href) w3-frameset-structure)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1717 (w3-handle-content
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1718 (list tag args
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1719 (list
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1720 (list 'p nil
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1721 (list
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1722 (list 'a
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1723 (cons (cons 'href href)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1724 args)
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1725 (list "Fetch frame: " name))))))))
32
e04119814345 Import from CVS: tag r19-15b99
cvs
parents: 30
diff changeset
1726 (w3-handle-empty-tag)))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1727 (noframes
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1728 (if w3-display-frames
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1729 (w3-handle-empty-tag)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1730 (w3-handle-content node)))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1731 (applet ; Wow, Java
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1732 (w3-handle-content node)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1733 )
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1734 (script ; Scripts
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1735 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1736 ((embed object) ; Embedded images/content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1737 (w3-handle-content node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1738 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1739 (hr ; Cause line break & insert rule
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1740 (let* ((perc (or (w3-get-attribute 'width)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1741 (w3-get-style-info 'width node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1742 "100%"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1743 (width nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1744 (setq perc (/ (min (string-to-int perc) 100) 100.0)
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1745 width (truncate (* fill-column perc)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1746 (w3-insert-terminal-char (w3-horizontal-rule-char) width)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1747 (w3-handle-empty-tag)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1748 (map ; Client side imagemaps
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1749 (let ((name (or (w3-get-attribute 'name)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1750 (w3-get-attribute 'id)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1751 "unnamed"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1752 (areas
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1753 (mapcar
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1754 (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1755 (lambda (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1756 (let* ((args (nth 1 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1757 (type (downcase (or
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1758 (w3-get-attribute 'shape)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1759 "rect")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1760 (coords (w3-decode-area-coords
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1761 (or (cdr-safe
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1762 (assq 'coords args)) "")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1763 (alt (w3-get-attribute 'alt))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1764 (href (if (assq 'nohref args)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1765 t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1766 (or (w3-get-attribute 'src)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1767 (w3-get-attribute 'href))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1768 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1769 (vector type coords href alt))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1770 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1771 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1772 (nth 2 node))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1773 (setq w3-imagemaps (cons (cons name areas) w3-imagemaps)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1774 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1775 )
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1776 (note
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1777 ;; Ewwwwhhh. Looks gross, but it works. This converts a
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1778 ;; <note> into a two-cell table, so that things look all
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1779 ;; pretty.
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1780 (setq node
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1781 (list 'note nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1782 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1783 (list 'table nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1784 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1785 (list 'tr nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1786 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1787 (list 'td (list 'align 'right)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1788 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1789 (concat
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1790 (or (w3-get-attribute 'role)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1791 "CAUTION") ":")))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1792 (list 'td nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1793 (nth 2 node)))))))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1794 (w3-handle-content node)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1795 )
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1796 (table
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1797 (w3-display-table node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1798 (setq w3-last-fill-pos (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1799 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1800 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1801 (isindex
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1802 (let ((prompt (or (w3-get-attribute 'prompt)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1803 "Search on (+ separates keywords): "))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1804 action node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1805 (setq action (or (w3-get-attribute 'src)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1806 (w3-get-attribute 'href)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1807 (url-view-url t)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1808 (if (and prompt (string-match "[^: \t-]+$" prompt))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1809 (setq prompt (concat prompt ": ")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1810 (setq node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1811 (list 'isindex nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1812 (list
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1813 (list 'hr nil nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1814 (list 'form
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1815 (list (cons 'action action)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1816 (cons 'enctype
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1817 "application/x-w3-isindex")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1818 (cons 'method "get"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1819 (list
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1820 prompt
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1821 (list 'input
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1822 (list (cons 'type "text")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1823 (cons 'name "isindex"))))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1824 (w3-handle-content node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1825 (setq w3-current-isindex (cons action prompt)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1826 )
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1827 ((html body)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1828 (let ((fore (car (delq nil (copy-list w3-face-color))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1829 (back (car (delq nil (copy-list w3-face-background-color))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1830 )
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1831 (if (and fore font-running-xemacs)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1832 (font-set-face-foreground 'default fore (current-buffer)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1833 (if (and back font-running-xemacs)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1834 (font-set-face-background 'default back (current-buffer)))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1835 (w3-handle-content node)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1836 (*document
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1837 (let ((info (mapcar (lambda (x) (cons x (symbol-value x)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1838 w3-persistent-variables)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1839 (if (not w3-display-same-buffer)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1840 (set-buffer (generate-new-buffer "Untitled")))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1841 (setq w3-current-form-number 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1842 w3-display-open-element-stack nil
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1843 w3-last-fill-pos (point-min))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1844 (setcar right-margin-stack
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1845 (min (- (or w3-strict-width (window-width))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1846 w3-right-margin)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1847 (or w3-maximum-line-length
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1848 (window-width))))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1849 (condition-case nil
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1850 (switch-to-buffer (current-buffer))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1851 (error (message "W3 buffer %s is being drawn." (buffer-name (current-buffer)))))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1852
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1853 (buffer-disable-undo (current-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1854 (mapcar (function (lambda (x) (set (car x) (cdr x)))) info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1855 ;; ACK! We don't like filladapt mode!
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1856 (set (make-local-variable 'filladapt-mode) nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1857 (set (make-local-variable 'adaptive-fill-mode) nil)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1858 (set (make-local-variable 'voice-lock-mode) t)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1859 (setq w3-current-stylesheet (css-copy-stylesheet
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1860 w3-user-stylesheet)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1861 w3-last-fill-pos (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1862 fill-prefix "")
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 22
diff changeset
1863 (set (make-local-variable 'inhibit-read-only) t))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1864 (w3-handle-content node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1865 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1866 (*invisible
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1867 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1868 (meta
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1869 (let* ((equiv (cdr-safe (assq 'http-equiv args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1870 (value (w3-get-attribute 'content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1871 (name (w3-get-attribute 'name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1872 (node (and equiv (assoc (setq equiv (downcase equiv))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1873 url-current-mime-headers))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1874 (if equiv
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1875 (setq url-current-mime-headers (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1876 (cons equiv value)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1877 url-current-mime-headers)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1878 (if name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1879 (setq w3-current-metainfo (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1880 (cons name value)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1881 w3-current-metainfo)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1882
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1883 ;; Special-case the Set-Cookie header
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1884 (if (and equiv (string= (downcase equiv) "set-cookie"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1885 (url-cookie-handle-set-cookie value))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1886 ;; Special-case the refresh header
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1887 (if (and equiv (string= (downcase equiv) "refresh"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1888 (url-handle-refresh-header value)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1889 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1890 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1891 (link
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1892 ;; This doesn't handle blank-separated values per the RFC.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1893 (w3-parse-link args)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1894 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1895 (title
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1896 (let ((potential-title "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1897 (content (nth 2 node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1898 (while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1899 (setq potential-title (concat potential-title (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1900 content (cdr content)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1901 (setq potential-title (w3-normalize-spaces potential-title))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1902 (if (or w3-display-same-buffer
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1903 (string-match "^[ \t]*$" potential-title))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1904 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1905 (rename-buffer (generate-new-buffer-name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1906 (w3-fix-spaces potential-title)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1907 (w3-handle-empty-tag))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1908 (base
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1909 (setq w3-base-target (cdr-safe (assq 'target args)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1910 (w3-handle-content node))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1911 (form
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1912 (setq w3-current-form-number (1+ w3-current-form-number))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1913 (let* (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1914 (action (w3-get-attribute 'action))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1915 (url nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1916 (if (not action)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1917 (setq args (cons (cons 'action (url-view-url t)) args)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1918 (setq w3-display-form-id (cons
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1919 (cons 'form-number
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1920 w3-current-form-number)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1921 args))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1922 (w3-handle-content node)))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1923 (keygen
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1924 (w3-form-add-element
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1925 (w3-display-normalize-form-info
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1926 (cons '(type . "keygen")
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1927 args))
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1928 w3-active-faces)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1929 (w3-handle-empty-tag))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1930 (input
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1931 (w3-form-add-element
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1932 (w3-display-normalize-form-info args)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
1933 w3-active-faces)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1934 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1935 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1936 (select
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1937 (let* ((plist (w3-display-normalize-form-info args))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1938 (tmp nil)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1939 (multiple (assq 'multiple args))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1940 (value nil)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1941 (name (plist-get plist 'name))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1942 (options (mapcar
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1943 (function
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1944 (lambda (n)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1945 (setq tmp (w3-normalize-spaces
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1946 (apply 'concat (nth 2 n)))
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1947 tmp (vector tmp
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1948 (or
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1949 (cdr-safe
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1950 (assq 'value (nth 1 n)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1951 tmp)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1952 (assq 'selected (nth 1 n))))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1953 (if (assq 'selected (nth 1 n))
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1954 (setq value (aref tmp 0)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1955 tmp))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1956 (nth 2 node))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1957 (if (not value)
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1958 (setq value (aref (car options) 0)))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1959 (setq plist (plist-put plist 'value value))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1960 (if multiple
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1961 (progn
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1962 (setq options
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1963 (mapcar
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1964 (function
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1965 (lambda (opt)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1966 (list 'div nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1967 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1968 (list 'input
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1969 (list (cons 'name name)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1970 (cons 'type "checkbox")
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1971 (cons (if (aref opt 2)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1972 'checked
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1973 '__bogus__) "yes")
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1974 (cons 'value (aref opt 1))))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1975 " " (aref opt 0) (list 'br nil nil)))))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1976 options))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1977 (setq node (list 'p nil options))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1978 (w3-handle-content node))
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1979 (setq options (mapcar (function
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1980 (lambda (x)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1981 (cons (aref x 0) (aref x 1))))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
1982 options))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1983 (setq plist (plist-put plist 'type 'option)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1984 plist (plist-put plist 'options options))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
1985 (w3-form-add-element plist w3-active-faces)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1986 ;; This should really not be necessary, but some versions
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1987 ;; of the widget library leave point _BEFORE_ the menu
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1988 ;; widget instead of after.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1989 (goto-char (point-max))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1990 (w3-handle-empty-tag))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1991 (textarea
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1992 (let* ((plist (w3-display-normalize-form-info args))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
1993 (value (apply 'concat (nth 2 node))))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1994 (setq plist (plist-put plist 'type 'multiline)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
1995 plist (plist-put plist 'value value))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
1996 (w3-form-add-element plist w3-active-faces))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1997 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1998 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1999 (style
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2000 (w3-handle-style (alist-to-plist
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2001 (cons (cons 'data (apply 'concat (nth 2 node)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2002 (nth 1 node))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2003 (w3-handle-empty-tag))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2004 (label
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2005 (if (not (markerp w3-display-label-marker))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2006 (setq w3-display-label-marker (make-marker)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2007 (set-marker w3-display-label-marker (point))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2008 (w3-handle-content node))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2009 ;; Emacs-W3 stuff that cannot be expressed in a stylesheet
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2010 (pinhead
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2011 ;; This check is so that we don't screw up table auto-layout
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2012 ;; by changing our text midway through the parse/layout/display
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2013 ;; steps.
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2014 (if (nth 2 node)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2015 nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2016 (setcar (cddr node)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2017 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2018 (if (fboundp 'yow)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2019 (yow)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2020 "AIEEEEE! I am having an UNDULATING EXPERIENCE!"))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2021 (w3-handle-content node))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2022 (flame
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2023 (if (nth 2 node)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2024 nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2025 (setcar
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2026 (cddr node)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2027 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2028 (condition-case ()
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2029 (concat
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2030 (sentence-ify
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2031 (string-ify
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2032 (append-suffixes-hack (flatten (*flame))))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2033 (error
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2034 "You know, everything is really a graphics editor.")))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2035 (w3-handle-content node))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2036 (cookie
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2037 (if (nth 2 node)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2038 nil
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2039 (setcar
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2040 (cddr node)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2041 (list
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2042 (w3-display-get-cookie args))))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2043 (w3-handle-content node))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2044 ;; Generic formatting - all things that can be fully specified
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2045 ;; by a CSS stylesheet.
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2046 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2047 (w3-handle-content node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2048 ) ; case tag
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2049 ) ; stringp content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2050 ) ; while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2051 ) ; while content-stack
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2052 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2053 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2054
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2055 (defun w3-draw-tree (tree)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2056 ;; The main entry point - wow complicated
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2057 (setq w3-current-stylesheet w3-user-stylesheet)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2058 (while tree
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2059 (w3-display-node (car tree))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2060 (setq tree (cdr tree)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2061 (w3-display-fix-widgets)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2062 (w3-form-resurrect-widgets))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2063
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2064 (defun time-display (&optional tree)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2065 ;; Return the # of seconds it took to draw 'tree'
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2066 (let ((st (nth 1 (current-time)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2067 (nd nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2068 (w3-draw-tree (or tree w3-last-parse-tree))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2069 (setq nd (nth 1 (current-time)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2070 (- nd st)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2071
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2072
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2073 (defun w3-fixup-eol-faces ()
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2074 ;; Remove 'face property at end of lines - underlining screws up stuff
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
2075 ;; also remove 'mouse-face property at the beginning and end of lines
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2076 (let ((inhibit-read-only t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2077 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2078 (goto-char (point-min))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
2079 (while (search-forward "[ \t]*\n[ \t]*" nil t)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
2080 (remove-text-properties (match-beginning 0) (match-end 0)
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
2081 '(face nil mouse-face nil) nil)))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2082
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2083 (defsubst w3-finish-drawing ()
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2084 (let (url glyph widget)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2085 (while w3-image-widgets-waiting
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2086 (setq widget (car w3-image-widgets-waiting)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2087 w3-image-widgets-waiting (cdr w3-image-widgets-waiting)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2088 url (widget-get widget 'src)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2089 glyph (cdr-safe (assoc url w3-graphics-list)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2090 (condition-case nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2091 (widget-value-set widget glyph)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2092 (error nil))))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2093 (if (and url-current-object (url-target url-current-object))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2094 (progn
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2095 (push-mark (point) t)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2096 (w3-find-specific-link (url-target url-current-object)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2097 (goto-char (point-min)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2098 (and (not w3-running-xemacs)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2099 (not (eq (device-type) 'tty))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2100 (w3-fixup-eol-faces))
32
e04119814345 Import from CVS: tag r19-15b99
cvs
parents: 30
diff changeset
2101 (let ((inhibit-read-only t))
44
8d2a9b52c682 Import from CVS: tag r19-15prefinal
cvs
parents: 38
diff changeset
2102 (remove-text-properties (point-min) (point-max) '(read-only) nil))
32
e04119814345 Import from CVS: tag r19-15b99
cvs
parents: 30
diff changeset
2103 (message "Drawing... done"))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2104
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2105 (defun w3-region (st nd)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2106 (if (not w3-setup-done) (w3-do-setup))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2107 (let* ((source (buffer-substring st nd))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2108 (w3-display-same-buffer t)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2109 (parse nil))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2110 (save-window-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2111 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2112 (set-buffer (get-buffer-create " *w3-region*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2113 (erase-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2114 (insert source)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2115 (setq parse (w3-parse-buffer (current-buffer))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2116 (narrow-to-region st nd)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2117 (delete-region (point-min) (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2118 (w3-draw-tree parse)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2119 (w3-finish-drawing)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
2120 (widen))))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2121
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2122 (defun w3-refresh-buffer ()
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2123 (interactive)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2124 (let ((parse w3-current-parse)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2125 (inhibit-read-only t)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2126 (w3-display-same-buffer t))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2127 (if (not parse)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2128 (error "Could not find the parse tree for this buffer. EEEEK!"))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2129 (erase-buffer)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2130 (w3-draw-tree parse)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2131 (w3-finish-drawing)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2132 (w3-mode)
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2133 (set-buffer-modified-p nil)))
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2134
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2135 (defun w3-prepare-buffer (&rest args)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2136 ;; The text/html viewer - does all the drawing and displaying of the buffer
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2137 ;; that is necessary to go from raw HTML to a good presentation.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2138 (let* ((source (buffer-string))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2139 (source-buf (current-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2140 (parse (w3-parse-buffer source-buf)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2141 (set-buffer-modified-p nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2142 (w3-draw-tree parse)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2143 (kill-buffer source-buf)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2144 (set-buffer-modified-p nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2145 (setq w3-current-source source
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2146 w3-current-parse parse)
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
2147 (w3-finish-drawing)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2148 (w3-mode)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2149 (set-buffer-modified-p nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2150 (if url-keep-history
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2151 (let ((url (url-view-url t)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2152 (if (not url-history-list)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2153 (setq url-history-list (make-hash-table :size 131 :test 'equal)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2154 (cl-puthash url (buffer-name) url-history-list)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2155 (if (fboundp 'w3-shuffle-history-menu)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2156 (w3-shuffle-history-menu)))))
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2157 (w3-maybe-fetch-frames))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2158
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2159 (defun w3-maybe-fetch-frames ()
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2160 (if w3-frameset-structure
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2161 (cond ((or (eq w3-display-frames t)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2162 (and (eq w3-display-frames 'ask)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2163 (y-or-n-p "Fetch frames? ")))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2164 (w3-frames)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2165 t))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2166
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2167 (defun w3-frames (&optional new-frame)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2168 "Set up and fetch W3 frames. With optional prefix, do so in a new frame."
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2169 (interactive "P")
36
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2170 (if (not w3-display-frames)
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2171 (let ((w3-display-frames t))
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2172 (w3-refresh-buffer)))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2173 (let* ((old-asynch url-be-asynchronous)
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2174 (structure (reverse w3-frameset-structure)))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2175 (if new-frame
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2176 (select-frame (make-frame-command)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2177 (setq-default url-be-asynchronous nil)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2178 ;; set up frames
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2179 (while structure
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2180 (if (eq (car (car structure)) 'frameset)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2181 (let* ((current-dims (cdr (car structure)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2182 (cols (cdr-safe (assq 'cols current-dims)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2183 (rows (cdr-safe (assq 'rows current-dims))))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2184 (pop structure)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2185 ;; columns ?
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2186 (if cols
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2187 (setq cols (w3-decode-frameset-dimensions cols (window-width) window-min-width))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2188 ;; rows ?
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2189 (if rows
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2190 (setq rows (w3-decode-frameset-dimensions rows (window-height) window-min-height))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2191 ;; default: columns of equal width
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2192 (let ((nb-windows 0)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2193 (frames structure))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2194 (while (and frames (eq (car (car frames)) 'frame))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2195 (setq nb-windows (1+ nb-windows)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2196 (let ((fwidth (/ (window-width) nb-windows)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2197 (while (> nb-windows 0)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2198 (push fwidth cols)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2199 (setq nb-windows (1- nb-windows)))))))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2200 (while (eq (car (car structure)) 'frame)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2201 (cond ((cdr cols)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2202 (split-window-horizontally (car cols))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2203 (pop cols))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2204 ((cdr rows)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2205 (split-window-vertically (car rows))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2206 (pop rows)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2207 (let ((href (nth 2 (car structure)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2208 (name (nth 1 (car structure)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2209 (url-working-buffer url-default-working-buffer) ; in case url-multiple-p is t
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2210 (w3-notify 'semibully))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2211 (w3-fetch href)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2212 (setq w3-frame-name name
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2213 w3-target-window-distances nil))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2214 (other-window 1)
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2215 (pop structure)))
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2216 (pop structure)))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2217 ;; compute target window distances
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2218 (let ((origin-buffer (current-buffer))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2219 (stop nil))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2220 (while (not stop)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2221 (or w3-target-window-distances
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2222 (setq w3-target-window-distances
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2223 (w3-compute-target-window-distances)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2224 (other-window 1)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2225 (if (eq (current-buffer) origin-buffer)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2226 (setq stop t))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2227 (setq-default url-be-asynchronous old-asynch)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2228
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2229 (defun w3-compute-target-window-distances ()
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2230 "Compute an alist of target names and window distances"
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2231 (let ((origin-buffer (current-buffer))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2232 (distance 0)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2233 (stop nil)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2234 (window-distances nil))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2235 (while (not stop)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2236 (if w3-frame-name
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2237 (push (cons (intern (downcase w3-frame-name)) distance)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2238 window-distances))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2239 (other-window 1)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2240 (setq distance (1+ distance))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2241 (if (eq (current-buffer) origin-buffer)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2242 (setq stop t)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2243 window-distances))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2244
36
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2245 (if (not (fboundp 'frame-char-height))
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2246 (defun frame-char-height (&optional frame)
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2247 "Height in pixels of a line in the font in frame FRAME.
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2248 If FRAME is omitted, the selected frame is used.
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2249 For a terminal frame, the value is always 1."
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2250 (font-height (face-font 'default frame))))
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2251
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2252 (if (not (fboundp 'frame-char-width))
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2253 (defun frame-char-width (&optional frame)
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2254 "Width in pixels of characters in the font in frame FRAME.
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2255 If FRAME is omitted, the selected frame is used.
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2256 For a terminal screen, the value is always 1."
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2257 (font-width (face-font 'default frame))))
c53a95d3c46d Import from CVS: tag r19-15b101
cvs
parents: 32
diff changeset
2258
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2259 (defun w3-decode-frameset-dimensions (dims available-dimension min-dim)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2260 "Returns numbers of lines or columns in Emacs, computed from specified frameset dimensions"
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2261 (let ((dimensions nil))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2262 (if dims
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2263 (let ((nb-stars 0)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2264 (remaining-available-dimension available-dimension))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2265 (while (string-match "\\(\\*\\|[0-9]+%?\\)" dims)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2266 (let ((match (substring dims (match-beginning 1) (match-end 1))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2267 (setq dims (substring dims (match-end 1)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2268 (cond ((string-match "\\*" match)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2269 ;; * : divide rest equally
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2270 (push '* dimensions)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2271 (setq nb-stars (1+ nb-stars)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2272 (t
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2273 (cond ((string-match "\\([0-9]+\\)%" match)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2274 ;; percentage of available height
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2275 (push (/ (* (car (read-from-string (substring match 0 -1)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2276 available-dimension)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2277 100)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2278 dimensions))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2279 (t
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2280 ;; absolute number: pixel height
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2281 (push (max (1+ (/ (car (read-from-string match))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2282 (frame-char-height)))
38
1a767b41a199 Import from CVS: tag r19-15b102
cvs
parents: 36
diff changeset
2283 min-dim)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2284 dimensions)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2285 (setq remaining-available-dimension
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2286 (- remaining-available-dimension (car dimensions)))))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2287 (if (zerop nb-stars)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2288 ;; push => reverse order
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2289 (reverse dimensions)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2290 ;; substitute numbers for *
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2291 (let ((star-replacement (/ remaining-available-dimension nb-stars))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2292 (star-dimensions dimensions))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2293 (setq dimensions nil)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2294 (while star-dimensions
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2295 (push (if (eq '* (car star-dimensions))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2296 star-replacement
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2297 (car star-dimensions))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2298 dimensions)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2299 (pop star-dimensions))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2300 ;; push + push => in order
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2301 dimensions))))))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2302
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2303
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
2304 (provide 'w3-display)