Change .UR/.UE and .MT/.ME so the start macro no longer takes

a second argument that is pasted to the end of the generated text.
Instead, the end macro takes an argument that does the same thing.

3 files changed, 25 insertions, 22 deletions

diff --git a/tmac/an-ext.tmac b/tmac/an-ext.tmac
index 271181f9..e20a0077 100644
--- a/tmac/an-ext.tmac
+++ b/tmac/an-ext.tmac
@@ -97,7 +97,6 @@
 .\" Start URL.
 .de UR
 .  ds m1 \\$1\"
-.  ds m2 \\$2\"
 .  nh
 .  if \\n(mH \{\
 .    \" Start diversion in a new environment.
@@ -125,10 +124,10 @@
 .    \}
 .    el \
 .      do HTML-NS "<a href=""\\*(m1"">\\*(m1</a>"
-\&\\*(m2\"
+\&\\$*\"
 .  \}
 .  el \
-\\*(la\\*(m1\\*(ra\\*(m2\"
+\\*(la\\*(m1\\*(ra\\$*\"
 .
 .  hy \\n(HY
 ..
@@ -137,7 +136,6 @@
 .\" Start email address.
 .de MT
 .  ds m1 \\$1\"
-.  ds m2 \\$2\"
 .  nh
 .  if \\n(mH \{\
 .    \" Start diversion in a new environment.
@@ -165,10 +163,10 @@
 .    \}
 .    el \
 .      do HTML-NS "<a href=""mailto:\\*(m1"">\\*(m1</a>"
-\&\\*(m2\"
+\&\\$*\"
 .  \}
 .  el \
-\\*(la\\*(m1\\*(ra\\*(m2\"
+\\*(la\\*(m1\\*(ra\\$*\"
 .
 .  hy \\n(HY
 ..
diff --git a/tmac/groff_man.man b/tmac/groff_man.man
index f01f2894..3fc679e0 100644
--- a/tmac/groff_man.man
+++ b/tmac/groff_man.man
@@ -646,19 +646,22 @@ Wrap a World Wide Web hyperlink.  The argument to the
 .B UR
 is the URL; thereafter, lines until 
 .B UE
-are collected and used as the link text.  On a device that is not 
+are collected and used as the link text.  Any argument to the
+.B UE
+macro is pasted to the end of the text.
+On a device that is not 
 a browser, 
 
 .EX
 this is a link to
 \&.UR http:\&//randomsite,org/fubar
 some random site
-\&.UE
+\&.UE ,
 given as an example
 .EE
 
 will usually display like this: "this is a link to some random 
-site <http:\&//randomsite,org/fubar> given as an example".
+site <http:\&//randomsite,org/fubar>, given as an example".
 
 .TP
 .B MT
@@ -667,7 +670,9 @@ site <http:\&//randomsite,org/fubar> given as an example".
 Wrap an email address.  The argument of MT is the address; text
 following, until
 .BR ME ,
-is a name to be associated with the address.  On a device that is not 
+is a name to be associated with the address.  Any argument to the
+.B ME
+macro is pasted to the end of the link text. On a device that is not 
 a browser, 
 
 .EX
@@ -794,7 +799,7 @@ poorly to HTML, under which exact whitespace control and tabbing are not
 readily available.  Thus, information or distinctions that you use
 .B DT 
 to express are likely to be lost.  If you feel tempted to use it,
-you should probably be writing table markup using
+you should probably be composing a table using
 .BR tbl (1)
 markup instead.
 .
@@ -820,7 +825,7 @@ and
 .BR HP .
 .sp
 Use of this presentation-level macro is deprecated.  It translates
-poorly to HTML, under which exact control of inter-paragraphb spacing 
+poorly to HTML, under which exact control of inter-paragraph spacing 
 is not readily available.  Thus, information or distinctions that you use
 .B PD 
 to express are likely to be lost.
@@ -1015,17 +1020,17 @@ Local changes and customizations should be put into this file.
 .
 This manual page was originally written for the Debian GNU/Linux
 system by 
-.MT sgk@debian.org .
+.MT sgk@debian.org
 Susan G. Kleinmann
-.ME
+.ME .
 It was corrected and updated by
-.MT wl@gnu.org .
+.MT wl@gnu.org
 Werner Lemberg
-.ME
+.ME .
 The extension macros were documented (and partly designed) by
-.MT esr@thyrsus.com ;
+.MT esr@thyrsus.com
 Eric S. Raymond 
-.ME
+.ME ;
 he also wrote the portability advice.
 .
 .\" Local Variables:
diff --git a/tmac/groff_trace.man b/tmac/groff_trace.man
index 66783505..65712e9d 100644
--- a/tmac/groff_trace.man
+++ b/tmac/groff_trace.man
@@ -252,9 +252,9 @@ Documentation License) version 1.1 or later.
 .
 You should have received a copy of the FDL on your system, it is also
 available on-line at the
-.UR http://\:www.gnu.org/\:copyleft/\:fdl.html .
+.UR http://\:www.gnu.org/\:copyleft/\:fdl.html
 GNU copyleft site
-.UE
+.UE .
 .
 .P
 This document is part of
@@ -262,9 +262,9 @@ This document is part of
 the GNU roff distribution.
 .
 It was written by
-.MT bwarken@mayn.de .
+.MT bwarken@mayn.de
 Bernd Warken
-.ME
+.ME .
 .
 .
 .\" --------------------------------------------------------------------