Mercurial > emacs
annotate lisp/textmodes/xml-lite.el @ 44289:52b704431b5d
Remove redundant name-end attribute.
Simplify parsing by assuming we always start within text.
Make use of sgml-unclosed-tag-p.
author | Mike Williams <mdub@bigfoot.com> |
---|---|
date | Mon, 01 Apr 2002 12:10:53 +0000 |
parents | f259c3857fea |
children | cc29df7efbe8 |
rev | line source |
---|---|
43687 | 1 ;;; xml-lite.el --- an indentation-engine for XML |
2 | |
44187
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
3 ;; Copyright (C) 2002 Free Software Foundation, Inc. |
43687 | 4 |
5 ;; Author: Mike Williams <mdub@bigfoot.com> | |
6 ;; Created: February 2001 | |
7 ;; Keywords: xml | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; This program is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2 of the License, or | |
14 ;; (at your option) any later version. | |
15 ;; | |
16 ;; This program is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 ;; | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
25 | |
26 ;;; Commentary: | |
27 ;; | |
28 ;; This package provides a simple indentation engine for XML. It is | |
29 ;; intended for use in situations where the full power of the popular PSGML | |
30 ;; package (DTD parsing, syntax checking) is not required. | |
31 ;; | |
32 ;; xml-lite is designed to be used in conjunction with the default GNU | |
33 ;; Emacs sgml-mode, to provide a lightweight XML-editing environment. | |
34 | |
35 ;;; Thanks: | |
36 ;; | |
37 ;; Jens Schmidt <Jens.Schmidt@oracle.com> | |
38 ;; for his feedback and suggestions | |
39 | |
40 ;;; Code: | |
41 | |
42 (eval-when-compile (require 'cl)) | |
43 (require 'sgml-mode) | |
44 | |
45 | |
44168
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
46 ;; Syntax analysis |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
47 |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
48 (defsubst xml-lite-at-indentation-p () |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
49 "Return true if point is at the first non-whitespace character on the line." |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
50 (save-excursion |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
51 (skip-chars-backward " \t") |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
52 (bolp))) |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
53 |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
54 |
43687 | 55 ;; Parsing |
44289
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
56 |
43687 | 57 (defstruct (xml-lite-tag |
44289
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
58 (:constructor xml-lite-make-tag (type start end name))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
59 type start end name) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
60 |
43687 | 61 (defsubst xml-lite-parse-tag-name () |
62 "Skip past a tag-name, and return the name." | |
44180
e7a365c909ff
Don't require `custom'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44168
diff
changeset
|
63 (buffer-substring-no-properties |
e7a365c909ff
Don't require `custom'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44168
diff
changeset
|
64 (point) (progn (skip-syntax-forward "w_") (point)))) |
43687 | 65 |
44168
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
66 (defsubst xml-lite-looking-back-at (s) |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
67 (let ((limit (max (- (point) (length s)) (point-min)))) |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
68 (equal s (buffer-substring-no-properties limit (point))))) |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
69 |
44187
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
70 (defsubst xml-lite-looking-at (s) |
44168
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
71 (let ((limit (min (+ (point) (length s))))) |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
72 (equal s (buffer-substring-no-properties (point) limit)))) |
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
73 |
43687 | 74 (defun xml-lite-parse-tag-backward () |
44289
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
75 "Parse an SGML tag backward, and return information about the tag. |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
76 Assume that parsing starts from within a textual context. |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
77 Leave point at the beginning of the tag." |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
78 (let (tag-type tag-start tag-end name) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
79 (search-backward ">") |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
80 (setq tag-end (1+ (point))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
81 (cond |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
82 ((xml-lite-looking-back-at "--") ; comment |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
83 (setq tag-type 'comment |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
84 tag-start (search-backward "<!--" nil t))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
85 ((xml-lite-looking-back-at "]]") ; cdata |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
86 (setq tag-type 'cdata |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
87 tag-start (search-backward "<![CDATA[" nil t))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
88 (t |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
89 (setq tag-start |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
90 (with-syntax-table sgml-tag-syntax-table |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
91 (goto-char tag-end) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
92 (backward-sexp) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
93 (point))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
94 (goto-char (1+ tag-start)) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
95 (case (char-after) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
96 (?! ; declaration |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
97 (setq tag-type 'decl)) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
98 (?? ; processing-instruction |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
99 (setq tag-type 'pi)) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
100 (?/ ; close-tag |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
101 (forward-char 1) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
102 (setq tag-type 'close |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
103 name (xml-lite-parse-tag-name))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
104 ((?% ?#) ; JSP tags etc |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
105 (setq tag-type 'unknown)) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
106 (t ; open or empty tag |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
107 (setq tag-type 'open |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
108 name (xml-lite-parse-tag-name)) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
109 (if (eq ?/ (char-before (- tag-end 1))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
110 (setq tag-type 'empty)))))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
111 (goto-char tag-start) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
112 (xml-lite-make-tag tag-type tag-start tag-end name))) |
43687 | 113 |
114 (defsubst xml-lite-inside-tag-p (tag-info &optional point) | |
115 "Return true if TAG-INFO contains the POINT." | |
116 (let ((end (xml-lite-tag-end tag-info)) | |
117 (point (or point (point)))) | |
118 (or (null end) | |
119 (> end point)))) | |
120 | |
121 (defun xml-lite-get-context (&optional full) | |
122 "Determine the context of the current position. | |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
123 If FULL is `empty', return even if the context is empty (i.e. |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
124 we just skipped over some element and got to a beginning of line). |
43687 | 125 If FULL is non-nil, parse back to the beginning of the buffer, otherwise |
126 parse until we find a start-tag as the first thing on a line. | |
127 | |
128 The context is a list of tag-info structures. The last one is the tag | |
129 immediately enclosing the current position." | |
130 (let ((here (point)) | |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
131 (ignore nil) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
132 (context nil) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
133 tag-info) |
44168
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
134 ;; CONTEXT keeps track of the tag-stack |
44201
2eeb8d7f1161
(xml-lite-in-string-p): Use sgml-lexical-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44189
diff
changeset
|
135 ;; IGNORE keeps track of the nesting level of point relative to the |
2eeb8d7f1161
(xml-lite-in-string-p): Use sgml-lexical-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44189
diff
changeset
|
136 ;; first (outermost) tag on the context. This is the list of |
44168
68fd324f9f0f
(xml-lite-at-indentation-p): Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43687
diff
changeset
|
137 ;; enclosing start-tags we'll have to ignore. |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
138 (skip-chars-backward " \t\n") ; Make sure we're not at indentation. |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
139 (while |
44284
f259c3857fea
Remove redundant remains of xml-lite-mode.
Mike Williams <mdub@bigfoot.com>
parents:
44243
diff
changeset
|
140 (and (or ignore |
f259c3857fea
Remove redundant remains of xml-lite-mode.
Mike Williams <mdub@bigfoot.com>
parents:
44243
diff
changeset
|
141 (not (if full (eq full 'empty) context)) |
44243
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
142 (not (xml-lite-at-indentation-p)) |
44289
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
143 (and context |
44243
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
144 (/= (point) (xml-lite-tag-start (car context))) |
44289
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
145 (sgml-unclosed-tag-p (xml-lite-tag-name (car context))))) |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
146 (setq tag-info (ignore-errors (xml-lite-parse-tag-backward)))) |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
147 |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
148 ;; This tag may enclose things we thought were tags. If so, |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
149 ;; discard them. |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
150 (while (and context |
44284
f259c3857fea
Remove redundant remains of xml-lite-mode.
Mike Williams <mdub@bigfoot.com>
parents:
44243
diff
changeset
|
151 (> (xml-lite-tag-end tag-info) |
f259c3857fea
Remove redundant remains of xml-lite-mode.
Mike Williams <mdub@bigfoot.com>
parents:
44243
diff
changeset
|
152 (xml-lite-tag-end (car context)))) |
f259c3857fea
Remove redundant remains of xml-lite-mode.
Mike Williams <mdub@bigfoot.com>
parents:
44243
diff
changeset
|
153 (setq context (cdr context))) |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
154 |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
155 (cond |
43687 | 156 |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
157 ;; inside a tag ... |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
158 ((xml-lite-inside-tag-p tag-info here) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
159 (push tag-info context)) |
43687 | 160 |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
161 ;; start-tag |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
162 ((eq (xml-lite-tag-type tag-info) 'open) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
163 (cond |
44243
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
164 ((null ignore) |
44289
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
165 (if (and context |
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
166 (sgml-unclosed-tag-p (xml-lite-tag-name tag-info)) |
44243
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
167 (eq t (compare-strings |
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
168 (xml-lite-tag-name tag-info) nil nil |
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
169 (xml-lite-tag-name (car context)) nil nil t))) |
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
170 ;; There was an implicit end-tag. |
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
171 nil |
c3ee131a3ab1
(xml-lite-get-context): Don't stop parsing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44242
diff
changeset
|
172 (push tag-info context))) |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
173 ((eq t (compare-strings (xml-lite-tag-name tag-info) nil nil |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
174 (car ignore) nil nil t)) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
175 (setq ignore (cdr ignore))) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
176 (t |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
177 ;; The open and close tags don't match. |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
178 (if (not sgml-xml-mode) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
179 ;; Assume the open tag is simply not closed. |
44289
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
180 (unless (sgml-unclosed-tag-p (xml-lite-tag-name tag-info)) |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
181 (message "Unclosed tag <%s>" (xml-lite-tag-name tag-info))) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
182 (message "Unmatched tags <%s> and </%s>" |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
183 (xml-lite-tag-name tag-info) (pop ignore)))))) |
43687 | 184 |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
185 ;; end-tag |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
186 ((eq (xml-lite-tag-type tag-info) 'close) |
44289
52b704431b5d
Remove redundant name-end attribute.
Mike Williams <mdub@bigfoot.com>
parents:
44284
diff
changeset
|
187 (if (sgml-empty-tag-p (xml-lite-tag-name tag-info)) |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
188 (message "Spurious </%s>: empty tag" (xml-lite-tag-name tag-info)) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
189 (push (xml-lite-tag-name tag-info) ignore))) |
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
190 )) |
43687 | 191 |
192 ;; return context | |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
193 context)) |
43687 | 194 |
195 (defun xml-lite-show-context (&optional full) | |
196 "Display the current context. | |
197 If FULL is non-nil, parse back to the beginning of the buffer." | |
198 (interactive "P") | |
199 (with-output-to-temp-buffer "*XML Context*" | |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
200 (pp (save-excursion (xml-lite-get-context full))))) |
43687 | 201 |
202 | |
203 ;; Editing shortcuts | |
204 | |
205 (defun xml-lite-insert-end-tag () | |
206 "Insert an end-tag for the current element." | |
207 (interactive) | |
44242
84ff52bf6d2f
(xml-lite-get-context): Allow stopping even with an empty context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44201
diff
changeset
|
208 (let* ((context (save-excursion (xml-lite-get-context))) |
43687 | 209 (tag-info (car (last context))) |
210 (type (and tag-info (xml-lite-tag-type tag-info)))) | |
211 | |
212 (cond | |
213 | |
214 ((null context) | |
215 (error "Nothing to close")) | |
216 | |
217 ;; inside a tag | |
218 ((xml-lite-inside-tag-p tag-info) | |
44187
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
219 (insert (cond |
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
220 ((eq type 'open) " />") |
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
221 ((eq type 'comment) " -->") |
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
222 ((eq type 'cdata) "]]>") |
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
223 ((eq type 'jsp) "%>") |
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
224 ((eq type 'pi) "?>") |
65437de0940f
Fix copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44180
diff
changeset
|
225 (t ">")))) |
43687 | 226 |
227 ;; inside an element | |
228 ((eq type 'open) | |
229 (insert "</" (xml-lite-tag-name tag-info) ">") | |
44180
e7a365c909ff
Don't require `custom'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44168
diff
changeset
|
230 (indent-according-to-mode)) |
43687 | 231 |
232 (t | |
233 (error "Nothing to close"))))) | |
234 | |
235 (defun xml-lite-slash (arg) | |
236 "Insert ARG slash characters. | |
237 Behaves electrically if `xml-lite-electric-slash' is non-nil." | |
238 (interactive "p") | |
239 (cond | |
240 ((not (and (eq (char-before) ?<) (= arg 1))) | |
241 (insert-char ?/ arg)) | |
242 ((eq xml-lite-electric-slash 'indent) | |
243 (insert-char ?/ 1) | |
44180
e7a365c909ff
Don't require `custom'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44168
diff
changeset
|
244 (indent-according-to-mode)) |
43687 | 245 ((eq xml-lite-electric-slash 'close) |
246 (delete-backward-char 1) | |
247 (xml-lite-insert-end-tag)) | |
248 (t | |
249 (insert-char ?/ arg)))) | |
250 | |
251 (provide 'xml-lite) | |
252 | |
253 ;;; xml-lite.el ends here |