annotate lisp/international/utf-7.el @ 111012:2b6e7f137773

Fix the MSDOS build broken by last revisions. msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands. Needed because of changes in revno 101897. msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed because of changes in revno 101876. src/unexcoff.c (make_hdr): Fix prototype according to changes in revno 101757.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 15 Oct 2010 20:45:12 +0200
parents d835100c3e8b
children 417b1e4d63cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
1 ;;; utf-7.el --- utf-7 coding system
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
2
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
3 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
94684
bfec2b1b2136 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
4 ;; Free Software Foundation, Inc.
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
5
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
6 ;; Author: Dave Love <fx@gnu.org>
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
7 ;; Keywords: i18n, mail
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
8
94684
bfec2b1b2136 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
9 ;; This file is part of GNU Emacs.
bfec2b1b2136 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
10
bfec2b1b2136 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
94684
bfec2b1b2136 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
bfec2b1b2136 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; (at your option) any later version.
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
15
94684
bfec2b1b2136 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
20
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
94684
bfec2b1b2136 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
23
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
24 ;;; Commentary:
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
25
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
26 ;; Defines a coding system for UTF-7, defined in RFC 2152. Non-ASCII
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
27 ;; segments are encoded as base64-encoded big endian UTF-16. Also
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
28 ;; defines a variation required for IMAP (RFC 2060).
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
29
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
30 ;; The encoding and decoding was originally taken from Jon K Hellan's
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
31 ;; implementation in Gnus, but has been substantially re-done.
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
32
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
33 ;; This probably needs more attention. In particular, it's not
96376
c3309dba6542 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 95395
diff changeset
34 ;; completely consistent with iconv's behavior. It's arguable
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
35 ;; whether the IMAP version should be a coding system since it's
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
36 ;; apparently only used for IMAP mailbox names, so it's commented out.
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
37
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
38 ;;; Code:
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
39
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
40 (defun utf-7-decode (len imap)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
41 "Decode LEN bytes of UTF-7 at point.
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
42 IMAP non-nil means use the IMAP version."
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
43 (save-excursion
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
44 (save-restriction
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
45 (narrow-to-region (point) (+ (point) len))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
46 (let ((not-esc (if imap "^&" "^+"))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
47 (skip-chars (if imap "A-Za-z0-9+," "A-Za-z0-9+/")))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
48 (while (not (eobp))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
49 (skip-chars-forward not-esc)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
50 (unless (eobp)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
51 (forward-char)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
52 (let ((p (point))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
53 (run-length (skip-chars-forward skip-chars)))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
54 (if (eq ?- (char-after))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
55 (delete-char 1))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
56 (unless (= run-length 0) ; encoded lone esc-char
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
57 (let ((pl (mod (- run-length) 4)))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
58 (insert-char ?= pl)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
59 (if imap
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
60 (subst-char-in-region p (point) ?, ?/))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
61 (base64-decode-region p (point)))
51630
90215b7be64d Adjusted for the name change: xxx-utf-16-{le,be} -> xxx-utf-16{le,be}.
Kenichi Handa <handa@m17n.org>
parents: 50897
diff changeset
62 (decode-coding-region p (point) 'utf-16be)
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
63 (save-excursion
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
64 (goto-char p)
108765
d835100c3e8b Replace Lisp calls to delete-backward-char by delete-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
65 (delete-char -1)))))))
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
66 (- (point-max) (point-min)))))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
67
90250
1c8f24770e68 Delete the definition of utf-7.
Kenichi Handa <handa@m17n.org>
parents: 90200
diff changeset
68 ;;;###autoload
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
69 (defun utf-7-post-read-conversion (len)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
70 (utf-7-decode len nil))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
71
91117
57ad20761f87 (utf-7-imap-post-read-conversion)
Kenichi Handa <handa@m17n.org>
parents: 90996
diff changeset
72 ;;;###autoload
85926
025d69230a9b (utf-7-imap): New coding system.
Kenichi Handa <handa@m17n.org>
parents: 78274
diff changeset
73 (defun utf-7-imap-post-read-conversion (len)
025d69230a9b (utf-7-imap): New coding system.
Kenichi Handa <handa@m17n.org>
parents: 78274
diff changeset
74 (utf-7-decode len t))
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
75
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
76 (defun utf-7-encode (from to imap)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
77 "Encode bytes between FROM and TO to UTF-7.
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
78 ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
79 (let* ((old-buf (current-buffer))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
80 (esc (if imap ?& ?+))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
81 ;; These are characters which can be encoded asis.
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
82 (skip-chars (if imap
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
83 "\t\n\r\x20-\x25\x27-\x7e" ; rfc2060
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
84 ;; This includes the rfc2152 optional set.
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
85 ;; Perhaps it shouldn't (like iconv).
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
86 "\t\n\r -*,-[]-}"))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
87 (not-skip-chars (format "^%s%c" skip-chars esc)))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
88 (set-buffer (generate-new-buffer " *temp*"))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
89 (if (stringp from)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
90 (insert from)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
91 (insert-buffer-substring old-buf from to))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
92 (goto-char (point-min))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
93 (while (not (eobp))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
94 (skip-chars-forward skip-chars)
95395
a374273bf2a5 (utf-7-encode): Use the right escape char depending on imap/nonimap encoding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94684
diff changeset
95 (if (eq esc (char-after))
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
96 (progn (forward-char)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
97 (insert ?-))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
98 (unless (eobp)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
99 (insert esc)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
100 (let ((p (point)))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
101 (skip-chars-forward not-skip-chars)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
102 (save-restriction
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
103 ;; encode-coding-region doesn't preserve point
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
104 (narrow-to-region p (point))
51630
90215b7be64d Adjusted for the name change: xxx-utf-16-{le,be} -> xxx-utf-16{le,be}.
Kenichi Handa <handa@m17n.org>
parents: 50897
diff changeset
105 (encode-coding-region p (point-max) 'utf-16be)
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
106 (base64-encode-region p (point-max))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
107 (if imap
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
108 (subst-char-in-region p (point-max) ?/ ?,))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
109 (goto-char p)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
110 ;; As I read the RFC, this isn't correct, but it's
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
111 ;; consistent with iconv, at least regarding `='.
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
112 (skip-chars-forward "^= \t\n")
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
113 (delete-region (point) (point-max))))
80235
58e18c83bf75 (utf-7-encode): Never skip the trailing - for the `imap' variant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79709
diff changeset
114 ;; RFC2060 stipulates that all names MUST end in US-ASCII (i.e.
58e18c83bf75 (utf-7-encode): Never skip the trailing - for the `imap' variant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79709
diff changeset
115 ;; a name that ends with a Unicode octet MUST end with a "-").
58e18c83bf75 (utf-7-encode): Never skip the trailing - for the `imap' variant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79709
diff changeset
116 (if (or imap (not (eobp)))
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
117 (insert ?-)))))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
118 nil))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
119
90250
1c8f24770e68 Delete the definition of utf-7.
Kenichi Handa <handa@m17n.org>
parents: 90200
diff changeset
120 ;;;###autoload
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
121 (defun utf-7-pre-write-conversion (from to)
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
122 (utf-7-encode from to nil))
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
123
91117
57ad20761f87 (utf-7-imap-post-read-conversion)
Kenichi Handa <handa@m17n.org>
parents: 90996
diff changeset
124 ;;;###autoload
85926
025d69230a9b (utf-7-imap): New coding system.
Kenichi Handa <handa@m17n.org>
parents: 78274
diff changeset
125 (defun utf-7-imap-pre-write-conversion (from to)
025d69230a9b (utf-7-imap): New coding system.
Kenichi Handa <handa@m17n.org>
parents: 78274
diff changeset
126 (utf-7-encode from to t))
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
127
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
128 (provide 'utf-7)
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51630
diff changeset
129
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92360
diff changeset
130 ;; arch-tag: 975ee403-90a4-4286-97d2-4ed1323f4ef9
50897
289523dd4fa7 *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
131 ;;; utf-7.el ends here