annotate lisp/w3/w3-display.el @ 14:9ee227acff29 r19-15b90

Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents
children 0293115a14e9 6a378aca36af
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
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
3 ;; Created: 1997/01/02 20:20:45
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
4 ;; Version: 1.90
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)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
9 ;;; Copyright (c) 1996 Free Software Foundation, Inc.
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
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
35 (defmacro w3-d-s-var-def (var)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
36 (` (make-variable-buffer-local (defvar (, var) nil))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
37
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
38 (w3-d-s-var-def w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
39 (w3-d-s-var-def w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
40 (w3-d-s-var-def w3-display-list-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
41 (w3-d-s-var-def w3-display-form-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
42 (w3-d-s-var-def w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
43 (w3-d-s-var-def w3-display-font-family-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
44 (w3-d-s-var-def w3-display-font-weight-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
45 (w3-d-s-var-def w3-display-font-variant-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
46 (w3-d-s-var-def w3-display-font-size-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
47 (w3-d-s-var-def w3-face-color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
48 (w3-d-s-var-def w3-face-background)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
49 (w3-d-s-var-def w3-active-faces)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
50 (w3-d-s-var-def w3-active-voices)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
51 (w3-d-s-var-def w3-current-form-number)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
52 (w3-d-s-var-def w3-face-font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
53 (w3-d-s-var-def w3-face-font-weight)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
54 (w3-d-s-var-def w3-face-font-variant)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
55 (w3-d-s-var-def w3-face-font-size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
56 (w3-d-s-var-def w3-face-font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
57 (w3-d-s-var-def w3-face-font-size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
58 (w3-d-s-var-def w3-face-font-spec)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
59 (w3-d-s-var-def w3-face-text-decoration)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
60 (w3-d-s-var-def w3-face-face)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
61 (w3-d-s-var-def w3-face-descr)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
62 (w3-d-s-var-def w3-face-pixmap)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
63 (w3-d-s-var-def w3-display-css-properties)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
64
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
65 (eval-when-compile
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
66 (defmacro w3-get-attribute (attr)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
67 (` (cdr-safe (assq (, attr) args))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
68
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
69 (defmacro w3-get-face-info (info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
70 (let ((var (intern (format "w3-face-%s" info))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
71 (` (push (w3-get-style-info (quote (, info)) node (car (, var)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
72 (, var)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
73
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
74 (defmacro w3-pop-face-info (info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
75 (let ((var (intern (format "w3-face-%s" info))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
76 (` (pop (, var)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
77
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
78 (defmacro w3-get-all-face-info ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
79 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
80 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
81 (w3-get-face-info font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
82 (w3-get-face-info font-weight)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
83 (w3-get-face-info font-variant)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
84 (w3-get-face-info font-size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
85 (w3-get-face-info text-decoration)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
86 ;;(w3-get-face-info pixmap)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
87 (w3-get-face-info color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
88 (w3-get-face-info background)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
89 (setq w3-face-font-spec (make-font
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
90 :weight (car w3-face-font-weight)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
91 :family (car w3-face-font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
92 :size (car w3-face-font-size))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
93
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
94 (defmacro w3-pop-all-face-info ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
95 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
96 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
97 (w3-pop-face-info font-family)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
98 (w3-pop-face-info font-weight)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
99 (w3-pop-face-info font-variant)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
100 (w3-pop-face-info font-size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
101 (w3-pop-face-info text-decoration)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
102 ;;(w3-pop-face-info pixmap)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
103 (w3-pop-face-info color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
104 (w3-pop-face-info background))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
105
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
106 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
107
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
108 (defvar w3-face-cache nil "Cache for w3-face-for-element")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
109 (defvar w3-face-index 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
110 (defvar w3-image-widgets-waiting nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
111
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
112 (make-variable-buffer-local 'w3-last-fill-pos)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
113
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
114 (defconst w3-fill-prefixes-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
115 (let ((len 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
116 (prefix-vector (make-vector 80 nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
117 (while (< len 80)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
118 (aset prefix-vector len (make-string len ? ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
119 (setq len (1+ len)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
120 prefix-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
121
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
122 (defconst w3-line-breaks-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
123 (let ((len 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
124 (breaks-vector (make-vector 10 nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
125 (while (< len 10)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
126 (aset breaks-vector len (make-string len ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
127 (setq len (1+ len)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
128 breaks-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
129
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
130 (defun w3-pause ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
131 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
132 (w3-running-FSF19 (sit-for 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
133 (w3-running-xemacs
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
134 (sit-for 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
135 ;; (if (and (not (sit-for 0)) (input-pending-p))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
136 ;; (condition-case ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
137 ;; (dispatch-event (next-command-event))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
138 ;; (error nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
139 (t (sit-for 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
140
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
141 (defmacro w3-get-pad-string (len)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
142 (` (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
143 ((< (, len) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
144 "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
145 ((< (, len) 80)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
146 (aref w3-fill-prefixes-vector (, len)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
147 (t (make-string (, len) ? )))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
148
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
149 (defsubst w3-set-fill-prefix-length (len)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
150 (setq fill-prefix (if (< len (- (or w3-strict-width (window-width)) 4))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
151 (w3-get-pad-string len)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
152 (url-warn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
153 'html
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
154 "Runaway indentation! Too deep for window width!")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
155 fill-prefix)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
156
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
157 (defsubst w3-get-style-info (info node &optional default)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
158 (or (cdr-safe (assq info w3-display-css-properties)) default))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
159
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
160 (defun w3-decode-area-coords (str)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
161 (let (retval)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
162 (while (string-match "\\([ \t0-9]+\\),\\([ \t0-9]+\\)" str)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
163 (setq retval (cons (vector (string-to-int (match-string 1 str))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
164 (string-to-int (match-string 2 str))) retval)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
165 str (substring str (match-end 0) nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
166 (if (string-match "\\([0-9]+\\)" str)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
167 (setq retval (cons (vector (+ (aref (car retval) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
168 (string-to-int (match-string 1 str)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
169 (aref (car retval) 1)) retval)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
170 (nreverse retval)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
171
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
172 (defun w3-normalize-color (color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
173 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
174 ((valid-color-name-p color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
175 color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
176 ((valid-color-name-p (concat "#" color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
177 (concat "#" color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
178 ((string-match "[ \t\r\n]" color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
179 (w3-normalize-color
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
180 (mapconcat (function (lambda (x) (if (memq x '(?\t ?\r ?\n ? )) ""
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
181 (char-to-string x)))) color "")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
182 ((valid-color-name-p (font-normalize-color color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
183 (font-normalize-color color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
184 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
185 (w3-warn 'html (format "Bad color specification: %s" color))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
186 nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
187
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
188 (defsubst w3-voice-for-element (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
189 (if (featurep 'emacspeak)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
190 (let (family gain left right pitch pitch-range stress richness voice)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
191 (setq family (w3-get-style-info 'voice-family node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
192 gain (w3-get-style-info 'gain node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
193 left (w3-get-style-info 'left-volume node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
194 right (w3-get-style-info 'right-volume node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
195 pitch (w3-get-style-info 'pitch node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
196 pitch-range (w3-get-style-info 'pitch-range node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
197 stress (w3-get-style-info 'stress node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
198 richness (w3-get-style-info 'richness node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
199 (if (or family gain left right pitch pitch-range stress richness)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
200 (setq voice (dtk-personality-from-speech-style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
201 (make-dtk-speech-style :family (or family 'paul)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
202 :gain (or gain 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
203 :left-volume (or left 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
204 :right-volume (or right 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
205 :average-pitch (or pitch 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
206 :pitch-range (or pitch-range 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
207 :stress (or stress 5)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
208 :richness (or richness 5))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
209 (setq voice nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
210 (or voice (car w3-active-voices)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
211
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
212 (defun w3-make-face-emacs19 (name &optional doc-string temporary)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
213 "Defines and returns a new FACE described by DOC-STRING.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
214 If the face already exists, it is unmodified.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
215 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
216 (make-face name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
217
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
218 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
219 ((not (fboundp 'make-face))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
220 (fset 'w3-make-face 'ignore))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
221 (w3-running-xemacs
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
222 (fset 'w3-make-face 'make-face))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
223 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
224 (fset 'w3-make-face 'w3-make-face-emacs19)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
225
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
226 (defsubst w3-face-for-element (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
227 (w3-get-all-face-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
228 (if (car w3-face-text-decoration)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
229 (set-font-style-by-keywords w3-face-font-spec
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
230 (car w3-face-text-decoration)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
231 (if w3-face-font-variant
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
232 (set-font-style-by-keywords w3-face-font-spec
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
233 (car w3-face-font-variant)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
234 (setq w3-face-descr (list w3-face-font-spec
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
235 (car w3-face-color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
236 (car w3-face-background))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
237 w3-face-face (cdr-safe (assoc w3-face-descr w3-face-cache)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
238 (if (or w3-face-face (not (or (car w3-face-color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
239 (car w3-face-background)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
240 w3-face-font-spec)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
241 nil ; Do nothing, we got it already
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
242 (setq w3-face-face
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
243 (w3-make-face (intern (format "w3-style-face-%05d" w3-face-index))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
244 "An Emacs-W3 face... don't edit by hand." t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
245 w3-face-index (1+ w3-face-index))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
246 (if w3-face-font-spec
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
247 (set-face-font w3-face-face w3-face-font-spec))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
248 (if (car w3-face-color)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
249 (set-face-foreground w3-face-face (car w3-face-color)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
250 (if (car w3-face-background)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
251 (set-face-background w3-face-face (car w3-face-background)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
252 ;;(set-face-background-pixmap w3-face-face w3-face-pixmap)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
253 (setq w3-face-cache (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
254 (cons w3-face-descr w3-face-face)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
255 w3-face-cache)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
256 w3-face-face)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
257
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
258 (defun w3-normalize-spaces (string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
259 ;; nuke spaces in the middle
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
260 (while (string-match "[ \t\r\n][ \r\t\n]+" string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
261 (setq string (concat (substring string 0 (1+ (match-beginning 0)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
262 (substring string (match-end 0)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
263
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
264 ;; nuke spaces at the beginning
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
265 (if (string-match "^[ \t\r\n]+" string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
266 (setq string (substring string (match-end 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
267
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
268 ;; nuke spaces at the end
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
269 (if (string-match "[ \t\n\r]+$" string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
270 (setq string (substring string 0 (match-beginning 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
271 string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
272
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
273 (defvar w3-bullets
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
274 '((disc . ?*)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
275 (circle . ?o)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
276 (square . ?#)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
277 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
278 "*An assoc list of unordered list types mapping to characters to use
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
279 as the bullet character.")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
280
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
281
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
282 (defsubst w3-display-line-break (n)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
283 (if (or
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
284 (memq (car w3-display-whitespace-stack) '(pre nowrap)) ; Been told
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
285 (= w3-last-fill-pos (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
286 (> w3-last-fill-pos (point-max)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
287 (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
288 (let ((fill-column (max (1+ (length fill-prefix)) fill-column))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
289 width)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
290 (case (car w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
291 (center
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
292 (fill-region-as-paragraph w3-last-fill-pos (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
293 (center-region w3-last-fill-pos (point-max)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
294 ((justify full)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
295 (fill-region-as-paragraph w3-last-fill-pos (point) t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
296 (right
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
297 (fill-region-as-paragraph w3-last-fill-pos (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
298 (goto-char w3-last-fill-pos)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
299 (catch 'fill-exit
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
300 (while (re-search-forward ".$" nil t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
301 (if (>= (setq width (current-column)) fill-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
302 nil ; already justified, or error
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
303 (beginning-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
304 (insert-char ? (- fill-column width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
305 (end-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
306 (if (eobp)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
307 (throw 'fill-exit t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
308 (condition-case ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
309 (forward-char 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
310 (error (throw 'fill-exit t))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
311 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
312 (otherwise ; Default is left justification
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
313 (fill-region-as-paragraph w3-last-fill-pos (point)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
314 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
315 (setq n (1- n)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
316 (setq w3-last-fill-pos (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
317 (insert (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
318 ((<= n 0) "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
319 ((< n 10)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
320 (aref w3-line-breaks-vector n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
321 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
322 (make-string n ?\n)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
323
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
324 (defsubst w3-munge-line-breaks-p ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
325 (eq (car w3-display-whitespace-stack) 'pre))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
326
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
327 (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
328
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
329 (defvar w3-scratch-start-point nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
330
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
331 (defsubst w3-handle-string-content (string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
332 (setq w3-scratch-start-point (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
333 (insert string)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
334 (if (w3-munge-line-breaks-p)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
335 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
336 (goto-char w3-scratch-start-point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
337 (if (not (search-forward "\n" nil t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
338 (subst-char-in-region w3-scratch-start-point (point-max) ?\r ?\n)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
339 (subst-char-in-region w3-scratch-start-point (point-max) ?\r ? )))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
340 (goto-char w3-scratch-start-point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
341 (while (re-search-forward
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
342 " [ \t\n\r]+\\|[\t\n\r][ \t\n\r]*"
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
343 nil 'move)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
344 (replace-match " "))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
345 (goto-char w3-scratch-start-point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
346 (if (and (memq (preceding-char) '(? ?\t ?\r ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
347 (looking-at "[ \t\r\n]"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
348 (delete-region (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
349 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
350 (skip-chars-forward " \t\r\n")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
351 (point)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
352 (goto-char (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
353 (add-text-properties w3-scratch-start-point
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
354 (point) (list 'face w3-active-faces 'duplicable t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
355 (if (car w3-active-voices)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
356 (add-text-properties w3-scratch-start-point (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
357 (list 'personality (car w3-active-voices))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
358 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
359
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
360 (defun w3-widget-echo (widget &rest ignore)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
361 (let ((href (widget-get widget 'href))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
362 (name (widget-get widget 'name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
363 (text (buffer-substring (widget-get widget :from)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
364 (widget-get widget :to)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
365 (title (widget-get widget 'title))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
366 (msg nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
367 (if href
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
368 (setq href (url-truncate-url-for-viewing href)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
369 (if name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
370 (setq name (concat "anchor:" name)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
371 (case w3-echo-link
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
372 (url (or href title text name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
373 (text (or text title href name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
374 (title (or title text href name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
375 (otherwise nil))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
376
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
377 (defun w3-follow-hyperlink (widget &rest ignore)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
378 (let* ((target (widget-get widget 'target))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
379 (href (widget-get widget 'href)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
380 (if target (setq target (intern (downcase target))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
381 (case target
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
382 ((_blank external)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
383 (w3-fetch-other-frame href))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
384 (_top
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
385 (delete-other-windows)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
386 (w3-fetch href))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
387 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
388 (w3-fetch href)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
389
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
390 (defun w3-balloon-help-callback (object &optional event)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
391 (let* ((widget (widget-at (extent-start-position object)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
392 (href (and widget (widget-get widget 'href))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
393 (if href
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
394 (url-truncate-url-for-viewing href)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
395 nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
396
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
397
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
398 ;; Various macros
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
399 (eval-when-compile
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
400 (defmacro w3-expand-url (url)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
401 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
402 (url-expand-file-name (, url)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
403 (cdr-safe
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
404 (assoc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
405 (cdr-safe
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
406 (assq 'base args)) w3-base-alist)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
407
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
408 (defmacro w3-handle-empty-tag ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
409 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
410 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
411 (push (cons tag args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
412 (push content content-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
413 (setq content nil))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
414
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
415 (defmacro w3-handle-content (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
416 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
417 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
418 (push (cons tag args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
419 (push content content-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
420 (setq content (nth 2 node)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
421
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
422 (defmacro w3-display-handle-list-type ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
423 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
424 (case (car break-style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
425 (list-item
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
426 (let ((list-style (w3-get-style-info 'list-style node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
427 (list-num (if (car w3-display-list-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
428 (incf (car w3-display-list-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
429 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
430 (margin (1- (car left-margin-stack)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
431 (indent (w3-get-style-info 'text-indent node 0)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
432 (if (> indent 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
433 (setq margin (+ margin indent))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
434 (setq margin (max 0 (- margin indent))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
435 (beginning-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
436 (case list-style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
437 ((disc circle square)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
438 (insert (format (format "%%%dc" margin)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
439 (or (cdr-safe (assq list-style w3-bullets))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
440 ?o))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
441 ((decimal lower-roman upper-roman lower-alpha upper-alpha)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
442 (let ((x (case list-style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
443 (lower-roman
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
444 (w3-decimal-to-roman list-num))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
445 (upper-roman
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
446 (upcase
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
447 (w3-decimal-to-roman list-num)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
448 (lower-alpha
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
449 (w3-decimal-to-alpha list-num))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
450 (upper-alpha
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
451 (upcase
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
452 (w3-decimal-to-alpha list-num)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
453 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
454 (int-to-string list-num)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
455 (insert (format (format "%%%ds." margin) x))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
456 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
457 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
458 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
459 (insert (w3-get-pad-string margin)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
460 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
461 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
462 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
463 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
464 (insert (w3-get-pad-string (+ (car left-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
465 (w3-get-style-info 'text-indent node 0)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
466 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
467 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
468 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
469
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
470 (defmacro w3-display-set-margins ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
471 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
472 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
473 (push (+ (w3-get-style-info 'margin-left node 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
474 (car left-margin-stack)) left-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
475 (push (-
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
476 (car right-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
477 (w3-get-style-info 'margin-right node 0)) right-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
478 (setq fill-column (car right-margin-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
479 (w3-set-fill-prefix-length (car left-margin-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
480 (w3-display-handle-list-type))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
481
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
482 (defmacro w3-display-restore-margins ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
483 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
484 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
485 (pop right-margin-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
486 (pop left-margin-stack))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
487
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
488 (defmacro w3-display-handle-break ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
489 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
490 (case (car break-style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
491 (block ; Full paragraph break
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
492 (if (eq (cadr break-style) 'list-item)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
493 (setf (cadr break-style) 'line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
494 (w3-display-line-break 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
495 (w3-display-set-margins)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
496 (push
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
497 (w3-get-style-info 'white-space node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
498 (car w3-display-whitespace-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
499 w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
500 (push
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
501 (or (w3-get-attribute 'align)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
502 (w3-get-style-info 'text-align node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
503 (car w3-display-alignment-stack)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
504 w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
505 (and w3-do-incremental-display (w3-pause)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
506 ((line list-item) ; Single line break
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
507 (w3-display-line-break 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
508 (w3-display-set-margins)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
509 (push
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
510 (w3-get-style-info 'white-space node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
511 (car w3-display-whitespace-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
512 w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
513 (push
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
514 (w3-get-style-info 'text-align node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
515 (or (w3-get-attribute 'align)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
516 (car w3-display-alignment-stack)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
517 w3-display-alignment-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
518 (otherwise ; Assume 'inline' rendering as default
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
519 nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
520 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
521 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
522
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
523 (defmacro w3-display-handle-end-break ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
524 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
525 (case (pop break-style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
526 (block ; Full paragraph break
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
527 (w3-display-line-break 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
528 (w3-display-restore-margins)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
529 (pop w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
530 (pop w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
531 (and w3-do-incremental-display (w3-pause)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
532 ((line list-item) ; Single line break
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
533 (w3-display-restore-margins)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
534 (w3-display-line-break 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
535 (pop w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
536 (pop w3-display-alignment-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
537 (otherwise ; Assume 'inline' rendering as default
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
538 nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
539 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
540 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
541 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
542
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
543 ;; <link> handling
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
544 (defun w3-parse-link (args)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
545 (let* ((type (if (w3-get-attribute 'rel) 'rel 'rev))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
546 (desc (w3-get-attribute type))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
547 (dc-desc (and desc (downcase desc))) ; canonical case
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
548 (dest (w3-get-attribute 'href))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
549 (plist (alist-to-plist args))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
550 (node-1 (assq type w3-current-links))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
551 (node-2 (and node-1 desc (or (assoc desc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
552 (cdr node-1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
553 (assoc dc-desc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
554 (cdr node-1)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
555 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
556 ;; Canonicalize the case of link types we may look for
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
557 ;; specifically (toolbar etc.) since that's done with
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
558 ;; assoc. See `w3-mail-document-author' and
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
559 ;; `w3-link-toolbar', at least.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
560 (if (member dc-desc w3-defined-link-types)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
561 (setq desc dc-desc))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
562 (if dest ; ignore if HREF missing
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
563 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
564 (node-2 ; Add to old value
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
565 (setcdr node-2 (cons plist (cdr node-2))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
566 (node-1 ; first rel/rev
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
567 (setcdr node-1 (cons (cons desc (list plist))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
568 (cdr node-1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
569 (t (setq w3-current-links
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
570 (cons (cons type (list (cons desc (list plist))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
571 w3-current-links)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
572 (setq desc (and desc (intern dc-desc)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
573 (case desc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
574 ((style stylesheet)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
575 (w3-handle-style args))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
576 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
577 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
578 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
579 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
580 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
581
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
582
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
583 ;; Image handling
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
584 (defun w3-maybe-start-image-download (widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
585 (let* ((src (widget-get widget 'src))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
586 (cached-glyph (w3-image-cached-p src)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
587 (if (and cached-glyph (widget-glyphp cached-glyph))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
588 (setq w3-image-widgets-waiting (cons widget w3-image-widgets-waiting))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
589 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
590 ((or w3-delay-image-loads ; Delaying images
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
591 (not (fboundp 'valid-specifier-domain-p)) ; Can't do images
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
592 (eq (device-type) 'tty)) ; Why bother?
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
593 (w3-add-delayed-graphic widget))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
594 ((not (w3-image-loadable-p src nil)) ; Hey, we can't load it!
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
595 (w3-warn 'images (format "Skipping image %s" (url-basepath src t)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
596 (w3-add-delayed-graphic widget))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
597 (t ; Grab the images
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
598 (let (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
599 (url-request-method "GET")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
600 (old-asynch url-be-asynchronous)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
601 (url-request-data nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
602 (url-request-extra-headers nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
603 (url-source t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
604 (url-mime-accept-string (substring
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
605 (mapconcat
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
606 (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
607 (lambda (x)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
608 (if x
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
609 (concat (car x) ",")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
610 "")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
611 w3-allowed-image-types "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
612 0 -1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
613 (url-working-buffer (generate-new-buffer-name " *W3GRAPH*")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
614 (setq-default url-be-asynchronous t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
615 (setq w3-graphics-list (cons (cons src (make-glyph))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
616 w3-graphics-list))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
617 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
618 (set-buffer (get-buffer-create url-working-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
619 (setq url-current-callback-data (list widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
620 url-be-asynchronous t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
621 url-current-callback-func 'w3-finalize-image-download)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
622 (url-retrieve src))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
623 (setq-default url-be-asynchronous old-asynch)))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
624
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
625 (defun w3-finalize-image-download (widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
626 (let ((glyph nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
627 (url (widget-get widget 'src))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
628 (node nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
629 (buffer (widget-get widget 'buffer)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
630 (message "Enhancing image...")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
631 (setq glyph (image-normalize (cdr-safe (assoc url-current-mime-type
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
632 w3-image-mappings))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
633 (buffer-string)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
634 (message "Enhancing image... done")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
635 (kill-buffer (current-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
636 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
637 ((w3-image-invalid-glyph-p glyph)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
638 (setq glyph nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
639 (w3-warn 'image (format "Reading of %s failed." url)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
640 ((eq (aref glyph 0) 'xbm)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
641 (let ((temp-fname (url-generate-unique-filename "%s.xbm")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
642 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
643 (set-buffer (generate-new-buffer " *xbm-garbage*"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
644 (erase-buffer)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
645 (insert (aref glyph 2))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
646 (setq glyph temp-fname)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
647 (write-region (point-min) (point-max) temp-fname)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
648 (kill-buffer (current-buffer)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
649 (setq glyph (make-glyph (list (cons 'x glyph))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
650 (condition-case ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
651 (delete-file temp-fname)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
652 (error nil))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
653 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
654 (setq glyph (make-glyph glyph))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
655 (setq node (assoc url w3-graphics-list))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
656 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
657 ((and node glyph)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
658 (set-glyph-image (cdr node) (glyph-image glyph)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
659 (glyph
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
660 (setq w3-graphics-list (cons (cons url glyph) w3-graphics-list)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
661 (t nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
662
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
663 (if (and (buffer-name buffer) ; Dest. buffer exists
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
664 (widget-glyphp glyph)) ; got a valid glyph
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
665 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
666 (set-buffer buffer)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
667 (if (eq major-mode 'w3-mode)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
668 (widget-value-set widget glyph)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
669 (setq w3-image-widgets-waiting
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
670 (cons widget w3-image-widgets-waiting)))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
671
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
672 (defmacro w3-node-visible-p ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
673 (` (not (eq (car break-style) 'none))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
674
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
675 (defmacro w3-handle-image ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
676 (`
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
677 (let* ((height (w3-get-attribute 'height))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
678 (width (w3-get-attribute 'width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
679 (src (or (w3-get-attribute 'src) "Error Image"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
680 (our-alt (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
681 ((null w3-auto-image-alt) "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
682 ((eq t w3-auto-image-alt)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
683 (concat "[IMAGE(" (url-basepath src t) ")] "))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
684 ((stringp w3-auto-image-alt)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
685 (format w3-auto-image-alt (url-basepath src t)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
686 (alt (or (w3-get-attribute 'alt) our-alt))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
687 (ismap (and (assq 'ismap args) 'ismap))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
688 (usemap (w3-get-attribute 'usemap))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
689 (base (w3-get-attribute 'base))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
690 (href (and hyperlink-info (widget-get (cadr hyperlink-info) 'href)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
691 (widget nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
692 (align (or (w3-get-attribute 'align)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
693 (w3-get-style-info 'vertical-align node))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
694 (setq widget (widget-create 'image
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
695 :value-face w3-active-faces
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
696 'src src ; Where to load the image from
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
697 'alt alt ; Textual replacement
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
698 'ismap ismap ; Is it a server-side map?
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
699 'usemap usemap ; Is it a client-side map?
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
700 'href href ; Hyperlink destination
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
701 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
702 (widget-put widget 'buffer (current-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
703 (w3-maybe-start-image-download widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
704 (goto-char (point-max)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
705
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
706 ;; The table handling
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
707
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
708 (defvar w3-display-table-cut-words-p nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
709 "*Whether to cut words that are oversized in table cells")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
710
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
711 (defvar w3-display-table-force-borders nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
712 "*Whether to always draw table borders")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
713
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
714 (defun w3-display-table-cut ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
715 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
716 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
717 (let ((offset -1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
718 (while (< offset 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
719 (end-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
720 (setq offset (- fill-column (current-column)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
721 (cond ((< offset 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
722 (condition-case nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
723 (progn (forward-char offset)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
724 (insert ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
725 (error (setq offset 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
726 ((not (eobp))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
727 (forward-line 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
728 (setq offset -1)))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
729
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
730
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
731 (defun w3-display-fix-widgets ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
732 ;; Make markers belong to the right buffer
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
733 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
734 (let ((st (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
735 (nd nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
736 (widget nil) parent
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
737 (to-marker nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
738 (from-marker nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
739 (while (setq st (next-single-property-change st 'button))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
740 (setq nd (or (next-single-property-change st 'button) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
741 widget (widget-at st)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
742 to-marker (and widget (widget-get widget :to))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
743 from-marker (and widget (widget-get widget :from))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
744 parent (and widget (widget-get widget :parent))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
745 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
746 (if (not widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
747 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
748 (widget-put widget :from (set-marker (make-marker) st))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
749 (widget-put widget :to (set-marker (make-marker) nd))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
750 (if (not parent)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
751 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
752 (widget-put parent :from (set-marker (make-marker) st))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
753 (widget-put parent :to (set-marker (make-marker) nd))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
754 (if (condition-case ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
755 (get-text-property (1+ nd) 'button)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
756 (error nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
757 (setq st nd)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
758 (setq st (min (point-max) (1+ nd))))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
759
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
760 (defun w3-size-of-tree (tree minmax)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
761 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
762 (save-restriction
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
763 (narrow-to-region (point) (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
764 ;; XXX fill-column set to 1 fails when fill-prefix is set
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
765 ;; XXX setting fill-column at all isn't really right
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
766 ;; for example <hr>s shouldn't be especially wide
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
767 ;; we should set a flag that makes w3 never wrap a line
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
768 (let ((fill-column (cond ((eq minmax 'min)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
769 3)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
770 ((eq minmax 'max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
771 400)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
772 (fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
773 (w3-last-fill-pos (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
774 a retval
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
775 (w3-do-incremental-display nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
776 (hr-regexp (concat "^"
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
777 (regexp-quote
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
778 (make-string 5 w3-horizontal-rule-char))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
779 "*$"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
780 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
781 ;;(push 'left w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
782 (push (if (eq minmax 'max) 'nowrap) w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
783 (while tree
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
784 (push (cons '*td args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
785 (w3-display-node (pop tree)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
786 (pop w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
787 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
788 (while (re-search-forward hr-regexp nil t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
789 (replace-match "" t t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
790 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
791 (while (not (eobp))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
792 ;; loop invariant: at beginning of uncounted line
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
793 (end-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
794 (skip-chars-backward " ")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
795 (setq retval (cons (current-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
796 retval))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
797 (beginning-of-line 2))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
798 (if (= (point-min) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
799 (setq retval 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
800 (setq retval (apply 'max (cons 0 retval))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
801 (delete-region (point-min) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
802 retval))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
803
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
804 (defun w3-display-table-dimensions (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
805 ;; fill-column sets maximum width
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
806 (let (min-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
807 max-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
808 rows cols
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
809 ;;(w3-form-elements (and (boundp 'w3-form-elements) w3-form-elements))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
810 (table-info (assq 'w3-table-info (cadr node))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
811
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
812 (if table-info
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
813 (setq min-vector (nth 1 table-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
814 max-vector (nth 2 table-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
815 rows (nth 3 table-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
816 cols (nth 4 table-info))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
817
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
818 (push (cons '*table-autolayout args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
819 (let (content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
820 cur
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
821 (table-spans (list nil)) ; don't make this '(nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
822 ptr
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
823 col
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
824 constraints
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
825
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
826 colspan rowspan min max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
827 (setq content (nth 2 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
828 (setq rows 0 cols 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
829 (while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
830 (setq cur (pop content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
831 (if (stringp cur)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
832 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
833 (case (car cur)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
834 (tr
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
835 (setq col 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
836 (setq rows (1+ rows))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
837 (setq ptr table-spans)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
838 (mapcar
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
839 (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
840 (lambda (td)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
841 (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
842 rowspan (string-to-int (or (cdr-safe (assq 'rowspan (nth 1 td))) "1"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
843 min (w3-size-of-tree (nth 2 td) 'min)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
844 max (w3-size-of-tree (nth 2 td) 'max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
845 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
846 (while (eq (car-safe (car-safe (cdr ptr))) col)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
847 (setq col (+ col (cdr (cdr (car (cdr ptr))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
848 (if (= 0 (decf (car (cdr (car (cdr ptr))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
849 (pop (cdr ptr))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
850 (setq ptr (cdr ptr))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
851 (push (list col colspan min max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
852 constraints)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
853 (if (= rowspan 1) nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
854 (push (cons col (cons (1- rowspan) colspan)) (cdr ptr))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
855 (setq ptr (cdr ptr)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
856 (setq col (+ col colspan))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
857 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
858 (nth 2 cur))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
859 (while (cdr ptr)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
860 (if (= 0 (decf (car (cdr (car (cdr ptr))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
861 (pop (cdr ptr))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
862 (setq ptr (cdr ptr))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
863 (setq cols (max cols col))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
864 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
865 (caption
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
866 nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
867 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
868 (setq content (nth 2 cur)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
869 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
870 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
871 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
872 (setq constraints (sort constraints
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
873 (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
874 (lambda (a b)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
875 (< (cadr a) (cadr b)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
876 min-vector (make-vector cols 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
877 max-vector (make-vector cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
878 (let (start end i mincellwidth maxcellwidth)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
879 (mapcar (function (lambda (c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
880 (cond ((= (cadr c) 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
881 (aset min-vector (car c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
882 (max (aref min-vector (car c))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
883 (nth 2 c)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
884 (aset max-vector (car c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
885 (max (aref max-vector (car c))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
886 (nth 3 c))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
887 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
888 (setq start (car c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
889 end (+ (car c) (cadr c))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
890 mincellwidth 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
891 maxcellwidth 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
892 i start)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
893 (while (< i end)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
894 (setq mincellwidth (+ mincellwidth
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
895 (aref min-vector i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
896 maxcellwidth (+
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
897 maxcellwidth
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
898 (aref max-vector i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
899 i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
900 (setq i start)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
901 (if (= mincellwidth 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
902 ;; if existing width is 0 divide evenly
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
903 (while (< i end)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
904 (aset min-vector i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
905 (/ (nth 2 c) (cadr c)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
906 (aset max-vector i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
907 (/ (nth 3 c) (cadr c)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
908 (setq i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
909 ;; otherwise weight it by existing widths
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
910 (while (< i end)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
911 (aset min-vector i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
912 (max (aref min-vector i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
913 (/ (* (nth 2 c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
914 (aref min-vector i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
915 mincellwidth)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
916 (aset max-vector i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
917 (max (aref max-vector i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
918 (/ (* (nth 3 c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
919 (aref max-vector i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
920 maxcellwidth)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
921 (setq i (1+ i))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
922 ))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
923 constraints)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
924 (push (cons 'w3-table-info
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
925 (list min-vector max-vector rows cols))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
926 (cadr node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
927 (pop w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
928
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
929 (let (max-width
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
930 min-width
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
931 ret-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
932 col
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
933 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
934
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
935
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
936 (setq max-width (apply '+ (append max-vector (list cols 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
937 (setq min-width (apply '+ (append min-vector (list cols 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
938
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
939 ;; the comments in the cond are excerpts from rfc1942 itself
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
940 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
941 ;; 1. The minimum table width is equal to or wider than the available
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
942 ;; space. In this case, assign the minimum widths and allow the
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
943 ;; user to scroll horizontally. For conversion to braille, it will
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
944 ;; be necessary to replace the cells by references to notes
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
945 ;; containing their full content. By convention these appear
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
946 ;; before the table.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
947 ((>= min-width fill-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
948 (setq ret-vector min-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
949
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
950 ;; 2. The maximum table width fits within the available space. In
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
951 ;; this case, set the columns to their maximum widths.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
952 ((<= max-width fill-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
953 (setq ret-vector max-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
954
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
955 ;; 3. The maximum width of the table is greater than the available
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
956 ;; space, but the minimum table width is smaller. In this case,
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
957 ;; find the difference between the available space and the minimum
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
958 ;; table width, lets call it W. Lets also call D the difference
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
959 ;; between maximum and minimum width of the table.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
960
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
961 ;; For each column, let d be the difference between maximum and
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
962 ;; minimum width of that column. Now set the column's width to the
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
963 ;; minimum width plus d times W over D. This makes columns with
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
964 ;; large differences between minimum and maximum widths wider than
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
965 ;; columns with smaller differences.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
966 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
967 (setq ret-vector (make-vector cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
968 (let ((W (- fill-column min-width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
969 (D (- max-width min-width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
970 d extra)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
971 (setq col 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
972 (while (< col (length ret-vector))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
973 (setq d (- (aref max-vector col)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
974 (aref min-vector col)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
975 (aset ret-vector col
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
976 (+ (aref min-vector col)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
977 (/ (* d W) D)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
978 (setq col (1+ col)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
979 (setq extra (- fill-column
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
980 (apply '+ (append ret-vector
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
981 (list (length ret-vector) 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
982 col 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
983 (while (and (< col (length ret-vector)) (> extra 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
984 (if (= 1 (- (aref max-vector col) (aref ret-vector col) ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
985 (aset ret-vector col (1+ (aref ret-vector col))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
986 (setq extra (1- extra)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
987 col (1+ col)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
988 )))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
989 (list rows cols ret-vector))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
990
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
991 (defvar w3-table-ascii-border-chars
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
992 [? ? ? ?/ ? ?- ?\\ ?- ? ?\\ ?| ?| ?/ ?- ?| ?-]
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
993 "Vector of ascii characters to use to draw table borders.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
994 w3-table-unhack-border-chars uses this to restore w3-table-border-chars.")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
995
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
996 (defvar w3-table-border-chars w3-table-ascii-border-chars
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
997 "Vector of characters to use to draw table borders.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
998 If you set this you should set w3-table-ascii-border-chars to the same value
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
999 so that w3-table-unhack-borders can restore the value if necessary.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1000
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1001 A reasonable value is [? ? ? ?/ ? ?- ?\\\\ ?^ ? ?\\\\ ?| ?< ?/ ?- ?> ?-]
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1002 Though i recommend replacing the ^ with - and the < and > with |")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1003
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1004 (defsubst w3-table-lookup-char (l u r b)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1005 (aref w3-table-border-chars (logior (if l 1 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1006 (if u 2 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1007 (if r 4 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1008 (if b 8 0))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1009
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1010 (defun w3-table-hack-borders nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1011 "Try to find the best set of characters to draw table borders with.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1012 I definitely recommend trying this on X.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1013 On a console, this can trigger some Emacs display bugs.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1014
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1015 I haven't tried this on XEmacs or any window-system other than X."
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1016 (interactive)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1017 (case (device-type)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1018 (x
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1019 (let ((id (or (and (find-face 'w3-table-hack-x-face)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1020 (face-id 'w3-table-hack-x-face))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1021 (progn
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1022 (make-face 'w3-table-hack-x-face)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1023 (set-face-font 'w3-table-hack-x-face
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1024 (make-font :family "terminal"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1025 (face-id 'w3-table-hack-x-face)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1026 (if (not (face-differs-from-default-p 'w3-table-hack-x-face))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1027 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1028 (aset standard-display-table 1 (vector (+ (* 256 id) ?l)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1029 (aset standard-display-table 2 (vector (+ (* 256 id) ?q)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1030 (aset standard-display-table 3 (vector (+ (* 256 id) ?k)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1031 (aset standard-display-table 4 (vector (+ (* 256 id) ?t)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1032 (aset standard-display-table 5 (vector (+ (* 256 id) ?n)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1033 (aset standard-display-table 6 (vector (+ (* 256 id) ?u)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1034 (aset standard-display-table 7 (vector (+ (* 256 id) ?m)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1035 (aset standard-display-table 8 (vector (+ (* 256 id) ?x)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1036 (aset standard-display-table 11 (vector (+ (* 256 id) ?j)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1037 (aset standard-display-table 14 (vector (+ (* 256 id) ?v)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1038 (aset standard-display-table 15 (vector (+ (* 256 id) ?w)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1039 (setq w3-table-border-chars [? ? ? 11 ? 2 7 14 ? 3 8 6 1 15 4 5])
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1040 (setq w3-horizontal-rule-char 2))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1041 (tty
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1042 (standard-display-g1 1 108) ; ulcorner
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1043 (standard-display-g1 2 113) ; hline
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1044 (standard-display-g1 3 107) ; urcorner
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1045 (standard-display-g1 4 116) ; leftt
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1046 (standard-display-g1 5 110) ; intersection
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1047 (standard-display-g1 6 117) ; rightt
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1048 (standard-display-g1 7 109) ; llcorner
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1049 (standard-display-g1 8 120) ; vline
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1050 (standard-display-g1 11 106) ; lrcorner
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1051 (standard-display-g1 14 118) ; upt
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1052 (standard-display-g1 15 119) ; downt
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1053 (setq w3-table-border-chars [? ? ? 11 ? 2 7 14 ? 3 8 6 1 15 4 5])
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1054 (setq w3-horizontal-rule-char 2))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1055 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1056 (error "Unknown window-system, can't do any better than ascii borders")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1057 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1058
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1059 (defun w3-table-unhack-borders nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1060 (interactive)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1061 (w3-table-excise-hack (buffer-list))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1062 (standard-display-default 1 15)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1063 (setq w3-table-border-chars w3-table-ascii-border-chars)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1064 (setq w3-horizontal-rule-char ?-))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1065
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1066 (defun w3-table-excise-hack (buffs)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1067 "Replace hacked characters with ascii characters in buffers BUFFS.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1068 Should be run before restoring w3-table-border-chars to ascii characters."
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1069 (interactive (list (list (current-buffer))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1070 (let ((inhibit-read-only t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1071 (tr (make-string 16 ? ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1072 (i 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1073 (while (< i (length tr))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1074 (aset tr i i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1075 (setq i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1076 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1077 (while (< i (length w3-table-border-chars))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1078 (if (< (aref w3-table-border-chars i) 16)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1079 (aset tr
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1080 (aref w3-table-border-chars i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1081 (aref w3-table-ascii-border-chars i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1082 (setq i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1083 (mapcar (function (lambda (buf)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1084 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1085 (set-buffer buf)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1086 (if (eq major-mode 'w3-mode)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1087 (translate-region (point-min)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1088 (point-max)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1089 tr)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1090 buffs)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1091
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1092 (defun w3-display-table (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1093 (let* ((dimensions (w3-display-table-dimensions node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1094 (num-cols (max (cadr dimensions) 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1095 (num-rows (max (car dimensions) 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1096 (column-dimensions (caddr dimensions))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1097 (table-width (apply '+ (append column-dimensions (list num-cols 1)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1098 (cond
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1099 ((or (<= (cadr dimensions) 0) (<= (car dimensions) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1100 ;; We have an invalid table
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1101 nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1102 ((assq '*table-autolayout w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1103 ;; 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
1104 (progn (insert-char ?T table-width) (insert "\n")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1105 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1106 (let* ((tag (nth 0 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1107 (args (nth 1 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1108 (border-node (cdr-safe (assq 'border args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1109 (border (or w3-display-table-force-borders
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1110 (and border-node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1111 (or (/= 0 (string-to-int border-node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1112 (string= "border" border-node)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1113 (w3-table-border-chars
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1114 (if border
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1115 w3-table-border-chars
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1116 (make-vector (length w3-table-border-chars) ? )))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1117 valign align
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1118 (content (nth 2 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1119 (avgwidth (/ (- fill-column num-cols num-cols) num-cols))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1120 (formatted-cols (make-vector num-cols nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1121 (table-rowspans (make-vector num-cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1122 (table-colspans (make-vector num-cols 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1123 (prev-colspans (make-vector num-cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1124 (prev-rowspans (make-vector num-cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1125 (table-colwidth (make-vector num-cols 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1126 (fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1127 (height nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1128 (cur-height nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1129 (cols nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1130 (rows nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1131 (row 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1132 (this-rectangle nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1133 (i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1134 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1135
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1136 (push (cons tag args) w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1137
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1138 (if (memq 'nowrap w3-display-whitespace-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1139 (setq fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1140 (case (car w3-display-alignment-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1141 (center
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1142 (w3-set-fill-prefix-length
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1143 (max 0 (/ (- fill-column table-width) 2))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1144 (right
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1145 (w3-set-fill-prefix-length
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1146 (max 0 (- fill-column table-width))))
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 fill-prefix ""))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1149 (while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1150 (case (caar content)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1151 (tr
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1152 (setq w3-display-css-properties (css-get
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1153 (nth 0 (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1154 (nth 1 (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1155 w3-current-stylesheet
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1156 w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1157 (setq cols (nth 2 (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1158 valign (or (cdr-safe (assq 'valign (nth 1 (car content))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1159 (w3-get-style-info 'vertical-align node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1160 align (or (cdr-safe (assq 'align (nth 1 (car content))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1161 (w3-get-style-info 'text-align node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1162 content (cdr content)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1163 row (1+ row))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1164 (if (and valign (stringp valign))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1165 (setq valign (intern (downcase valign))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1166 ;; this is iffy
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1167 ;;(if align (push (intern (downcase align)) w3-display-alignment-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1168 (save-excursion
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1169 (save-restriction
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1170 (narrow-to-region (point) (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1171 (setq fill-column avgwidth
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1172 inhibit-read-only t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1173 w3-last-fill-pos (point-min)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1174 i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1175 ;; skip over columns that have leftover content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1176 (while (and (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1177 (/= 0 (aref table-rowspans i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1178 (setq i (+ i (max 1 (aref table-colspans i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1179 (while cols
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1180 (let* ((node (car cols))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1181 (attributes (nth 1 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1182 (colspan (string-to-int
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1183 (or (cdr-safe (assq 'colspan attributes))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1184 "1")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1185 (rowspan (string-to-int
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1186 (or (cdr-safe (assq 'rowspan attributes))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1187 "1")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1188 fill-column column-width
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1189 (fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1190 (w3-do-incremental-display nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1191 (indent-tabs-mode nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1192 c e
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1193 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1194
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1195 (aset table-colspans i colspan)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1196 (aset table-rowspans i rowspan)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1197
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1198 (setq fill-column 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1199 (setq c i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1200 e (+ i colspan))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1201 (while (< c e)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1202 (setq fill-column (+ fill-column
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1203 (aref column-dimensions c)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1204 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1205 c (1+ c)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1206 (setq fill-column (1- fill-column))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1207 (aset table-colwidth i fill-column)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1208
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1209 (setq w3-last-fill-pos (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1210 (push (cons (nth 0 node) (nth 1 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1211 w3-display-open-element-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1212 (w3-display-node node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1213 (setq fill-column (aref table-colwidth i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1214 (if w3-display-table-cut-words-p
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1215 (w3-display-table-cut))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1216 (setq cols (cdr cols))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1217 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1218 (skip-chars-forward "\t\n\r")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1219 (beginning-of-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1220 (delete-region (point-min) (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1221 (goto-char (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1222 (skip-chars-backward " \t\n\r")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1223 (delete-region (point) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1224 (if (>= fill-column (current-column))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1225 (insert-char ? (- fill-column (current-column))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1226 (aset formatted-cols i (extract-rectangle (point-min) (point-max)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1227 (delete-region (point-min) (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1228 (let ((j (1- colspan)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1229 (while (> j 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1230 (aset table-colspans (+ i j) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1231 (setq j (1- j))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1232 (setq i (+ i colspan))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1233 ;; skip over columns that have leftover content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1234 (while (and (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1235 (/= 0 (aref table-rowspans i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1236 (setq i (+ i (max 1 (aref table-colspans i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1237 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1238
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1239 ;; finish off the columns
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1240 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1241 (aset table-colwidth i (aref column-dimensions i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1242 (aset table-colspans i 1)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1243 (setq i (1+ i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1244 (while (and (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1245 (/= 0 (aref table-rowspans i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1246 (setq i (+ i (max 1 (aref table-colspans i))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1247
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1248 ;; on the last row empty any pending rowspans per the rfc
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1249 (if content nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1250 (fillarray table-rowspans 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1251
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1252 ;; Find the tallest rectangle that isn't a rowspanning cell
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1253 (setq height 0
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 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1256 (if (= 1 (aref table-rowspans i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1257 (setq height (max height (length (aref formatted-cols 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
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1260 ;; Make all rectangles the same height
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1261 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1262 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1263 (setq this-rectangle (aref formatted-cols i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1264 (if (> height (length this-rectangle))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1265 (let ((colspan-fill-line
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1266 (make-string (aref table-colwidth i) ? )))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1267 (case valign
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1268 ((center middle)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1269 (aset formatted-cols i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1270 (append (make-list (/ (- height (length this-rectangle)) 2)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1271 colspan-fill-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1272 this-rectangle)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1273 (bottom
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1274 (aset formatted-cols i
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1275 (append (make-list (- height (length this-rectangle))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1276 colspan-fill-line)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1277 this-rectangle))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1278 (setq i (+ i (max 1 (aref table-colspans i)))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1279
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1280
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1281 ;; fix broken colspans (this should only matter on illegal tables)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1282 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1283 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1284 (if (= (aref table-colspans i) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1285 (aset table-colspans i 1))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1286 (setq i (+ i (aref table-colspans i))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1287
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1288 ;; Insert a separator
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1289 (insert fill-prefix)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1290 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1291 (let (rflag bflag tflag lflag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1292 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1293
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1294 (setq rflag (= (aref prev-rowspans i) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1295 (setq bflag (/= (aref table-colspans i) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1296 (setq tflag (/= (aref prev-colspans i) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1297
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1298 (insert (w3-table-lookup-char lflag tflag rflag bflag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1299 (setq lflag t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1300 (cond ((= (aref prev-rowspans i) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1301 (insert-char (w3-table-lookup-char t nil t nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1302 (aref column-dimensions i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1303 (setq i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1304 ((car (aref formatted-cols i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1305 (insert (pop (aref formatted-cols i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1306 (setq lflag nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1307 (setq i (+ i (max (aref table-colspans i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1308 (aref prev-colspans i) 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1309 (t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1310 (insert-char ? (aref table-colwidth i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1311 (setq lflag nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1312 (setq i (+ i (max (aref table-colspans i)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1313 (aref prev-colspans i) 1))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1314 (insert (w3-table-lookup-char lflag (/= row 1) nil t) "\n"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1315
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1316 ;; recalculate height (in case we've shortened a rowspanning cell
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1317 (setq height 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1318 i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1319 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1320 (if (= 1 (aref table-rowspans i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1321 (setq height (max height (length (aref formatted-cols i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1322 (setq i (+ i (max 1 (aref table-colspans i)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1323
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1324 ;; Insert a row back in original buffer
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1325 (while (> height 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1326 (insert fill-prefix (w3-table-lookup-char nil t nil t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1327 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1328 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1329 (if (car (aref formatted-cols i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1330 (insert (pop (aref formatted-cols i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1331 (insert-char ? (aref table-colwidth i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1332 (insert (w3-table-lookup-char nil t nil t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1333 (setq i (+ i (max (aref table-colspans i) 1))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1334 (insert "\n")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1335 ;;(and w3-do-incremental-display (w3-pause))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1336 (setq height (1- height)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1337
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1338 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1339 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1340 (if (> (aref table-rowspans i) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1341 (decf (aref table-rowspans i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1342 (incf i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1343
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1344 (setq prev-rowspans (copy-seq table-rowspans))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1345 (setq prev-colspans (copy-seq table-colspans))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1346
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1347 (and w3-do-incremental-display (w3-pause))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1348
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1349 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1350 (caption
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1351 (let ((left (length fill-prefix))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1352 (fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1353 (fill-column table-width)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1354 (start (point)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1355 (w3-display-node (pop content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1356 (indent-rigidly start (point) left)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1357 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1358 (delete-horizontal-space)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1359 (setq content (nth 2 (car content))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1360 ))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1361 (if (= (length column-dimensions) 0) nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1362 (insert fill-prefix)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1363 (setq i 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1364 (let (tflag lflag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1365 (while (< i num-cols)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1366 (setq tflag (/= (aref prev-colspans i) 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1367 (insert (w3-table-lookup-char lflag tflag t nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1368 (setq lflag t)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1369 (insert-char (w3-table-lookup-char t nil t nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1370 (aref column-dimensions i))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1371 (setq i (1+ i)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1372 (insert (w3-table-lookup-char t t nil nil) "\n")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1373 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1374 (pop w3-display-open-element-stack)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1375
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1376
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1377
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1378 (defun w3-display-create-unique-id ()
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1379 (let* ((date (current-time-string))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1380 (dateinfo (and date (timezone-parse-date date)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1381 (timeinfo (and date (timezone-parse-time (aref dateinfo 3)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1382 (if (and dateinfo timeinfo)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1383 (concat (aref dateinfo 0) ; Year
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1384 (aref dateinfo 1) ; Month
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1385 (aref dateinfo 2) ; Day
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1386 (aref timeinfo 0) ; Hour
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1387 (aref timeinfo 1) ; Minute
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1388 (aref timeinfo 2) ; Second
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1389 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1390 "HoplesSLYCoNfUSED")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1391
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1392 (defun w3-display-node (node &optional nofaces)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1393 (let (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1394 (content-stack (list (list node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1395 (right-margin-stack (list fill-column))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1396 (left-margin-stack (list 0))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1397 node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1398 insert-before
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1399 insert-after
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1400 tag
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1401 args
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1402 content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1403 hyperlink-info
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1404 break-style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1405 cur
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1406 id
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1407 class
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1408 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1409 (while content-stack
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1410 (setq content (pop content-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1411 (pop w3-active-faces)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1412 (pop w3-active-voices)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1413 (case (car (pop w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1414 ;; Any weird, post-display-of-content stuff for specific tags
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1415 ;; 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
1416 ;; are iterative. *sigh*
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1417 (a
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1418 (if (not hyperlink-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1419 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1420 (add-text-properties (car hyperlink-info) (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1421 (list
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1422 'mouse-face 'highlight
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1423 'duplicable t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1424 'help-echo 'w3-balloon-help-callback
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1425 'balloon-help 'w3-balloon-help-callback))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1426 (fillin-text-property (car hyperlink-info) (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1427 'button 'button (cadr hyperlink-info))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1428 (widget-put (cadr hyperlink-info) :to (set-marker
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1429 (make-marker) (point))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1430 (setq hyperlink-info nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1431 (form
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1432 (pop w3-display-form-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1433 ((ol ul dl dir menu)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1434 (pop w3-display-list-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1435 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1436 nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1437 (if (car insert-after)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1438 (w3-handle-string-content (car insert-after)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1439 (pop insert-after)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1440 (w3-display-handle-end-break)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1441 (w3-pop-all-face-info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1442 ;; Handle the element's content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1443 (while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1444 (if (stringp (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1445 (w3-handle-string-content (pop content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1446 (setq node (pop content)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1447 tag (nth 0 node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1448 args (nth 1 node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1449 id (or (w3-get-attribute 'name)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1450 (w3-get-attribute 'id))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1451 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1452 ;; This little bit of magic takes care of inline styles.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1453 ;; Evil Evil Evil, but it appears to work.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1454 (if (w3-get-attribute 'style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1455 (let ((unique-id (or (w3-get-attribute 'id)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1456 (w3-display-create-unique-id)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1457 (sheet ""))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1458 (setq sheet (format "%s.%s { %s }\n" tag unique-id
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1459 (w3-get-attribute 'style)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1460 (setf (nth 1 node) (cons (cons 'id unique-id) args))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1461 (w3-handle-style (list (cons 'data sheet)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1462 (cons 'notation "css")))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1463 (setq w3-display-css-properties (css-get
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1464 (nth 0 node) (nth 1 node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1465 w3-current-stylesheet
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1466 w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1467 (if nofaces
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1468 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1469 (push (w3-face-for-element node) w3-active-faces)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1470 (push (w3-voice-for-element node) w3-active-voices))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1471 (push (w3-get-style-info 'display node) break-style)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1472 (push (w3-get-style-info 'insert-after node) insert-after)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1473 (setq insert-before (w3-get-style-info 'insert-before node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1474 (w3-display-handle-break)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1475 (if (w3-node-visible-p)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1476 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1477 (setq insert-before nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1478 tag '*invisible)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1479 (setcar insert-after nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1480 (if insert-before
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1481 (w3-handle-string-content insert-before))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1482 (setq insert-before nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1483 (if id
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1484 (setq w3-id-positions (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1485 (cons (intern id)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1486 (set-marker (make-marker)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1487 (point-max)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1488 w3-id-positions)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1489 (case tag
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1490 (a ; Hyperlinks
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1491 (let* (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1492 (title (w3-get-attribute 'title))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1493 (name (or (w3-get-attribute 'id)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1494 (w3-get-attribute 'name)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1495 (btdt nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1496 class
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1497 (before nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1498 (after nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1499 (face nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1500 (voice nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1501 (st nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1502 (setq st (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1503 hyperlink-info (list
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1504 st
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1505 (append
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1506 (list 'link :args nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1507 :value "" :tag ""
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1508 :action 'w3-follow-hyperlink
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1509 :from
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1510 (set-marker (make-marker) st)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1511 :help-echo 'w3-widget-echo
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1512 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1513 (alist-to-plist args))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1514 (w3-handle-content node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1515 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1516 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1517 ((ol ul dl dir menu)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1518 (push 0 w3-display-list-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1519 (w3-handle-content node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1520 (img ; inlined image
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1521 (w3-handle-image)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1522 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1523 (script ; Scripts
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1524 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1525 ((embed object) ; Embedded images/content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1526 (w3-handle-content node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1527 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1528 (hr ; Cause line break & insert rule
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1529 (let* ((perc (or (w3-get-attribute 'width)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1530 (w3-get-style-info 'width node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1531 "100%"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1532 (rule nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1533 (width nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1534 (setq perc (/ (min (string-to-int perc) 100) 100.0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1535 width (* fill-column perc)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1536 rule (make-string (max (truncate width) 0)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1537 w3-horizontal-rule-char)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1538 node (list 'hr nil (list rule)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1539 (w3-handle-content node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1540 (map ; Client side imagemaps
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1541 (let ((name (or (w3-get-attribute 'name)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1542 (w3-get-attribute 'id)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1543 "unnamed"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1544 (areas
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1545 (mapcar
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1546 (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1547 (lambda (node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1548 (let* ((args (nth 1 node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1549 (type (downcase (or
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1550 (w3-get-attribute 'shape)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1551 "rect")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1552 (coords (w3-decode-area-coords
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1553 (or (cdr-safe
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1554 (assq 'coords args)) "")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1555 (alt (w3-get-attribute 'alt))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1556 (href (if (assq 'nohref args)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1557 t
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1558 (or (w3-get-attribute 'src)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1559 (w3-get-attribute 'href))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1560 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1561 (vector type coords href alt))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1562 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1563 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1564 (nth 2 node))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1565 (setq w3-imagemaps (cons (cons name areas) w3-imagemaps)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1566 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1567 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1568 (table ; Yeeee-hah!
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1569 (w3-display-table node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1570 (setq w3-last-fill-pos (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1571 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1572 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1573 (isindex
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1574 (let ((prompt (or (w3-get-attribute 'prompt)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1575 "Search on (+ separates keywords): "))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1576 action node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1577 (setq action (or (w3-get-attribute 'src)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1578 (w3-get-attribute 'href)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1579 (url-view-url t)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1580 (if (and prompt (string-match "[^: \t-]+$" prompt))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1581 (setq prompt (concat prompt ": ")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1582 (setq node
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1583 (list 'isindex nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1584 (list
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1585 (list 'hr nil nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1586 (list 'form
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1587 (list (cons 'action action)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1588 (cons 'enctype
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1589 "application/x-w3-isindex")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1590 (cons 'method "get"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1591 (list
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1592 prompt
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1593 (list 'input
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1594 (list (cons 'type "text")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1595 (cons 'name "isindex"))))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1596 (w3-handle-content node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1597 (setq w3-current-isindex (cons action prompt)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1598 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1599 (*document
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1600 (let ((info (mapcar (lambda (x) (cons x (symbol-value x)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1601 w3-persistent-variables)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1602 (set-buffer (generate-new-buffer "Untitled"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1603 (setq w3-current-form-number 0
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1604 w3-display-open-element-stack nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1605 w3-last-fill-pos (point-min)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1606 fill-column (min (- (or w3-strict-width (window-width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1607 w3-right-margin)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1608 (or w3-maximum-line-length
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1609 (window-width))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1610 (switch-to-buffer (current-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1611 (buffer-disable-undo (current-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1612 (mapcar (function (lambda (x) (set (car x) (cdr x)))) info)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1613 ;; ACK! We don't like filladapt mode!
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1614 (set (make-local-variable 'filladapt-mode) nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1615 (set (make-local-variable 'adaptive-fill-mode) nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1616 (setq w3-current-stylesheet (css-copy-stylesheet
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1617 w3-user-stylesheet)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1618 w3-last-fill-pos (point)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1619 fill-column (min (- (or w3-strict-width (window-width))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1620 w3-right-margin)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1621 (or w3-maximum-line-length
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1622 (window-width)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1623 fill-prefix "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1624 (set (make-local-variable 'inhibit-read-only) t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1625 (w3-handle-content node)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1626 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1627 (*invisible
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1628 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1629 (meta
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1630 (let* ((equiv (cdr-safe (assq 'http-equiv args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1631 (value (w3-get-attribute 'content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1632 (name (w3-get-attribute 'name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1633 (node (and equiv (assoc (setq equiv (downcase equiv))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1634 url-current-mime-headers))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1635 (if equiv
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1636 (setq url-current-mime-headers (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1637 (cons equiv value)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1638 url-current-mime-headers)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1639 (if name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1640 (setq w3-current-metainfo (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1641 (cons name value)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1642 w3-current-metainfo)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1643
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1644 ;; Special-case the Set-Cookie header
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1645 (if (and equiv (string= (downcase equiv) "set-cookie"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1646 (url-cookie-handle-set-cookie value))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1647 ;; Special-case the refresh header
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1648 (if (and equiv (string= (downcase equiv) "refresh"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1649 (url-handle-refresh-header value)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1650 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1651 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1652 (link
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1653 ;; This doesn't handle blank-separated values per the RFC.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1654 (w3-parse-link args)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1655 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1656 (title
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1657 (let ((potential-title "")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1658 (content (nth 2 node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1659 (while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1660 (setq potential-title (concat potential-title (car content))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1661 content (cdr content)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1662 (setq potential-title (w3-normalize-spaces potential-title))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1663 (if (string-match "^[ \t]*$" potential-title)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1664 nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1665 (rename-buffer (generate-new-buffer-name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1666 (w3-fix-spaces potential-title)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1667 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1668 (form
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1669 (setq w3-current-form-number (1+ w3-current-form-number))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1670 (let* (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1671 (action (w3-get-attribute 'action))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1672 (url nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1673 (if (not action)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1674 (setq args (cons (cons 'action (url-view-url t)) args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1675 (push (cons
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1676 (cons 'form-number
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1677 w3-current-form-number)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1678 args) w3-display-form-stack)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1679 (w3-handle-content node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1680 (input
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1681 (if (not (assq 'form w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1682 (message "Input field outside of a <form>")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1683 (let* (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1684 (type (intern (downcase (or (w3-get-attribute 'type)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1685 "text"))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1686 (name (w3-get-attribute 'name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1687 (value (or (w3-get-attribute 'value) ""))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1688 (size (if (w3-get-attribute 'size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1689 (string-to-int (w3-get-attribute 'size))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1690 (maxlength (cdr (assoc 'maxlength args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1691 (default value)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1692 (action (car w3-display-form-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1693 (options)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1694 (id (w3-get-attribute 'id))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1695 (checked (assq 'checked args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1696 (if (and (string-match "^[ \t\n\r]+$" value)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1697 (not (eq type 'hidden)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1698 (setq value ""))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1699 (if maxlength (setq maxlength (string-to-int maxlength)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1700 (if (and name (string-match "[\r\n]" name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1701 (setq name (mapconcat (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1702 (lambda (x)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1703 (if (memq x '(?\r ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1704 ""
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1705 (char-to-string x))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1706 name "")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1707 (if (memq type '(checkbox radio)) (setq default checked))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1708 (if (and (eq type 'checkbox) (string= value ""))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1709 (setq value "on"))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1710 (w3-form-add-element type name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1711 value size maxlength default action
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1712 options w3-current-form-number id checked
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1713 (car w3-active-faces))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1714 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1715 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1716 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1717 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1718 (select
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1719 (if (not (assq 'form w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1720 (message "Input field outside of a <form>")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1721 (let* (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1722 (name (w3-get-attribute 'name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1723 (size (string-to-int (or (w3-get-attribute 'size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1724 "20")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1725 (maxlength (cdr (assq 'maxlength args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1726 (value nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1727 (tmp nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1728 (action (car w3-display-form-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1729 (options)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1730 (id (w3-get-attribute 'id))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1731 (checked (assq 'checked args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1732 (if maxlength (setq maxlength (string-to-int maxlength)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1733 (if (and name (string-match "[\r\n]" name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1734 (setq name (mapconcat (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1735 (lambda (x)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1736 (if (memq x '(?\r ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1737 ""
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1738 (char-to-string x))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1739 name "")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1740 (setq options
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1741 (mapcar
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1742 (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1743 (lambda (n)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1744 (setq tmp (w3-normalize-spaces
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1745 (apply 'concat (nth 2 n)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1746 tmp (cons tmp
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1747 (or
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1748 (cdr-safe (assq 'value (nth 1 n)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1749 tmp)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1750 (if (assq 'selected (nth 1 n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1751 (setq value (car tmp)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1752 tmp))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1753 (nth 2 node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1754 (if (not value)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1755 (setq value (caar options)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1756 (w3-form-add-element 'option name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1757 value size maxlength value action
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1758 options w3-current-form-number id nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1759 (car w3-active-faces))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1760 ;; This should really not be necessary, but some versions
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1761 ;; of the widget library leave point _BEFORE_ the menu
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1762 ;; widget instead of after.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1763 (goto-char (point-max))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1764 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1765 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1766 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1767 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1768 (textarea
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1769 (if (not (assq 'form w3-display-open-element-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1770 (message "Input field outside of a <form>")
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1771 (let* (
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1772 (name (w3-get-attribute 'name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1773 (size (string-to-int (or (w3-get-attribute 'size)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1774 "20")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1775 (maxlength (cdr (assq 'maxlength args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1776 (value (w3-normalize-spaces
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1777 (apply 'concat (nth 2 node))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1778 (default value)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1779 (tmp nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1780 (action (car w3-display-form-stack))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1781 (options)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1782 (id (w3-get-attribute 'id))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1783 (checked (assq 'checked args)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1784 (if maxlength (setq maxlength (string-to-int maxlength)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1785 (if (and name (string-match "[\r\n]" name))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1786 (setq name (mapconcat (function
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1787 (lambda (x)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1788 (if (memq x '(?\r ?\n))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1789 ""
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1790 (char-to-string x))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1791 name "")))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1792 (w3-form-add-element 'multiline name
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1793 value size maxlength value action
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1794 options w3-current-form-number id nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1795 (car w3-active-faces))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1796 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1797 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1798 (w3-handle-empty-tag)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1799 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1800 (style
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1801 (w3-handle-style (cons (cons 'data (apply 'concat (nth 2 node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1802 (nth 1 node)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1803 (w3-handle-empty-tag))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1804 (otherwise
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1805 ;; Generic formatting
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1806 (w3-handle-content node))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1807 ) ; case tag
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1808 ) ; stringp content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1809 ) ; while content
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1810 ) ; while content-stack
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1811 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1812 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1813
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1814 (defun w3-draw-tree (tree)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1815 ;; The main entry point - wow complicated
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1816 (setq w3-current-stylesheet w3-user-stylesheet)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1817 (while tree
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1818 (w3-display-node (car tree))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1819 (setq tree (cdr tree)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1820 (w3-display-fix-widgets)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1821 (w3-form-resurrect-widgets))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1822
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1823 (defun time-display (&optional tree)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1824 ;; Return the # of seconds it took to draw 'tree'
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1825 (let ((st (nth 1 (current-time)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1826 (nd nil))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1827 (w3-draw-tree (or tree w3-last-parse-tree))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1828 (setq nd (nth 1 (current-time)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1829 (- nd st)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1830
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1831
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1832 (defun w3-prepare-buffer (&rest args)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1833 ;; The text/html viewer - does all the drawing and displaying of the buffer
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1834 ;; that is necessary to go from raw HTML to a good presentation.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1835 (let* ((source (buffer-string))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1836 (source-buf (current-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1837 (parse (w3-parse-buffer source-buf)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1838 (set-buffer-modified-p nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1839 (w3-draw-tree parse)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1840 (kill-buffer source-buf)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1841 (set-buffer-modified-p nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1842 (setq w3-current-source source
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1843 w3-current-parse parse)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1844 (if (and (boundp 'w3-image-widgets-waiting) w3-image-widgets-waiting)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1845 (let (url glyph widget)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1846 (while w3-image-widgets-waiting
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1847 (setq widget (car w3-image-widgets-waiting)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1848 w3-image-widgets-waiting (cdr w3-image-widgets-waiting)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1849 url (widget-get widget 'src)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1850 glyph (cdr-safe (assoc url w3-graphics-list)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1851 (widget-value-set widget glyph))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1852 (w3-mode)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1853 ;;(w3-handle-annotations)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1854 ;;(w3-handle-headers)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1855 (set-buffer-modified-p nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1856 (goto-char (point-min))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1857 (if url-keep-history
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1858 (let ((url (url-view-url t)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1859 (if (not url-history-list)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1860 (setq url-history-list (make-hash-table :size 131 :test 'equal)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1861 (cl-puthash url (buffer-name) url-history-list)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1862 (if (fboundp 'w3-shuffle-history-menu)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1863 (w3-shuffle-history-menu)))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1864 )
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1865
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents:
diff changeset
1866 (provide 'w3-display)