Commit 6d8cf830 authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

Merged from miles@gnu.org--gnu-2005 (patch 593-595)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-593
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-594
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-595
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-425
parents 734b6791 6507c4c7
2005-10-11 Sven Joachim <svenjoac@gmx.de> 2005-10-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* toolbar/diropen.xpm, toolbar/diropen.pbm: New versions made from
Gnome file-manager.png. Suggested by
Joachim Nilsson <joachim.nilsson@vmlinux.org>.
* toolbar/README: Add diropen.xpm.
2005-10-13 Bill Wohler <wohler@newt.com>
* makefile.w32-in (MH_E_SRC): Rename from MH-E-SRC per NMAKE
restrictions. Suggested by David Robinow <drobinow@gmail.com>.
2005-10-13 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/mixal-mode.el (mixal-operation-codes-alist):
Don't waste the byte-compiler's time on constant data.
2005-10-13 Kenichi Handa <handa@m17n.org>
* international/utf-8.el (utf-8-compose): Display an invalid UTF-8
byte with `escape-glyph' face.
* international/fontset.el (ccl-encode-unicode-font):
Lookup utf-subst-table-for-encode, not ucs-mule-cjk-to-unicode.
Handle the case that ucs-mule-to-mule-unicode translates a character to
ASCII (usually for IPA characters).
2005-10-12 Bill Wohler <wohler@newt.com>
* makefile.w32-in (MH-E-SRC): New. Used by mh-autoloads.
(mh-autoloads): New. Builds mh-e/mh-loaddefs.el. Rebuilds if any
files in MH-E-SRC have been updated.
(updates, compile, recompile, bootstrap): Depend on mh-autoloads.
2005-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/mixal-mode.el (mixal-operation-codes): Remove.
(mixal-mode-syntax-table): Add \n as end-comment.
(mixal-operation-codes-alist): Immediately initialize to full value.
(mixal-add-operation-code): Remove.
(mixal-describe-operation-code): Make the arg non-optional.
Use the interactive spec instead.
Use mixal-operation-codes-alist rather than mixal-operation-codes.
(mixal-font-lock-keywords): Don't highlight comments here any more.
(mixal-font-lock-syntactic-keywords): New var.
(mixal-mode): Use it. Fix comment-start-skip.
2005-10-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* startup.el (command-line-x-option-alist): -nb => -nbi
2005-10-12 Kim F. Storm <storm@cua.dk>
* startup.el (fancy-splash-default-action): Discard mouse click in
the spash screen window, as it has no sensible meaning in the
next window to be selected. Fixes error reported by Jan D.
2005-10-12 Reiner Steib <Reiner.Steib@gmx.de>
* desktop.el (desktop-load-file): Do nothing when FUNCTION is nil.
2005-10-11 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/mixal-mode.el: Sync with version in the GNU MDK project.
Try to fix up minor layout issues like indentation, line break, etc...
(mixal-mode-syntax-table): Don't try to specify comment syntax,
because it doesn't work.
(mixal-operation-codes): Add some more codes.
(mixal-font-lock-keywords): Process comments here.
(mixal-mode): mixasm no longer needs -g option.
2005-10-11 Sven Joachim <svenjoac@gmx.de> (tiny change)
* progmodes/sh-script.el (sh-tmp-file): * progmodes/sh-script.el (sh-tmp-file):
Use mktemp -t. Finish support for es and rc shells. Use mktemp -t. Finish support for es and rc shells.
...@@ -798,7 +870,7 @@ ...@@ -798,7 +870,7 @@
color rxvt terminals by using the code xterm.el used to use before color rxvt terminals by using the code xterm.el used to use before
2005-04-09 in order to match the colors used by rxvt. 2005-04-09 in order to match the colors used by rxvt.
2005-09-24 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change) 2005-09-24 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
* term/rxvt.el (rxvt-register-default-colors): Add support for 88 * term/rxvt.el (rxvt-register-default-colors): Add support for 88
colors rxvt-unicode terminals by using the same code as xterm.el. colors rxvt-unicode terminals by using the same code as xterm.el.
...@@ -5940,8 +6012,8 @@ ...@@ -5940,8 +6012,8 @@
* log-view.el (log-view-file, log-view-message): Remove "-face" * log-view.el (log-view-file, log-view-message): Remove "-face"
suffix from face names. suffix from face names.
(log-view-file-face, log-view-message-face): New (log-view-file-face, log-view-message-face):
backward-compatibility aliases for renamed faces. New backward-compatibility aliases for renamed faces.
(log-view-file-face, log-view-message-face): Use renamed log-view (log-view-file-face, log-view-message-face): Use renamed log-view
faces. faces.
...@@ -5961,8 +6033,8 @@ ...@@ -5961,8 +6033,8 @@
(ruler-mode-margins-face, ruler-mode-fringes-face) (ruler-mode-margins-face, ruler-mode-fringes-face)
(ruler-mode-column-number-face, ruler-mode-fill-column-face) (ruler-mode-column-number-face, ruler-mode-fill-column-face)
(ruler-mode-comment-column-face, ruler-mode-goal-column-face) (ruler-mode-comment-column-face, ruler-mode-goal-column-face)
(ruler-mode-tab-stop-face, ruler-mode-current-column-face): New (ruler-mode-tab-stop-face, ruler-mode-current-column-face):
backward-compatibility aliases for renamed faces. New backward-compatibility aliases for renamed faces.
(ruler-mode-pad, ruler-mode-margins, ruler-mode-fringes) (ruler-mode-pad, ruler-mode-margins, ruler-mode-fringes)
(ruler-mode-column-number, ruler-mode-fill-column) (ruler-mode-column-number, ruler-mode-fill-column)
(ruler-mode-comment-column, ruler-mode-goal-column) (ruler-mode-comment-column, ruler-mode-goal-column)
...@@ -6085,8 +6157,7 @@ ...@@ -6085,8 +6157,7 @@
* comint.el (comint-check-proc, make-comint-in-buffer) * comint.el (comint-check-proc, make-comint-in-buffer)
(comint-source-default): Doc fixes. (comint-source-default): Doc fixes.
* term.el (term-send-string): Improve argument/docstring * term.el (term-send-string): Improve argument/docstring consistency.
consistency.
2005-06-09 Luc Teirlinck <teirllm@auburn.edu> 2005-06-09 Luc Teirlinck <teirllm@auburn.edu>
...@@ -6203,12 +6274,11 @@ ...@@ -6203,12 +6274,11 @@
XEmacs code. XEmacs code.
(flyspell-word): Minor simplification. (flyspell-word): Minor simplification.
(flyspell-math-tex-command-p): Quieten the byte-compiler. (flyspell-math-tex-command-p): Quieten the byte-compiler.
(flyspell-external-point-words): Remove unused vars `size' and (flyspell-external-point-words): Remove unused vars `size' and `start'.
`start'. (flyspell-do-correct): Rename from flyspell-xemacs-correct.
(flyspell-do-correct): Rename from flyspell-xemacs-correct. Merge Merge the corresponding Emacs code.
the corresponding Emacs code. (flyspell-correct-word, flyspell-xemacs-popup):
(flyspell-correct-word, flyspell-xemacs-popup): Use Use flyspell-do-correct.
flyspell-do-correct.
* emacs-lisp/debug.el (debug): Don't bury the buffer unless it's in * emacs-lisp/debug.el (debug): Don't bury the buffer unless it's in
a dedicated window. a dedicated window.
...@@ -6247,8 +6317,7 @@ ...@@ -6247,8 +6317,7 @@
Add a completion-base-size-function property. Add a completion-base-size-function property.
* simple.el (completion-setup-function): Look for * simple.el (completion-setup-function): Look for
completion-base-size-function property of completion-base-size-function property of minibuffer-completion-table.
minibuffer-completion-table.
* files.el (locate-file-completion): Doc fix. * files.el (locate-file-completion): Doc fix.
......
...@@ -963,10 +963,11 @@ directory DIRNAME." ...@@ -963,10 +963,11 @@ directory DIRNAME."
(defun desktop-load-file (function) (defun desktop-load-file (function)
"Load the file where auto loaded FUNCTION is defined." "Load the file where auto loaded FUNCTION is defined."
(let ((fcell (symbol-function function))) (when function
(when (and (listp fcell) (let ((fcell (symbol-function function)))
(eq 'autoload (car fcell))) (when (and (listp fcell)
(load (cadr fcell))))) (eq 'autoload (car fcell)))
(load (cadr fcell))))))
;; ---------------------------------------------------------------------------- ;; ----------------------------------------------------------------------------
;; Create a buffer, load its file, set its mode, ...; ;; Create a buffer, load its file, set its mode, ...;
......
...@@ -3666,23 +3666,23 @@ the variable `Info-file-list-for-emacs'." ...@@ -3666,23 +3666,23 @@ the variable `Info-file-list-for-emacs'."
((equal tag "Up") Info-up-link-keymap)))))) ((equal tag "Up") Info-up-link-keymap))))))
(when Info-use-header-line (when Info-use-header-line
(goto-char (point-min)) (goto-char (point-min))
(let ((header-end (line-end-position)) (let* ((header-end (line-end-position))
header) (header
;; If we find neither Next: nor Prev: link, show the entire ;; If we find neither Next: nor Prev: link, show the entire
;; node header. Otherwise, don't show the File: and Node: ;; node header. Otherwise, don't show the File: and Node:
;; parts, to avoid wasting precious space on information that ;; parts, to avoid wasting precious space on information that
;; is available in the mode line. ;; is available in the mode line.
(if (re-search-forward (if (re-search-forward
"\\(next\\|up\\|prev[ious]*\\): " "\\(next\\|up\\|prev[ious]*\\): "
header-end t) header-end t)
(progn (progn
(goto-char (match-beginning 1)) (goto-char (match-beginning 1))
(setq header (buffer-substring (point) header-end))) (buffer-substring (point) header-end))
(if (re-search-forward "node:[ \t]*[^ \t]+[ \t]*" header-end t) (if (re-search-forward "node:[ \t]*[^ \t]+[ \t]*"
(setq header header-end t)
(concat "No next, prev or up links -- " (concat "No next, prev or up links -- "
(buffer-substring (point) header-end))) (buffer-substring (point) header-end))
(setq header (buffer-substring (point) header-end)))) (buffer-substring (point) header-end)))))
(put-text-property (point-min) (1+ (point-min)) (put-text-property (point-min) (1+ (point-min))
'header-line 'header-line
(replace-regexp-in-string (replace-regexp-in-string
...@@ -3698,9 +3698,15 @@ the variable `Info-file-list-for-emacs'." ...@@ -3698,9 +3698,15 @@ the variable `Info-file-list-for-emacs'."
;; Fontify titles ;; Fontify titles
(goto-char (point-min)) (goto-char (point-min))
(when not-fontified-p (when (and font-lock-mode not-fontified-p)
(while (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*\\*+\\|==+\\|--+\\|\\.\\.+\\)$" (while (and (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*\\*+\\|==+\\|--+\\|\\.\\.+\\)$"
nil t) nil t)
;; Only consider it as an underlined title if the ASCII
;; underline has the same size as the text. A typical
;; counter example is when a continuation "..." is alone
;; on a line.
(= (- (match-end 1) (match-beginning 1))
(- (match-end 2) (match-beginning 2))))
(let* ((c (preceding-char)) (let* ((c (preceding-char))
(face (face
(cond ((= c ?*) 'info-title-1) (cond ((= c ?*) 'info-title-1)
......
...@@ -173,39 +173,42 @@ ...@@ -173,39 +173,42 @@
((if (r2 >= 0) ((if (r2 >= 0)
;; This is a 2D charset. ;; This is a 2D charset.
(r1 = ((r1 << 7) | r2))) (r1 = ((r1 << 7) | r2)))
(lookup-character ucs-mule-cjk-to-unicode r0 r1) (lookup-character utf-subst-table-for-encode r0 r1)
(if r7 (if r7
;; We got it! ;; We got it!
((r1 = (r0 >> 8)) ((r1 = (r0 >> 8))
(r2 = (r0 & #xFF))) (r2 = (r0 & #xFF)))
;; Look for a translation for non-ASCII chars. ;; Look for a translation for non-ASCII chars.
((translate-character ucs-mule-to-mule-unicode r0 r1) ((translate-character ucs-mule-to-mule-unicode r0 r1)
(if (r0 == ,(charset-id 'latin-iso8859-1)) (if (r0 == ,(charset-id 'ascii))
((r2 = (r1 + 128)) ((r2 = r1)
(r1 = 0)) (r1 = 0))
((r2 = (r1 & #x7F)) ((if (r0 == ,(charset-id 'latin-iso8859-1))
(r1 >>= 7) ((r2 = (r1 + 128))
(if (r0 == ,(charset-id 'mule-unicode-0100-24ff)) (r1 = 0))
((r1 *= 96) ((r2 = (r1 & #x7F))
(r1 += r2) (r1 >>= 7)
(r1 += ,(- #x100 (* 32 96) 32)) (if (r0 == ,(charset-id 'mule-unicode-0100-24ff))
(r1 >8= 0) ((r1 *= 96)
(r2 = r7)) (r1 += r2)
(if (r0 == ,(charset-id 'mule-unicode-2500-33ff)) (r1 += ,(- #x100 (* 32 96) 32))
((r1 *= 96) (r1 >8= 0)
(r1 += r2) (r2 = r7))
(r1 += ,(- #x2500 (* 32 96) 32)) (if (r0 == ,(charset-id 'mule-unicode-2500-33ff))
(r1 >8= 0) ((r1 *= 96)
(r2 = r7)) (r1 += r2)
(if (r0 == ,(charset-id 'mule-unicode-e000-ffff)) (r1 += ,(- #x2500 (* 32 96) 32))
((r1 *= 96) (r1 >8= 0)
(r1 += r2) (r2 = r7))
(r1 += ,(- #xe000 (* 32 96) 32)) (if (r0 == ,(charset-id 'mule-unicode-e000-ffff))
(r1 >8= 0) ((r1 *= 96)
(r2 = r7)) (r1 += r2)
;; No way, use the glyph for U+FFFD. (r1 += ,(- #xe000 (* 32 96) 32))
((r1 = #xFF) (r1 >8= 0)
(r2 = #xFD))))))))))))) (r2 = r7))
;; No way, use the glyph for U+FFFD.
((r1 = #xFF)
(r2 = #xFD)))))))))))))))
"Encode characters for display with iso10646 font. "Encode characters for display with iso10646 font.
Translate through the translation-hash-table named Translate through the translation-hash-table named
`ucs-mule-cjk-to-unicode' and the translation-table named `ucs-mule-cjk-to-unicode' and the translation-table named
......
...@@ -934,7 +934,8 @@ Move point to the end of the sequence." ...@@ -934,7 +934,8 @@ Move point to the end of the sequence."
'help-echo 'utf-8-help-echo) 'help-echo 'utf-8-help-echo)
(if (= l 2) (if (= l 2)
(put-text-property (point) (min (point-max) (+ l (point))) (put-text-property (point) (min (point-max) (+ l (point)))
'display (format "\\%03o" ch)) 'display (propertize (format "\\%03o" ch)
'face 'escape-glyph))
(compose-region (point) (+ l (point)) ?$,3u=(B)) (compose-region (point) (+ l (point)) ?$,3u=(B))
(forward-char l)) (forward-char l))
(forward-char 1)))) (forward-char 1))))
......
...@@ -176,7 +176,7 @@ update-subdirs-SH: doit ...@@ -176,7 +176,7 @@ update-subdirs-SH: doit
$(srcdir)/update-subdirs $$file; \ $(srcdir)/update-subdirs $$file; \
done; done;
updates: update-subdirs autoloads finder-data custom-deps updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
# Update the AUTHORS file. # Update the AUTHORS file.
...@@ -207,7 +207,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) ...@@ -207,7 +207,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
# compiled find the right files. # compiled find the right files.
# Need separate version for sh and native cmd.exe # Need separate version for sh and native cmd.exe
compile: subdirs.el compile-$(SHELLTYPE) doit compile: subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
compile-CMD: compile-CMD:
# -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g # -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
...@@ -282,9 +282,47 @@ compile-after-backup: backup-compiled-files compile-always ...@@ -282,9 +282,47 @@ compile-after-backup: backup-compiled-files compile-always
# Note that this doesn't create .elc files. It only recompiles if an # Note that this doesn't create .elc files. It only recompiles if an
# .elc is present. # .elc is present.
recompile: doit recompile: mh-autoloads doit
$(emacs) -f batch-byte-recompile-directory $(lisp) $(emacs) -f batch-byte-recompile-directory $(lisp)
# Update MH-E internal autoloads. These are not to be confused with
# the autoloads for the MH-E entry points, which are already in
# loaddefs.el.
MH_E_SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el \
$(lisp)/mh-e/mh-comp.el $(lisp)/mh-e/mh-customize.el \
$(lisp)/mh-e/mh-e.el $(lisp)/mh-e/mh-funcs.el \
$(lisp)/mh-e/mh-mime.el $(lisp)/mh-e/mh-pick.el \
$(lisp)/mh-e/mh-print.el $(lisp)/mh-e/mh-inc.el \
$(lisp)/mh-e/mh-init.el $(lisp)/mh-e/mh-index.el \
$(lisp)/mh-e/mh-identity.el $(lisp)/mh-e/mh-junk.el \
$(lisp)/mh-e/mh-seq.el $(lisp)/mh-e/mh-speed.el \
$(lisp)/mh-e/mh-utils.el
mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
$(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
echo ";;" >> $@
echo ";;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc." >> $@
echo ";;; Author: Bill Wohler <wohler@newt.com>" >> $@
echo ";;; Keywords: mail" >> $@
echo ";;; Commentary:" >> $@
echo ";;; Change Log:" >> $@
echo ";;; Code:" >> $@
$(EMACS) $(EMACSOPT) \
-l autoload \
--eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
--eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
--eval "(setq make-backup-files nil)" \
-f batch-update-autoloads $(lisp)/mh-e
echo " " >> $@
echo "(provide 'mh-loaddefs)" >> $@
echo ";;; Local Variables:" >> $@
echo ";;; version-control: never" >> $@
echo ";;; no-byte-compile: t" >> $@
echo ";;; no-update-autoloads: t" >> $@
echo ";;; End:" >> $@
echo ";;; mh-loaddefs.el ends here" >> $@
# Prepare a bootstrap in the lisp subdirectory. # Prepare a bootstrap in the lisp subdirectory.
# #
# Build loaddefs.el to make sure it's up-to-date. If it's not, that # Build loaddefs.el to make sure it's up-to-date. If it's not, that
...@@ -316,7 +354,7 @@ bootstrap-clean-SH: ...@@ -316,7 +354,7 @@ bootstrap-clean-SH:
# When done, remove bootstrap-emacs from ../bin, so that # When done, remove bootstrap-emacs from ../bin, so that
# it will not be mistaken for an installed binary. # it will not be mistaken for an installed binary.
bootstrap: update-subdirs autoloads compile finder-data custom-deps bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps
- $(DEL) $(EMACS) - $(DEL) $(EMACS)
# #
......
mh-autoloads.el
mh-loaddefs.el mh-loaddefs.el
This diff is collapsed.
...@@ -128,7 +128,7 @@ This is normally copied from `default-directory' when Emacs starts.") ...@@ -128,7 +128,7 @@ This is normally copied from `default-directory' when Emacs starts.")
("-bg" 1 x-handle-switch background-color) ("-bg" 1 x-handle-switch background-color)
("-background" 1 x-handle-switch background-color) ("-background" 1 x-handle-switch background-color)
("-ms" 1 x-handle-switch mouse-color) ("-ms" 1 x-handle-switch mouse-color)
("-nb" 0 x-handle-switch icon-type nil) ("-nbi" 0 x-handle-switch icon-type nil)
("-iconic" 0 x-handle-iconic) ("-iconic" 0 x-handle-iconic)
("-xrm" 1 x-handle-xrm-switch) ("-xrm" 1 x-handle-xrm-switch)
("-cr" 1 x-handle-switch cursor-color) ("-cr" 1 x-handle-switch cursor-color)
...@@ -1232,7 +1232,13 @@ This is an internal function used to turn off the splash screen after ...@@ -1232,7 +1232,13 @@ This is an internal function used to turn off the splash screen after
the user caused an input event by hitting a key or clicking with the the user caused an input event by hitting a key or clicking with the
mouse." mouse."
(interactive) (interactive)
(push last-command-event unread-command-events) (if (and (consp last-command-event)
(eq (posn-window (event-start last-command-event))
(selected-window)))
;; This is a mouse-down event in the spash screen window.
;; Ignore it and consume the corresponding mouse-up event.
(read-event)
(push last-command-event unread-command-events))
(throw 'exit nil)) (throw 'exit nil))
......
...@@ -7,4 +7,6 @@ The following icons are from GTK+ 2.x: ...@@ -7,4 +7,6 @@ The following icons are from GTK+ 2.x:
back_arrow.xpm and fwd_arrow.xpm are slightly modified undo and redo. back_arrow.xpm and fwd_arrow.xpm are slightly modified undo and redo.
diropen.xpm is file-manager.png from Gnome hicolor theme.
They are not part of Emacs, but distributed and used by Emacs. They are not part of Emacs, but distributed and used by Emacs.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
/* XPM */ /* XPM */
static char * diropen_xpm[] = { static char * diropen_xpm[] = {
"24 24 188 2", "19 24 17 1",
" c None", " c None",
". c #000000", ". c #000100",
"+ c #010100", "+ c #C6C9A6",
"@ c #B5B8A5", "@ c #D0D3AF",
"# c #E4E7D2", "# c #93997C",
"$ c #878A76", "$ c #E6E7D0",
"% c #33342B", "% c #BEC19E",
"& c #0B0B0B", "& c #B4B895",
"* c #E2E5CF", "* c #A7AA88",
"= c #CFD4AF", "= c #6B6D59",
"- c #CED3AE", "- c #4A4E40",
"; c #B2B696", "; c #7C8166",
"> c #2D2D25", "> c #898E72",
", c #23241D", ", c #3C4032",
"' c #9D9F90", "' c #575845",
") c #C6CAA6", ") c #34332C",
"! c #C4C9A5", "! c #24231D",
"~ c #C6CBA7", " ............... ",
"{ c #C7CCA8", " .+@@@@@@@@@@@@@#. ",
"] c #C9CEA9", ".$@@@@@@@@@@@@@@@#.",
"^ c #555847", ".++++%%%%%%%%%&&&*.",
"/ c #1A1B15", ".&&&&&&&&&&******#.",
"( c #20201A", ".*%+++%%%%%%%%%&=#.",
"_ c #D4D6C2", ".*+***********##-#.",
": c #BEC2A0", ".*+****;===;####-#.",
"< c #B3B896", ".*+****=*****###-#.",
"[ c #B0B595", ".*+****;*****###-#.",
"} c #B3B797", ".*+****########>-#.",
"| c #B6BB99", ".*&######>>>>>>>,>.",
"1 c #BBC09E", ".*#-------------'>)",
"2 c #BCC19F", ".*&&&&&&&&&&&&&*#>)",
"3 c #81856C", ".*&************#'>)",
"4 c #3E3F32", ".*&***********##,>)",
"5 c #010101", ".*&****====;###>,>)",
"6 c #DADDC8", ".#&****=**#**##>,;)",
"7 c #AFB494", ".#&****>****###>,;)",
"8 c #AAAF8F", ".#&****########>,;)",
"9 c #A3A789", ".##''''''''''''',;)",
"0 c #A6AA8B", ".#>==============;)",
"a c #A9AD8E", ".''''''''''''''''-!",
"b c #A7AB8D", " ................. "};
"c c #A4A88A",
"d c #A1A588",
"e c #AAAD96",
"f c #B3B5A5",
"g c #B8BBAA",
"h c #BABCAB",
"i c #40413B",
"j c #CACDBB",
"k c #BABDA8",
"l c #0C0C09",
"m c #DDDFCB",
"n c #969B7E",
"o c #9DA286",
"p c #95987C",
"q c #96997E",
"r c #9A9D81",
"s c #999D80",
"t c #9DA184",
"u c #A5AA8B",
"v c #A4A98A",
"w c #A3A889",
"x c #A2A588",
"y c #33352B",
"z c #9B9E83",
"A c #898D74",
"B c #D8DBC9",
"C c #84866E",
"D c #7D8169",
"E c #151612",
"F c #D7DAC9",
"G c #797D67",
"H c #3D3F34",
"I c #E0E0D9",
"J c #EBEDDD",
"K c #E8EBD9",
"L c #D8DBCA",
"M c #1A1A18",
"N c #0A0A09",
"O c #6E7067",
"P c #8D8F84",
"Q c #4A4B45",
"R c #2C2D29",
"S c #4B4C46",
"T c #E7EAD8",
"U c #E3E6D4",
"V c #DEE1D0",
"W c #DADCCC",
"X c #DADCD1",
"Y c #2B2C28",
"Z c #D7DAC6",
"` c #6F735E",
" . c #0D0D0D",
".. c #F4F4EC",
"+. c #606251",
"@. c #92957B",
"#. c #4A4C3E",
"$. c #434438",
"%. c #CACFAB",
"&. c #C6CBA8",
"*. c #C2C6A4",
"=. c #ABB091",
"-. c #23251E",