[Groff-commit] groff ./ChangeLog tmac/www.tmac

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/08/12 08:35:08

Modified files:
        .              : ChangeLog 
        tmac           : www.tmac 

Log message:
        * tmac/www.tmac (URL, MTO): Handle empty \\$1 better.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.844&tr2=1.845&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.844 groff/ChangeLog:1.845
--- groff/ChangeLog:1.844       Tue Aug  9 18:02:48 2005
+++ groff/ChangeLog     Fri Aug 12 08:35:08 2005
@@ -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
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.42 groff/tmac/www.tmac:1.43
--- groff/tmac/www.tmac:1.42    Tue Aug  9 18:02:49 2005
+++ groff/tmac/www.tmac Fri Aug 12 08:35:08 2005
@@ -322,8 +322,10 @@
 .\"     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 @@
 .  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 @@
 .  \}
 .  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
+.      \}
 .    \}
 .  \}
 ..