(msdos-color-aliases): Define more colors. (msdos-color-translate):

Fix `substring' arguments. Recognize ``medium'' prefix.
author: Richard M. Stallman 1996-06-02 13:47:53 +0000
committer: Richard M. Stallman 1996-06-02 13:47:53 +0000
commit: ec46c6e81e0b7da4bc8a03ade76c13951efb7174 (patch)
tree: ec11bbe6ea5f2733fa5aa8982ff2c5c3a9e0bc60
parent: 8681157ab4560bc43f61c609cf27469e1b414464 (diff)
download: emacs-ec46c6e81e0b7da4bc8a03ade76c13951efb7174.tar.gz
emacs-ec46c6e81e0b7da4bc8a03ade76c13951efb7174.zip
1 files changed, 151 insertions, 30 deletions
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 1b43a72dd7b..18ba27a9a1c 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -26,34 +26,149 @@
 (load "term/internal" nil t)
-;; Color translation -- doesn't really need to be fast
+;; Color translation -- doesn't really need to be fast.
+;; Colors listed here do not include the "light-",
+;; "medium-" and "dark-" prefixes that are accounted for
+;; by `msdos-color-translate', which see below).
 (defvar msdos-color-aliases
-  '(("purple"         . "magenta")
+  '(("snow"             . "white")
-    ("firebrick"      . "red")          ; ?
+    ("ghost white"      . "white")
-    ("pink"           . "lightred")
+    ("ghostwhite"       . "white")
-    ("royalblue"      . "blue")
+    ("white smoke"      . "white")
-    ("cadetblue"      . "blue")
+    ("whitesmoke"       . "white")
-    ("forestgreen"    . "green")
+    ("gainsboro"        . "white")
-    ("darkolivegreen" . "green")
+    ("floral white"     . "white")
-    ("darkgoldenrod"  . "brown")
+    ("floralwhite"      . "white")
-    ("goldenrod"      . "yellow")
+    ("old lace"         . "white")
-    ("grey40"         . "darkgray")
+    ("oldlace"          . "white")
-    ("dark gray"      . "darkgray")
+    ("linen"            . "white")
-    ("light gray"     . "lightgray")
+    ("antique white"    . "white")
-    ("rosybrown"      . "brown")
+    ("antiquewhite"     . "white")
-    ("blue"           . "lightblue")  ;; from here: for Enriched Text
+    ("papaya whip"      . "white")
-    ("darkslategray"  . "darkgray")
+    ("papayawhip"       . "white")
-    ("orange"         . "brown")
+    ("blanched almond"  . "white")
-    ("light blue"     . "lightblue")  ;; from here: for cpp-highlight
+    ("blanchedalmond"   . "white")
-    ("light cyan"     . "lightcyan")
+    ("bisque"           . "white")
-    ("light yellow"   . "yellow")
+    ("peach puff"       . "lightred")
-    ("light pink"     . "lightred")
+    ("peachpuff"        . "lightred")
-    ("pale green"     . "lightgreen")
+    ("navajo white"     . "lightred")
-    ("beige"          . "brown")
+    ("navajowhite"      . "lightred")
-    ("medium purple"  . "magenta")
+    ("moccasin"         . "lightred")
-    ("turquoise"      . "lightgreen")
+    ("cornsilk"         . "white")
-    ("violet"         . "magenta"))
+    ("ivory"            . "white")
+    ("lemon chiffon"    . "yellow")
+    ("lemonchiffon"     . "yellow")
+    ("seashell"         . "white")
+    ("honeydew"         . "white")
+    ("mint cream"       . "white")
+    ("mintcream"        . "white")
+    ("azure"            . "lightcyan")
+    ("alice blue"       . "lightcyan")
+    ("aliceblue"        . "lightcyan")
+    ("lavender"         . "lightcyan")
+    ("lavender blush"   . "lightcyan")
+    ("lavenderblush"    . "lightcyan")
+    ("misty rose"       . "lightred")
+    ("mistyrose"        . "lightred")
+    ("aquamarine"       . "blue")
+    ("cadet blue"       . "blue")
+    ("cadetblue"        . "blue")
+    ("cornflower blue"  . "lightblue")
+    ("cornflowerblue"   . "lightblue")
+    ("midnight blue"    . "blue")
+    ("midnightblue"     . "blue")
+    ("navy blue"        . "cyan")
+    ("navyblue"         . "cyan")
+    ("navy"             . "cyan")
+    ("sky blue"         . "lightblue")
+    ("skyblue"          . "lightblue")
+    ("dodger blue"      . "blue")
+    ("dodgerblue"       . "blue")
+    ("powder blue"      . "lightblue")
+    ("powderblue"       . "lightblue")
+    ("slate blue"       . "cyan")
+    ("slateblue"        . "cyan")
+    ("steel blue"       . "blue")
+    ("steelblue"        . "blue")
+    ("coral"            . "lightred")
+    ("firebrick"        . "red")
+    ("gold"             . "yellow")
+    ("goldenrod"        . "yellow")
+    ("pale goldenrod"   . "yellow")
+    ("palegoldenrod"    . "yellow")
+    ("olive green"      . "lightgreen")
+    ("olivegreen"       . "lightgreen")
+    ("olive drab"       . "green")
+    ("olivedrab"        . "green")
+    ("forest green"     . "green")
+    ("forestgreen"      . "green")
+    ("lime green"       . "lightgreen")
+    ("limegreen"        . "lightgreen")
+    ("sea green"        . "lightcyan")
+    ("seagreen"         . "lightcyan")
+    ("spring green"     . "green")
+    ("springgreen"      . "green")
+    ("pale green"       . "lightgreen")
+    ("palegreen"        . "lightgreen")
+    ("lawn green"       . "lightgreen")
+    ("lawngreen"        . "lightgreen")
+    ("chartreuse"       . "yellow")
+    ("yellow green"     . "lightgreen")
+    ("yellowgreen"      . "lightgreen")
+    ("green yellow"     . "lightgreen")
+    ("greenyellow"      . "lightgreen")
+    ("slate grey"       . "lightgray")
+    ("slategrey"        . "lightgray")
+    ("slate gray"       . "lightgray")
+    ("slategray"        . "lightgray")
+    ("dim grey"         . "darkgray")
+    ("dimgrey"          . "darkgray")
+    ("dim gray"         . "darkgray")
+    ("dimgray"          . "darkgray")
+    ("light grey"       . "lightgray")
+    ("lightgrey"        . "lightgray")
+    ("light gray"       . "lightgray")
+    ("gray"             . "darkgray")
+    ("grey"             . "darkgray")
+    ("gray80"           . "darkgray")
+    ("gray50"           . "black")
+    ("gray90"           . "darkgray")
+    ("khaki"            . "green")
+    ("maroon"           . "red")
+    ("orange"           . "brown")
+    ("orchid"           . "brown")
+    ("saddle brown"     . "red")
+    ("saddlebrown"      . "red")
+    ("sienna"           . "red")
+    ("peru"             . "red")
+    ("pink"             . "lightred")
+    ("plum"             . "magenta")
+    ("indian red"       . "red")
+    ("indianred"        . "red")
+    ("violet red"       . "magenta")
+    ("violetred"        . "magenta")
+    ("orange red"       . "red")
+    ("orangered"        . "red")
+    ("salmon"           .  "lightred")
+    ("sienna"           . "lightred")
+    ("tan"              . "lightred")
+    ("thistle"          . "magenta")
+    ("turquoise"        . "lightgreen")
+    ("pale turquoise"   . "cyan")
+    ("paleturquoise"    . "cyan")
+    ("violet"           . "magenta")
+    ("blue violet"      . "lightmagenta")
+    ("blueviolet"       . "lightmagenta")
+    ("wheat"            . "white")
+    ("green yellow"     . "yellow")
+    ("greenyellow"      . "yellow")
+    ("purple"           . "magenta")
+    ("royalblue"        . "blue")
+    ("grey40"           . "darkgray")
+    ("rosybrown"        . "brown")
+    ("rosy brown"       . "brown")
+    ("beige"            . "brown"))
  "List of alternate names for colors.")
 (defun msdos-color-translate (name)
@@ -67,18 +182,24 @@
        (and (setq try (cdr (assoc name msdos-color-aliases)))
             (msdos-color-translate try))
        (and (> len 5)
-             (string= "light" (substring name 0 4))
+             (string= "light" (substring name 0 5))
             (setq try (msdos-color-translate (substring name 5)))
             (logior try 8))
        (and (> len 6)
-             (string= "light " (substring name 0 5))
+             (string= "light " (substring name 0 6))
             (setq try (msdos-color-translate (substring name 6)))
             (logior try 8))
+        (and (> len 6)
+             (string= "medium" (substring name 0 6))
+             (msdos-color-translate (substring name 6)))
+        (and (> len 7)
+             (string= "medium " (substring name 0 7))
+             (msdos-color-translate (substring name 7)))
        (and (> len 4)
-             (string= "dark" (substring name 0 3))
+             (string= "dark" (substring name 0 4))
             (msdos-color-translate (substring name 4)))
        (and (> len 5)
-             (string= "dark " (substring name 0 4))
+             (string= "dark " (substring name 0 5))
             (msdos-color-translate (substring name 5))))))
 ;; ---------------------------------------------------------------------------
 ;; We want to delay setting frame parameters until the faces are setup
author	Richard M. Stallman	1996-06-02 13:47:53 +0000
committer	Richard M. Stallman	1996-06-02 13:47:53 +0000
commit	ec46c6e81e0b7da4bc8a03ade76c13951efb7174 (patch)
tree	ec11bbe6ea5f2733fa5aa8982ff2c5c3a9e0bc60
parent	8681157ab4560bc43f61c609cf27469e1b414464 (diff)
download	emacs-ec46c6e81e0b7da4bc8a03ade76c13951efb7174.tar.gz emacs-ec46c6e81e0b7da4bc8a03ade76c13951efb7174.zip

diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 1b43a72dd7b..18ba27a9a1c 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el
@@ -26,34 +26,149 @@
26		26
27	(load "term/internal" nil t)	27	(load "term/internal" nil t)
28		28
29	;; Color translation -- doesn't really need to be fast	29	;; Color translation -- doesn't really need to be fast.
		30	;; Colors listed here do not include the "light-",
		31	;; "medium-" and "dark-" prefixes that are accounted for
		32	;; by `msdos-color-translate', which see below).
30		33
31	(defvar msdos-color-aliases	34	(defvar msdos-color-aliases
32	'(("purple" . "magenta")	35	'(("snow" . "white")
33	("firebrick" . "red") ; ?	36	("ghost white" . "white")
34	("pink" . "lightred")	37	("ghostwhite" . "white")
35	("royalblue" . "blue")	38	("white smoke" . "white")
36	("cadetblue" . "blue")	39	("whitesmoke" . "white")
37	("forestgreen" . "green")	40	("gainsboro" . "white")
38	("darkolivegreen" . "green")	41	("floral white" . "white")
39	("darkgoldenrod" . "brown")	42	("floralwhite" . "white")
40	("goldenrod" . "yellow")	43	("old lace" . "white")
41	("grey40" . "darkgray")	44	("oldlace" . "white")
42	("dark gray" . "darkgray")	45	("linen" . "white")
43	("light gray" . "lightgray")	46	("antique white" . "white")
44	("rosybrown" . "brown")	47	("antiquewhite" . "white")
45	("blue" . "lightblue") ;; from here: for Enriched Text	48	("papaya whip" . "white")
46	("darkslategray" . "darkgray")	49	("papayawhip" . "white")
47	("orange" . "brown")	50	("blanched almond" . "white")
48	("light blue" . "lightblue") ;; from here: for cpp-highlight	51	("blanchedalmond" . "white")
49	("light cyan" . "lightcyan")	52	("bisque" . "white")
50	("light yellow" . "yellow")	53	("peach puff" . "lightred")
51	("light pink" . "lightred")	54	("peachpuff" . "lightred")
52	("pale green" . "lightgreen")	55	("navajo white" . "lightred")
53	("beige" . "brown")	56	("navajowhite" . "lightred")
54	("medium purple" . "magenta")	57	("moccasin" . "lightred")
55	("turquoise" . "lightgreen")	58	("cornsilk" . "white")
56	("violet" . "magenta"))	59	("ivory" . "white")
		60	("lemon chiffon" . "yellow")
		61	("lemonchiffon" . "yellow")
		62	("seashell" . "white")
		63	("honeydew" . "white")
		64	("mint cream" . "white")
		65	("mintcream" . "white")
		66	("azure" . "lightcyan")
		67	("alice blue" . "lightcyan")
		68	("aliceblue" . "lightcyan")
		69	("lavender" . "lightcyan")
		70	("lavender blush" . "lightcyan")
		71	("lavenderblush" . "lightcyan")
		72	("misty rose" . "lightred")
		73	("mistyrose" . "lightred")
		74	("aquamarine" . "blue")
		75	("cadet blue" . "blue")
		76	("cadetblue" . "blue")
		77	("cornflower blue" . "lightblue")
		78	("cornflowerblue" . "lightblue")
		79	("midnight blue" . "blue")
		80	("midnightblue" . "blue")
		81	("navy blue" . "cyan")
		82	("navyblue" . "cyan")
		83	("navy" . "cyan")
		84	("sky blue" . "lightblue")
		85	("skyblue" . "lightblue")
		86	("dodger blue" . "blue")
		87	("dodgerblue" . "blue")
		88	("powder blue" . "lightblue")
		89	("powderblue" . "lightblue")
		90	("slate blue" . "cyan")
		91	("slateblue" . "cyan")
		92	("steel blue" . "blue")
		93	("steelblue" . "blue")
		94	("coral" . "lightred")
		95	("firebrick" . "red")
		96	("gold" . "yellow")
		97	("goldenrod" . "yellow")
		98	("pale goldenrod" . "yellow")
		99	("palegoldenrod" . "yellow")
		100	("olive green" . "lightgreen")
		101	("olivegreen" . "lightgreen")
		102	("olive drab" . "green")
		103	("olivedrab" . "green")
		104	("forest green" . "green")
		105	("forestgreen" . "green")
		106	("lime green" . "lightgreen")
		107	("limegreen" . "lightgreen")
		108	("sea green" . "lightcyan")
		109	("seagreen" . "lightcyan")
		110	("spring green" . "green")
		111	("springgreen" . "green")
		112	("pale green" . "lightgreen")
		113	("palegreen" . "lightgreen")
		114	("lawn green" . "lightgreen")
		115	("lawngreen" . "lightgreen")
		116	("chartreuse" . "yellow")
		117	("yellow green" . "lightgreen")
		118	("yellowgreen" . "lightgreen")
		119	("green yellow" . "lightgreen")
		120	("greenyellow" . "lightgreen")
		121	("slate grey" . "lightgray")
		122	("slategrey" . "lightgray")
		123	("slate gray" . "lightgray")
		124	("slategray" . "lightgray")
		125	("dim grey" . "darkgray")
		126	("dimgrey" . "darkgray")
		127	("dim gray" . "darkgray")
		128	("dimgray" . "darkgray")
		129	("light grey" . "lightgray")
		130	("lightgrey" . "lightgray")
		131	("light gray" . "lightgray")
		132	("gray" . "darkgray")
		133	("grey" . "darkgray")
		134	("gray80" . "darkgray")
		135	("gray50" . "black")
		136	("gray90" . "darkgray")
		137	("khaki" . "green")
		138	("maroon" . "red")
		139	("orange" . "brown")
		140	("orchid" . "brown")
		141	("saddle brown" . "red")
		142	("saddlebrown" . "red")
		143	("sienna" . "red")
		144	("peru" . "red")
		145	("pink" . "lightred")
		146	("plum" . "magenta")
		147	("indian red" . "red")
		148	("indianred" . "red")
		149	("violet red" . "magenta")
		150	("violetred" . "magenta")
		151	("orange red" . "red")
		152	("orangered" . "red")
		153	("salmon" . "lightred")
		154	("sienna" . "lightred")
		155	("tan" . "lightred")
		156	("thistle" . "magenta")
		157	("turquoise" . "lightgreen")
		158	("pale turquoise" . "cyan")
		159	("paleturquoise" . "cyan")
		160	("violet" . "magenta")
		161	("blue violet" . "lightmagenta")
		162	("blueviolet" . "lightmagenta")
		163	("wheat" . "white")
		164	("green yellow" . "yellow")
		165	("greenyellow" . "yellow")
		166	("purple" . "magenta")
		167	("royalblue" . "blue")
		168	("grey40" . "darkgray")
		169	("rosybrown" . "brown")
		170	("rosy brown" . "brown")
		171	("beige" . "brown"))
57	"List of alternate names for colors.")	172	"List of alternate names for colors.")
58		173
59	(defun msdos-color-translate (name)	174	(defun msdos-color-translate (name)
@@ -67,18 +182,24 @@
67	(and (setq try (cdr (assoc name msdos-color-aliases)))	182	(and (setq try (cdr (assoc name msdos-color-aliases)))
68	(msdos-color-translate try))	183	(msdos-color-translate try))
69	(and (> len 5)	184	(and (> len 5)
70	(string= "light" (substring name 0 4))	185	(string= "light" (substring name 0 5))
71	(setq try (msdos-color-translate (substring name 5)))	186	(setq try (msdos-color-translate (substring name 5)))
72	(logior try 8))	187	(logior try 8))
73	(and (> len 6)	188	(and (> len 6)
74	(string= "light " (substring name 0 5))	189	(string= "light " (substring name 0 6))
75	(setq try (msdos-color-translate (substring name 6)))	190	(setq try (msdos-color-translate (substring name 6)))
76	(logior try 8))	191	(logior try 8))
		192	(and (> len 6)
		193	(string= "medium" (substring name 0 6))
		194	(msdos-color-translate (substring name 6)))
		195	(and (> len 7)
		196	(string= "medium " (substring name 0 7))
		197	(msdos-color-translate (substring name 7)))
77	(and (> len 4)	198	(and (> len 4)
78	(string= "dark" (substring name 0 3))	199	(string= "dark" (substring name 0 4))
79	(msdos-color-translate (substring name 4)))	200	(msdos-color-translate (substring name 4)))
80	(and (> len 5)	201	(and (> len 5)
81	(string= "dark " (substring name 0 4))	202	(string= "dark " (substring name 0 5))
82	(msdos-color-translate (substring name 5))))))	203	(msdos-color-translate (substring name 5))))))
83	;; ---------------------------------------------------------------------------	204	;; ---------------------------------------------------------------------------
84	;; We want to delay setting frame parameters until the faces are setup	205	;; We want to delay setting frame parameters until the faces are setup