4 files changed, 23 insertions, 12 deletions
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 954e177f..6d1b1352 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -20,7 +20,8 @@ NORMALFILES=\
   tty.tmac tty-char.tmac latin1.tmac \
   X.tmac Xps.tmac \
   lj4.tmac \
-  html.tmac mwww.tmac www.tmac \
+  html.tmac mwww.tmac www.tmac color-html.tmac \
+  color.tmac \
   eqnrc \
   troffrc troffrc-end \
   hyphen.us
diff --git a/tmac/troffrc b/tmac/troffrc
index c4cfa20f..dd5597db 100644
--- a/tmac/troffrc
+++ b/tmac/troffrc
@@ -1,6 +1,8 @@
 .\" Startup file for troff.
+.
 .\" This is tested by pic.
 .nr 0p 0
+.
 .\" Use .do here, so that it works with -C.
 .\" The groff command defines the .X string if the -X option was given.
 .ie r.X .do ds troffrc!ps Xps.tmac
@@ -21,10 +23,18 @@
 .	do mso \*[troffrc!\*[.T]]
 .do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
 troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
-.ie '\*(.T'cp1047' .do tr \[char65]
-.el .do tr \[char160]
+.
+.\" now load up the color definitions
+.do if '\*[.T]'html'  .do mso color-html.tmac
+.do if !'\*[.T]'html' .do mso color.tmac
+.
+.ie '\*(.T'cp1047' .do tr \[char65]\~
+.el .do tr \[char160]\~
+.
 .\" Set the hyphenation language to `us'.
 .do hla us
+.
 .\" Load hyphenation patterns from `hyphen.us' (in the tmac directory).
 .do hpf hyphen.us
+.
 .\" Don't let blank lines creep in here.
diff --git a/tmac/troffrc-end b/tmac/troffrc-end
index f786059d..928c923d 100644
--- a/tmac/troffrc-end
+++ b/tmac/troffrc-end
@@ -1,14 +1,13 @@
-.\"
 .\" final startup file for troff
+.
 .\" this file is parsed after all macro sets have been read
-.\"
+.
 .do if '\*[.T]'html' .do mso html.tmac
+.
 .\" if we are running the postscript device for html images then load www.tmac
-.\"
 .do if r ps4html     .do mso www.tmac
-.\"
+.
 .\" for all other devices blank out these macros
-.\"
 .do if !d HTML-IMAGE-INLINE .do ds HTML-IMAGE-INLINE
 .do if !d HTML-IMAGE        .do ds HTML-IMAGE
 .do if !d HTML-IMAGE-RIGHT  .do ds HTML-IMAGE-RIGHT
@@ -16,4 +15,5 @@
 .do if !d HTML-IMAGE-END    .do ds HTML-IMAGE-END
 .do if !d HTML-TAG          .do ds HTML-TAG
 .do if !d HTML-DO-IMAGE     .do ds HTML-DO-IMAGE
+.
 .\" Don't let blank lines creep in here.
diff --git a/tmac/www.tmac b/tmac/www.tmac
index 0bef6b60..004c351a 100644
--- a/tmac/www.tmac
+++ b/tmac/www.tmac
@@ -46,7 +46,7 @@
 .    HTML <a href="\\$2">\\$1</a>\\$3
 .  \}
 .  el \{\
-\\$1 \%\(la\fC\\$2\fP\(ra\\$3
+\m[blue]\\$1\mP \%\(la\fC\\$2\fP\(ra\\$3
 .  \}
 ..
 .\"
@@ -58,7 +58,7 @@
 .    HTML <a href=\\$2>\\$1</a>\\$3
 .  \}
 .  el \{\
-\\$1 \%\(la\fC\\$2\fP\(ra\\$3
+\m[blue]\\$1\mP \%\(la\fC\\$2\fP\(ra\\$3
 .  \}
 ..
 .\"
@@ -87,10 +87,10 @@
 .  \}
 .  el \{\
 .    ie '\\$2'' \{\
-\fC\\$1\fP\\$3
+\m[blue]\fC\\$1\fP\mP\\$3
 .    \}
 .    el \{\
-\\$2 \%\(la\fC\\$1\fP\(ra\\$3
+\m[blue]\\$2\mP \%\(la\fC\\$1\fP\(ra\\$3
 .    \}
 .  \}
 ..