summaryrefslogtreecommitdiff
path: root/tmac/www.tmac
diff options
context:
space:
mode:
Diffstat (limited to 'tmac/www.tmac')
-rw-r--r--tmac/www.tmac32
1 files changed, 15 insertions, 17 deletions
diff --git a/tmac/www.tmac b/tmac/www.tmac
index bd015e07..8358c868 100644
--- a/tmac/www.tmac
+++ b/tmac/www.tmac
@@ -3,25 +3,22 @@
.\" A simple set of macros to provide HTML documents with basic
.\" www functionality. It will work with any macro set.
.\"
-.\" compute the value of '\*(.T'html-old':'\*(.T'html'
-.\" --fixme-- it would be nice to allow logical or with strings
.nr _C \n(.C
.cp 0
-.nr html-or-html-old 0
-.if '\*(.T'html-old' .nr html-or-html-old 1
-.if '\*(.T'html' .nr html-or-html-old 1
+.nr www-html 0
+.if '\*(.T'html' .nr www-html 1
.\"
.\"
.\"
.de HTML
-. if \\n[html-or-html-old] \{\
+. if \\n[www-html] \{\
.\" the following line makes the vertical mode leave, so to say
\&
\X^html:\\$*^
. \}
..
.de HTMLINDEX
-. if \\n[html-or-html-old] \X^index:\\$*^
+. if \\n[www-html] \X^index:\\$*^
..
.\"
.\" BODYCOLOR - $1 is foreground color
@@ -45,7 +42,7 @@
.\" $3 is optional stuff printed immediately after $3
.\"
.de URL
-. ie \\n[html-or-html-old] \{\
+. ie \\n[www-html] \{\
. HTML <a href="\\$2">\\$1</a>\\$3
. \}
. el \{\
@@ -57,7 +54,7 @@
.\" $2 is the ftp url
.\" $3 is optional stuff printed immediately after $2
.de FTP
-. ie \\n[html-or-html-old] \{\
+. ie \\n[www-html] \{\
. HTML <a href=\\$2>\\$1</a>\\$3
. \}
. el \{\
@@ -80,7 +77,7 @@
.\" force reset after a potential heading by performing some motion..
.\" how do we do this --fixme--
.\" \h'\w' ''\h'-\w' '' doesn't work..
-. ie \\n[html-or-html-old] \{\
+. ie \\n[www-html] \{\
. ie '\\$2'' \{\
. HTML "<a href=mailto:\\$1>\\$1</a>\\$3"
. \}
@@ -110,7 +107,7 @@
.\" $3 is the y width (default if absent is the x value)
.\"
.de IMAGE
-. ie \\n[html-or-html-old] \{\
+. ie \\n[www-html] \{\
. nr HTMLWIDTH 400
. if !'\\$2'' \{\
. nr HTMLWIDTH \\$2
@@ -130,7 +127,7 @@
..
.\" HTML-TAG - emit a tag for the new grohtml
.de HTML-TAG
-. if '\*(.T'html' \{\
+. if \\n[www-html] \{\
.\" the following line makes the vertical mode leave, so to say
\&
\X^html-tag:\\$*^
@@ -151,10 +148,11 @@
.\"
.\" supplimentary macros used by other macro sets
.\"
-.\" here are some tags specially for -Tps or -Thtml when invoked by pre-html to
-.\" generate png images from postscript.
+.\" here are some tags specially for -Tps or -Thtml when invoked by pre-html
+.\" to generate png images from postscript.
.\"
-.\" HTML-DO-IMAGE - tells troff to issue an image marker which can be read back by pre-html
+.\" HTML-DO-IMAGE - tells troff to issue an image marker which can be
+.\" read back by pre-html
.\"
.de HTML-DO-IMAGE
. if r ps4html .begin \{\
@@ -163,7 +161,7 @@
. tl ''''
\O0\O1
. \}
-. if '\*(.T'html' .begin \{
+. if \\n[www-html] .begin \{
. image \\$2 \\$1.png
\O0
. \}
@@ -173,7 +171,7 @@
.\"
.de HTML-IMAGE-END
. if r ps4html \O2\O1\O4
-. if '\*(.T'html' \O2\O1\O4
+. if \\n[www-html] \O2\O1\O4
..
.nr png-no 0
.\"