Mercurial > emacs
view lisp/international/utf-7.el @ 51195:3cbf29813eea
(struct frame): Rename members height to text_lines,
width to text_cols, window_height to total_lines, window_width to
total_cols, new_height to new_text_lines, new_width to
new_text_cols. All uses changed.
(struct frame): New members which consolidate common members of
x_output, w32_output, and mac_output structures: left_pos,
top_pos, pixel_height, pixel_width, x_pixels_diff, y_pixels_diff,
win_gravity, size_hint_flags, border_width, internal_border_width,
line_height, fringe_cols, left_fringe_width, right_fringe_width,
want_fullscreen. All uses changed.
(struct frame): New member column_width contaning the canonical
column width, analogue to line_height. All uses changed.
(struct frame): Rename members scroll_bar_pixel_width to
config_scroll_bar_width, and scroll_bar_cols to
config_scroll_bar_cols. All uses changed.
(struct frame): New member scroll_bar_actual_width which
consolidates and renames the vertical_scroll_bar_extra member of
x_output, w32_output, and mac_output structures. All uses changed.
(FRAME_PIXEL_HEIGHT): Renamed from PIXEL_HEIGHT and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_height.
(FRAME_PIXEL_WIDTH): Renamed from PIXEL_WIDTH and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_width.
(FRAME_LINES): Renamed from FRAME_HEIGHT. All uses changed.
Also change code which referred to f->height.
(FRAME_COLS): Renamed from FRAME_WIDTH. All uses changed.
Also change code which referred to f->width.
(FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
to update new_text_lines and new_text_cols members directly.
(FRAME_CONFIG_SCROLL_BAR_WIDTH): Renamed from
FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed.
(FRAME_CONFIG_SCROLL_BAR_COLS): Renamed from
FRAME_SCROLL_BAR_COLS. All uses changed.
(FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
Renamed from FRAME_LEFT_SCROLL_BAR_WIDTH and
FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed.
(FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
(FRAME_TOTAL_COLS): Renamed from FRAME_WINDOW_WIDTH.
(SET_FRAME_COLS): Renamed from SET_FRAME_WIDTH.
(FRAME_TOTAL_COLS_ARG): Renamed from FRAME_WINDOW_WIDTH_ARG.
(WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
(WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
(FRAME_LINE_HEIGHT): Renamed from CANON_Y_UNIT. Unconditionally
return line_height member (it now has proper value also for
non-window frames).
(FRAME_COLUMN_WIDTH): Renamed from CANON_X_UNIT. Unconditionally
return new column_width member (rather than the default font width).
(FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
(FRAME_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_... and moved
from x/w32/macterm.h files. Unconditionally return corresponding
member of frame structure (they now have proper values also for
non-window frames).
(FRAME_TOTAL_FRINGE_WIDTH): Renamed from FRAME_FRINGE_WIDTH.
Calculate return value from left and right widths.
(FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
internal_border_width member (has proper value for non-window frame).
(FRAME_PIXEL_X_FROM_CANON_X): Renamed from PIXEL_X_FROM_CANON_X.
(FRAME_PIXEL_Y_FROM_CANON_Y): Renamed from PIXEL_Y_FROM_CANON_Y.
(FRAME_CANON_X_FROM_PIXEL_X): Renamed from CANON_X_FROM_PIXEL_X.
(FRAME_CANON_Y_FROM_PIXEL_Y): Renamed from CANON_Y_FROM_PIXEL_Y.
(FRAME_LINE_TO_PIXEL_Y): Renamed from CHAR_TO_PIXEL_ROW,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_COL_TO_PIXEL_X): Renamed from CHAR_TO_PIXEL_COL,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Renamed from
CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
(FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Renamed from
CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
(FRAME_PIXEL_Y_TO_LINE): Renamed from PIXEL_TO_CHAR_ROW
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_X_TO_COL): Renamed from PIXEL_TO_CHAR_COL
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Renamed from
PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
(FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Renamed from
PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 21:58:07 +0000 |
parents | 289523dd4fa7 |
children | 90215b7be64d |
line wrap: on
line source
;;; utf-7.el --- utf-7 coding system ;; Copyright (C) 2003 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n, mail ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; This file is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; Defines a coding system for UTF-7, defined in RFC 2152. Non-ASCII ;; segments are encoded as base64-encoded big endian UTF-16. Also ;; defines a variation required for IMAP (RFC 2060). ;; The encoding and decoding was originally taken from Jon K Hellan's ;; implementation in Gnus, but has been substantially re-done. ;; This probably needs more attention. In particular, it's not ;; completely consistent with iconv's behaviour. It's arguable ;; whether the IMAP version should be a coding system since it's ;; apparently only used for IMAP mailbox names, so it's commented out. ;;; Code: (make-coding-system 'utf-7 0 ?U "UTF-7 encoding of Unicode (RFC 2152)" nil `((safe-chars . ,(coding-system-get 'utf-16-be 'safe-chars)) (mime-charset . utf-7) (pre-write-conversion . utf-7-pre-write-conversion) (post-read-conversion . utf-7-post-read-conversion))) ;; (make-coding-system ;; 'utf-7-imap 0 ?u ;; "UTF-7 encoding of Unicode, IMAP version (RFC 2060)" ;; nil ;; `((safe-chars . ,(coding-system-get 'utf-16-be 'safe-chars)) ;; (pre-write-conversion . utf-7-imap-pre-write-conversion) ;; (post-read-conversion . utf-7-imap-post-read-conversion))) (defun utf-7-decode (len imap) "Decode LEN bytes of UTF-7 at point. IMAP non-nil means use the IMAP version." (save-excursion (save-restriction (narrow-to-region (point) (+ (point) len)) (let ((not-esc (if imap "^&" "^+")) (skip-chars (if imap "A-Za-z0-9+," "A-Za-z0-9+/"))) (while (not (eobp)) (skip-chars-forward not-esc) (unless (eobp) (forward-char) (let ((p (point)) (run-length (skip-chars-forward skip-chars))) (if (eq ?- (char-after)) (delete-char 1)) (unless (= run-length 0) ; encoded lone esc-char (let ((pl (mod (- run-length) 4))) (insert-char ?= pl) (if imap (subst-char-in-region p (point) ?, ?/)) (base64-decode-region p (point))) (decode-coding-region p (point) 'utf-16-be) (save-excursion (goto-char p) (delete-backward-char 1))))))) (- (point-max) (point-min))))) (defun utf-7-post-read-conversion (len) (utf-7-decode len nil)) ;; (defun utf-7-imap-post-read-conversion (len) ;; (utf-7-decode len t)) (defun utf-7-encode (from to imap) "Encode bytes between FROM and TO to UTF-7. ESC and SKIP-CHARS are adjusted for the normal and IMAP versions." (let* ((old-buf (current-buffer)) (esc (if imap ?& ?+)) ;; These are characters which can be encoded asis. (skip-chars (if imap "\t\n\r\x20-\x25\x27-\x7e" ; rfc2060 ;; This includes the rfc2152 optional set. ;; Perhaps it shouldn't (like iconv). "\t\n\r -*,-[]-}")) (not-skip-chars (format "^%s%c" skip-chars esc))) (set-buffer (generate-new-buffer " *temp*")) (if (stringp from) (insert from) (insert-buffer-substring old-buf from to)) (goto-char (point-min)) (while (not (eobp)) (skip-chars-forward skip-chars) (if (eq ?+ (char-after)) (progn (forward-char) (insert ?-)) (unless (eobp) (insert esc) (let ((p (point))) (skip-chars-forward not-skip-chars) (save-restriction ;; encode-coding-region doesn't preserve point (narrow-to-region p (point)) (encode-coding-region p (point-max) 'utf-16-be) (base64-encode-region p (point-max)) (if imap (subst-char-in-region p (point-max) ?/ ?,)) (goto-char p) ;; As I read the RFC, this isn't correct, but it's ;; consistent with iconv, at least regarding `='. (skip-chars-forward "^= \t\n") (delete-region (point) (point-max)))) (unless (eobp) (insert ?-))))) nil)) (defun utf-7-pre-write-conversion (from to) (utf-7-encode from to nil)) ;; (defun utf-7-imap-pre-write-conversion (from to) ;; (utf-7-encode from to t)) (provide 'utf-7) ;;; utf-7.el ends here