From a768775cd4224f42b86064b3b8b0b2fff6b437ea Mon Sep 17 00:00:00 2001
From: Werner LEMBERG <wl@gnu.org>
Date: Fri, 12 Aug 2005 08:35:08 +0000
Subject: [PATCH] * tmac/www.tmac (URL, MTO): Handle empty \\$1 better.

---
 ChangeLog     |  4 ++++
 tmac/www.tmac | 66 +++++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73d3e6ee..14759f45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-11  Bernd Warken
+
+	* tmac/www.tmac (URL, MTO): Handle empty \\$1 better.
+
 2005-08-09  Bernd Warken
 
 	* tmac/www.tmac (URL, MTO): Use bold series if color support is
diff --git a/tmac/www.tmac b/tmac/www.tmac
index 4ba75c3c..5dcbd1ee 100644
--- a/tmac/www.tmac
+++ b/tmac/www.tmac
@@ -322,8 +322,10 @@ www functionality.  It should work with any macro set.
 .\"     if description is absent then the url becomes the anchor text
 .\"
 .de URL
-.  ds \\$0:adr \\$1\"
-.  www:url_breaks \\$0:adr
+.  ie !'\\$1'' \{\
+.    ds \\$0:adr \\$1\"
+.    www:url_breaks \\$0:adr
+.  \}
 .  ie \\n[www-html] \{\
 .    ie '\\$3'' \
 .      ds \\$0:after \&
@@ -339,16 +341,30 @@ www functionality.  It should work with any macro set.
 .  el \{\
 .    if !r ps4html .ad l
 .    ie '\\$2'' \{\
-.      ie \\n[.color] \
-.        nop \%\[la]\m[blue]\f[C]\\*[\\$0:adr]\f[]\m[]\[ra]\\$3
-.      el \
-.        nop \%\[la]\f[CB]\\*[\\$0:adr]\f[]\[ra]\\$3
+.      ie '\\$1'' \{\
+.        ie !'\\$3'' \
+.          nop \\$3
+.      \}
+.      el \{\
+.        ie \\n[.color] \
+.          nop \%\[la]\m[blue]\f[C]\\*[\\$0:adr]\f[]\m[]\[ra]\\$3
+.        el \
+.          nop \%\[la]\f[CB]\\*[\\$0:adr]\f[]\[ra]\\$3
+.      \}
 .    \}
 .    el \{\
-.      ie \\n[.color] \
-.        nop \m[blue]\\$2\m[] \%\[la]\f[C]\\*[\\$0:adr]\f[]\[ra]\\$3
-.      el \
-.        nop \f[B]\\$2\f[] \%\[la]\f[C]\\*[\\$0:adr]\f[]\[ra]\\$3
+.      ie '\\$1'' \{\
+.        ie \\n[.color] \
+.          nop \m[blue]\\$2\m[]\\$3
+.        el \
+.          nop \f[B]\\$2\f[]\\$3
+.      \}
+.      el \{\
+.        ie \\n[.color] \
+.          nop \m[blue]\\$2\m[] \%\[la]\f[C]\\*[\\$0:adr]\f[]\[ra]\\$3
+.        el \
+.          nop \f[B]\\$2\f[] \%\[la]\f[C]\\*[\\$0:adr]\f[]\[ra]\\$3
+.      \}
 .    \}
 .    if !r ps4html .ad
 .  \}
@@ -385,16 +401,30 @@ www functionality.  It should work with any macro set.
 .  \}
 .  el \{\
 .    ie '\\$2'' \{\
-.      ie \\n[.color] \
-.        nop \%\m[blue]\f[C]\\$1\f[]\m[]\\$3
-.      el \
-.        nop \%\f[CB]\\$1\f[]\\$3
+.      ie '\\$1'' \{\
+.        ie !'\\$3'' \
+.          nop \\$3
+.      \}
+.      el \{\
+.        ie \\n[.color] \
+.          nop \%\m[blue]\f[C]\\$1\f[]\m[]\\$3
+.        el \
+.          nop \%\f[CB]\\$1\f[]\\$3
+.      \}
 .    \}
 .    el \{\
-.      ie \\n[.color] \
-.        nop \m[blue]\\$2\m[] \%\[la]\f[C]\\$1\f[]\[ra]\\$3
-.      el
-.        nop \f[B]\\$2\f[] \%\[la]\f[C]\\$1\f[]\[ra]\\$3
+.      ie '\\$1'' \{\
+.        ie \\n[.color] \
+.          nop \m[blue]\\$2\m[]\\$3
+.        el \
+.          nop \f[B]\\$2\f[]\\$3
+.      \}
+.      el \{\
+.        ie \\n[.color] \
+.          nop \m[blue]\\$2\m[] \%\[la]\f[C]\\$1\f[]\[ra]\\$3
+.        el
+.          nop \f[B]\\$2\f[] \%\[la]\f[C]\\$1\f[]\[ra]\\$3
+.      \}
 .    \}
 .  \}
 ..
-- 
2.11.4.GIT