*** empty log message ***

2 files changed, 639 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff250d9a607..492ef6015e7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2000-09-17  Dave Love  <fx@gnu.org>
 
+        * international/latin1-disp.el: New file.
+
         * calendar/cal-move.el (scroll-calendar-left)
         (scroll-calendar-right): Make arg optional (for active mode line).
 
diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
new file mode 100644
index 00000000000..94d8e08f1a9
--- /dev/null
+++ b/lisp/international/latin1-disp.el
@@ -0,0 +1,637 @@
+;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*- coding: emacs-mule -*-
+
+;; Copyright (C) 2000 Free Software Foundation, Inc.
+
+;; Author: Dave Love <fx@gnu.org>
+;; Keywords: i18n
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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:
+
+;; This package sets up display of ISO 8859-n for n>1 by substituting
+;; Latin-1 characters and sequences of them for characters which can't
+;; be displayed, either beacuse we're on a tty or beacuse we don't
+;; have the relevant window system fonts available.  For instance,
+;; Latin-9 is very similar to Latin-1, so we can display most Latin-9
+;; characters using the Latin-1 characters at the same code point and
+;; fall back on more-or-less mnemonic ASCII sequences for the rest.
+
+;; For the Latin charsets the ASCII sequences are mostly consistent
+;; with the Quail prefix input sequences.  Latin-4 uses the Quail
+;; postfix sequences as a prefix method isn't defined for Latin-4.
+
+;; A different approach is taken in the DOS display tables in
+;; term/internal.el, and the relevant ASCII sequences from there are
+;; available as an alternative; see `latin1-display-mnemonic'.  Only
+;; these sequences are used for Cyrillic, Greek and Hebrew.
+
+;; If you don't even have Latin-1, see iso-ascii.el and use the
+;; complete tables from internal.el.  The ASCII sequences used here
+;; are mostly in the same style as iso-ascii.
+
+;;; Code:
+
+(defconst latin1-display-sets '(latin-2 latin-3 latin-4 latin-5 latin-8
+                                latin-9 cyrillic greek hebrew)
+  "The ISO8859 character sets with defined Latin-1 display sequences.
+These are the nicknames for the sets and correspond to Emacs language
+environments.")
+
+(defgroup latin1-display ()
+  "Set up display tables for ISO8859 characters using Latin-1."
+  :version "21.1"
+  :group 'i18n)
+
+(defcustom latin1-display-format "{%s}"
+  "A format string used to display the ASCII sequences.
+The default encloses the sequence in braces, but you could just use
+\"%s\" to avoid the braces."
+  :group 'latin1-display
+  :type 'string)
+
+;;;###autoload
+(defcustom latin1-display nil
+  "Set up Latin-1/ASCII display for ISO8859 character sets.
+This is done for each character set in the list `latin1-display-sets',
+if no font is available to display it.  Characters are displayed using
+the corresponding Latin-1 characters where they match.  Otherwise
+ASCII sequences are used, mostly following the Latin prefix input
+methods.  Some different ASCII sequences are used if
+`latin1-display-mnemonic' is non-nil.
+
+Setting this variable directly does not take effect;
+use either M-x customize of the function `latin1-display'."
+  :group 'latin1-display
+  :type 'boolean
+  :require 'latin1-disp
+  :initialize 'custom-initialize-default
+  :set (lambda (symbol value)
+         (if value
+             (mapc (if value
+                       #'latin1-display-setup
+                     #'latin1-display-reset)
+                   latin1-display-sets))))
+
+;;;###autoload
+(defun latin1-display (&rest sets)
+  "Set up Latin-1/ASCII display for the arguments character SETS.
+See option `latin1-display' for the method.  The members of the list
+must be in `latin1-display-sets'.  With no arguments, reset the
+display for all of `latin1-display-sets'. See also `latin1-display-setup'."
+  (if sets
+      (mapc #'latin1-display-setup sets)
+    (mapc #'latin1-display-reset latin1-display-sets)))
+
+(defcustom latin1-display-mnemonic nil
+  "Non-nil means to display potentially more mnemonic sequences.
+These are taken from the tables in `internal.el' rather than the Quail
+input sequences."
+  :type 'boolean
+  :group 'latin1-display)
+
+(defun latin1-display-char (char display &optional alt-display)
+  "Make an entry in `standard-display-table' for CHAR using string DISPLAY.
+If ALT-DISPLAY is provided, use that instead if
+`latin1-display-mnemonic' is non-nil.  The actual string displayed is
+formatted using `latin1-display-format'."
+  (if (and (stringp alt-display)
+           latin1-display-mnemonic)
+      (setq display alt-display))
+  (if (stringp display)
+      (standard-display-ascii char (format latin1-display-format display))
+    (aset standard-display-table char display)))
+
+(defun latin1-display-identities (charset)
+  "Display each character in CHARSET as the corresponding Latin-1 character.
+CHARSET is a symbol naming a language environment using an ISO8859
+character set."
+  (if (eq charset 'cyrillic)
+      (setq charset 'cyrillic-iso))
+  (let ((i 32)
+        (set (car (remq 'ascii (get-language-info charset 'charset)))))
+    (while (<= i 127)
+      (aset standard-display-table
+            (make-char set i)
+            (vector (make-char 'latin-iso8859-1 i)))
+      (setq i (1+ i)))))
+
+(defun latin1-display-reset (language)
+  "Set up the default display for each character of LANGUAGE's charset.
+CHARSET is a symbol naming a language environment using an ISO8859
+character set."
+  (if (eq language 'cyrillic)
+      (setq language 'cyrillic-iso))
+  (let ((charset (car (remq 'ascii (get-language-info language
+                                                        'charset)))))
+    (standard-display-default (make-char charset 32)
+                              (make-char charset 127)))
+  (sit-for 0))
+
+;; Is there a better way than this?
+(defun latin1-display-check-font (language)
+  "Return non-nil if we have a font with an encoding for LANGUAGE.
+LANGUAGE is a symbol naming a language environment using an ISO8859
+character set: `latin-2', `hebrew' etc."
+  (if (eq language 'cyrillic)
+      (setq language 'cyrillic-iso))
+  (if window-system
+      (let* ((info (get-language-info language 'charset))
+             (str (symbol-name (car (remq 'ascii info)))))
+        (string-match "-iso8859-[0-9]+\\'" str)
+        (x-list-fonts (concat "*" (match-string 0 str))))))
+
+(defun latin1-display-setup (set &optional force)
+  "Set up Latin-1 display for characters in the given SET.
+SET must be a member of `latin1-display-sets'.  Normally, check
+whether a font for SET is available and don't set the display if it
+is.  If FORCE is non-nil, set up the display regardless."
+  (cond
+   ((eq set 'latin-2)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      (latin1-display-identities set)
+      (mapc
+       (lambda (l)
+         (apply 'latin1-display-char l))
+       '((?�� "'C" "C'")
+         (?�� "'D" "/D")
+         (?�� "'S" "S'")
+         (?�� "'c" "c'")
+         (?�� "'d" "/d")
+         (?�� "'L" "L'")
+         (?�� "'n" "n'")
+         (?�� "'N" "N'")
+         (?�� "'r" "r'")
+         (?�� "'R" "R'")
+         (?�� "'s" "s'")
+         (?�� "'z" "z'")
+         (?�� "'Z" "Z'")
+         (?�� "`A" "A;")
+         (?�� "`E" "E;")
+         (?�� "`L" "/L")
+         (?�� "`S" ",S")
+         (?�� "`T" ",T")
+         (?�� "`Z" "Z^.")
+         (?�� "`a" "a;")
+         (?�� "`l" "/l")
+         (?�� "`e" "e;")
+         (?�� "`s" ",s")
+         (?�� "`t" ",t")
+         (?�� "`z" "z^.")
+         (?�� "`." "'.")
+         (?�� "~A" "A(")
+         (?�� "~C" "C<")
+         (?�� "~D" "D<")
+         (?�� "~E" "E<")
+         (?�� "~e" "e<")
+         (?�� "~L" "L<")
+         (?�� "~N" "N<")
+         (?�� "~O" "O''")
+         (?�� "~R" "R<")
+         (?�� "~S" "S<")
+         (?�� "~T" "T<")
+         (?�� "~U" "U''")
+         (?�� "~Z" "Z<")
+         (?�� "~a" "a(}")
+         (?�� "~c" "c<")
+         (?�� "~d" "d<")
+         (?�� "~l" "l<")
+         (?�� "~n" "n<")
+         (?�� "~o" "o''")
+         (?�� "~r" "r<")
+         (?�� "~s" "s<")
+         (?�� "~t" "t<")
+         (?�� "~u" "u''")
+         (?�� "~z" "z<")
+         (?�� "~v" "'<")                        ; ?�� in latin-pre
+         (?�� "~~" "'(")
+         (?�� "uu" "u^0")
+         (?�� "UU" "U^0")
+         (?�� "\"A")
+         (?�� "\"a")
+         (?�� "\"E" "E:")
+         (?�� "\"e")
+         (?�� "''" "'")
+         (?�� "'<")                     ; Lynx's rendering of caron
+         ))))
+
+   ((eq set 'latin-3)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      (latin1-display-identities set)
+      (mapc
+       (lambda (l)
+         (apply 'latin1-display-char l))
+       '((?�� "/H")
+         (?�� "~`" "'(")
+         (?�� "^H" "H^")
+         (?�� "^h" "h^")         (?�� ".I" "I^.")
+         (?�� ",S")
+         (?�� "~G" "G(")
+         (?�� "^J" "J^")
+         (?�� ".Z" "Z^.")
+         (?�� "/h")
+         (?�� ".i" "i^.")
+         (?�� ",s")
+         (?�� "~g" "g(")
+         (?�� "^j" "j^")
+         (?�� ".Z" "z^.")
+         (?�� ".c" "C^.")
+         (?�� "^C" "C^")
+         (?�� ".G" "G^.")
+         (?�� "^G" "G^")
+         (?�� "~U" "U(")
+         (?�� "^S" "S^")
+         (?�� ".C" "c^.")
+         (?�� "^c" "c^")
+         (?�� ".g" "g^.")
+         (?�� "^g" "g^")
+         (?�� "~u" "u(")
+         (?�� "^s" "s^")
+         (?�� "/." "^.")))))
+
+   ((eq set 'latin-4)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      (latin1-display-identities set)
+      (mapc
+       (lambda (l)
+         (apply 'latin1-display-char l))
+       '((?�� "A," "A;")
+         (?�� "k/" "kk")
+         (?�� "R," ",R")
+         (?�� "I~" "?I")
+         (?�� "L," ",L")
+         (?�� "S~" "S<")
+         (?�� "E-")
+         (?�� "G," ",G")
+         (?�� "T/" "/T")
+         (?�� "Z~" "Z<")
+         (?�� "a," "a;")
+         (?�� "';")
+         (?�� "r," ",r")
+         (?�� "i~" "~i")
+         (?�� "l," ",l")
+         (?�� "'<")
+         (?�� "s~" "s<")
+         (?�� "e-")
+         (?�� "g," ",g")
+         (?�� "t/" "/t")
+         (?�� "N/" "NG")
+         (?�� "z~" "z<")
+         (?�� "n/" "ng")
+         (?�� "A-")
+         (?�� "I," "I;")
+         (?�� "C~" "C<")
+         (?�� "E," "E;")
+         (?�� "E." "E^.")
+         (?�� "I-")
+         (?�� "N," ",N")
+         (?�� "O-")
+         (?�� "K," ",K")
+         (?�� "U," "U;")
+         (?�� "U~" "~U")
+         (?�� "U-")
+         (?�� "a-")
+         (?�� "i," "i;")
+         (?�� "c~" "c<")
+         (?�� "e," "e;")
+         (?�� "e." "e^.")
+         (?�� "i-")
+         (?�� "d/" "/d")
+         (?�� "n," ",n")
+         (?�� "o-")
+         (?�� "k," ",k")
+         (?�� "u," "u;")
+         (?�� "u~" "~u")
+         (?�� "u-")
+         (?�� "^.")))))
+
+   ((eq set 'latin-5)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      (latin1-display-identities set)
+      (mapc
+       (lambda (l)
+         (apply 'latin1-display-char l))
+       '((?�� "~g" "g(")
+         (?�� "~G" "G(")
+         (?�� ".I" "I^.")
+         (?�� ",s")
+         (?�� ",S")
+         (?�� "^e" "e<")                        ; from latin-post
+         (?�� ".e" "e^.")
+         (?�� "\"i" "i-")               ; from latin-post
+         (?�� ".i" "i.")))))
+
+   ((eq set 'latin-8)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      (latin1-display-identities set)
+      (mapc
+       (lambda (l)
+         (apply 'latin1-display-char l))
+       '((?�� ".B" "B`")
+         (?�� ".b" "b`")
+         (?�� ".c" "c`")
+         (?�� ".C" "C`")
+         (?�� ".D" "D`")
+         (?�� ".d" "d`")
+         (?�� "`w")
+         (?�� "`W")
+         (?�� "'w" "w'")
+         (?�� "'W" "W'")
+         (?�� "`y")
+         (?�� "`Y")
+         (?�� ".f" "f`")
+         (?�� ".F" "F`")
+         (?�� ".g" "g`")
+         (?�� ".G" "G`")
+         (?�� ".m" "m`")
+         (?�� ".M" "M`")
+         (?�� ".p" "p`")
+         (?�� ".P" "P`")
+         (?�� ".s" "s`")
+         (?�� ".S" "S`")
+         (?�� "\"w")
+         (?�� "\"W")
+         (?�� "^w" "w^")
+         (?�� "^W" "W^")
+         (?�� ".t" "t`")
+         (?�� ".T" "T`")
+         (?�� "^y" "y^")
+         (?�� "^Y" "Y^")
+         (?�� "\"Y")))))
+
+   ((eq set 'latin-9)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      (latin1-display-identities set)
+      (mapc
+       (lambda (l)
+         (apply 'latin1-display-char l))
+       '((?�� "~s" "s<")
+         (?�� "~S" "S<")
+         (?�� "Euro" "E=")
+         (?�� "~z" "z<")
+         (?�� "~Z" "Z<")
+         (?�� "\"Y")
+         (?�� "oe")
+         (?�� "OE")))))
+
+   ((eq set 'greek)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      (mapc
+       (lambda (l)
+         (apply 'latin1-display-char l))
+       '((?�� "9'")
+         (?�� "'9")
+         (?�� "-M")
+         (?�� "'%")
+         (?�� "'A")
+         (?�� "'E")
+         (?�� "'H")
+         (?�� "'I")
+         (?�� "'O")
+         (?�� "'Y")
+         (?�� "W%")
+         (?�� "i3")
+         (?�� "G*")
+         (?�� "D*")
+         (?�� "TH")
+         (?�� "L*")
+         (?�� "C*")
+         (?�� "P*")
+         (?�� "S*")
+         (?�� "F*")
+         (?�� "Q*")
+         (?�� "W*")
+         (?�� "\"I")
+         (?�� "\"Y")
+         (?�� "a%")
+         (?�� "e%")
+         (?�� "y%")
+         (?�� "i%")
+         (?�� "u3")
+         (?�� "a*")
+         (?�� "b*")
+         (?�� "g*")
+         (?�� "d*")
+         (?�� "e*")
+         (?�� "z*")
+         (?�� "y*")
+         (?�� "h*")
+         (?�� "i*")
+         (?�� "k")
+         (?�� "l*")
+         (?�� "m*")
+         (?�� "n*")
+         (?�� "c*")
+         (?�� "p*")
+         (?�� "r*")
+         (?�� "*s")
+         (?�� "s*")
+         (?�� "t*")
+         (?�� "u")
+         (?�� "f*")
+         (?�� "x*")
+         (?�� "q*")
+         (?�� "w*")
+         (?�� "\"i")
+         (?�� "\"u")
+         (?�� "'o")
+         (?�� "'u")
+         (?�� "'w")))
+      (mapc
+       (lambda (l)
+         (aset standard-display-table (car l) (string-to-vector (cadr l))))
+       '((?�� "A")
+         (?�� "B")
+         (?�� "E")
+         (?�� "Z")
+         (?�� "H")
+         (?�� "I")
+         (?�� "J")
+         (?�� "M")
+         (?�� "N")
+         (?�� "O")
+         (?�� "P")
+         (?�� "T")
+         (?�� "Y")
+         (?�� "X")
+         (?�� "o")))))
+
+   ((eq set 'hebrew)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      ;; Don't start with identities, since we don't have definitions
+      ;; for a lot of Hebrew in internal.el.  (Intlfonts is also
+      ;; missing some glyphs.)
+      (let ((i 34))
+        (while (<= i 62)
+          (aset standard-display-table
+                (make-char 'hebrew-iso8859-8 i)
+                (vector (make-char 'latin-iso8859-1 i)))
+          (setq i (1+ i))))
+      (mapc
+       (lambda (l)
+         (aset standard-display-table (car l) (string-to-vector (cadr l))))
+       '((?�� "=2")
+         (?�� "A+")
+         (?�� "B+")
+         (?�� "G+")
+         (?�� "D+")
+         (?�� "H+")
+         (?�� "W+")
+         (?�� "Z+")
+         (?�� "X+")
+         (?�� "Tj")
+         (?�� "J+")
+         (?�� "K%")
+         (?�� "K+")
+         (?�� "L+")
+         (?�� "M%")
+         (?�� "M+")
+         (?�� "N%")
+         (?�� "N+")
+         (?�� "S+")
+         (?�� "E+")
+         (?�� "P%")
+         (?�� "P+")
+         (?�� "Zj")
+         (?�� "ZJ")
+         (?�� "Q+")
+         (?�� "R+")
+         (?�� "Sh")
+         (?�� "T+")))))
+
+   ((eq set 'cyrillic)
+    (setq set 'cyrillic-iso)
+    (when (or force
+              (not (latin1-display-check-font set)))
+      (mapc
+       (lambda (l)
+         (apply 'latin1-display-char l))
+       '((?�� "Dj")
+         (?�� "Gj")
+         (?�� "IE")
+         (?�� "Lj")
+         (?�� "Nj")
+         (?�� "Ts")
+         (?�� "Kj")
+         (?�� "V%")
+         (?�� "Dzh")
+         (?�� "B=")
+         (?�� "�")
+         (?�� "D")
+         (?�� "Z%")
+         (?�� "3")
+         (?�� "U")
+         (?�� "J=")
+         (?�� "L=")
+         (?�� "P=")
+         (?�� "Y")
+         (?�� "�")
+         (?�� "C=")
+         (?�� "C%")
+         (?�� "S%")
+         (?�� "Sc")
+         (?�� "=\"")
+         (?�� "Y=")
+         (?�� "%\"")
+         (?�� "Ee")
+         (?�� "Yu")
+         (?�� "Ya")
+         (?�� "b")
+         (?�� "v=")
+         (?�� "g=")
+         (?�� "g")
+         (?�� "z%")
+         (?�� "z=")
+         (?�� "u")
+         (?�� "j=")
+         (?�� "k")
+         (?�� "l=")
+         (?�� "m=")
+         (?�� "n=")
+         (?�� "n")
+         (?�� "p")
+         (?�� "t=")
+         (?�� "f=")
+         (?�� "c=")
+         (?�� "c%")
+         (?�� "s%")
+         (?�� "sc")
+         (?�� "='")
+         (?�� "y=")
+         (?�� "%'")
+         (?�� "ee")
+         (?�� "yu")
+         (?�� "ya")
+         (?�� "N0")
+         (?�� "dj")
+         (?�� "gj")
+         (?�� "ie")
+         (?�� "lj")
+         (?�� "nj")
+         (?�� "ts")
+         (?�� "kj")
+         (?�� "v%")
+         (?�� "dzh")))
+      (mapc
+       (lambda (l)
+         (aset standard-display-table (car l) (string-to-vector (cadr l))))
+       '((?�� "��")
+         (?�� "S")
+         (?�� "I")
+         (?�� "��")
+         (?�� "J")
+         (?�� "��")
+         (?�� "��")
+         (?�� "-")
+         (?�� "A")
+         (?�� "B")
+         (?�� "E")
+         (?�� "K")
+         (?�� "M")
+         (?�� "H")
+         (?�� "O")
+         (?�� "P")
+         (?�� "C")
+         (?�� "T")
+         (?�� "X")
+         (?�� "a")
+         (?�� "e")
+         (?�� "o")
+         (?�� "c")
+         (?�� "y")
+         (?�� "x")
+         (?�� "s")
+         (?�� "i")
+         (?�� "��")
+         (?�� "j")))))
+
+   (t (error "Unsupported character set: %S" set)))
+   
+  (sit-for 0))
+
+(provide 'latin1-disp)
+
+;;; latin1-disp.el ends here