* tmac/www.tmac: Disable hyphenation in normal text only if output

device is html.
(URL, FTP, MAILTO): Disable hyphenation of actual URL with `%'.
* tmac/groff_mwww.man, NEWS: Updated.


* tmac/www.tmac (.IMAGE): Add fourth parameter to specify vertical
image location.

4 files changed, 62 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index aef91186..0468a70a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-07-03  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/www.tmac: Disable hyphenation in normal text only if output
+	device is html.
+	(URL, FTP, MAILTO): Disable hyphenation of actual URL with `\%'.
+	* tmac/groff_mwww.man, NEWS: Updated.
+
+2001-07-03  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* tmac/www.tmac (.IMAGE): Add fourth parameter to specify vertical
+	image location.
+
 2001-04-18  Ruslan Ermilov  <ru@FreeBSD.org>
 
 	* tmac/doc-common, tmac/doc.tmac (doc-display-ft-stack,
diff --git a/NEWS b/NEWS
index b7f8122e..eec9d72e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
 This file describes recent user-visible changes in groff.  Bug fixes are not
 described.  There are more details in the man pages.
 
+VERSION 1.17.2
+==============
+
+This is major bug-fixing release which should replace 1.17.1.
+
+Troff
+-----
+
+o The `IMAGE' macro in www.tmac has changed: Now the optional 2nd parameter
+  gives the horizontal image location (left, centered, or right), and the
+  optional 3rd and 4th parameter the image dimensions.
 
 VERSION 1.17.1
 ==============
diff --git a/tmac/groff_mwww.man b/tmac/groff_mwww.man
index f9890221..4de82157 100755
--- a/tmac/groff_mwww.man
+++ b/tmac/groff_mwww.man
@@ -125,16 +125,20 @@ generates
 a URL using either two or three arguments.
 $1 is the name of the link, $2 is the actual URL, and $3 is optional stuff
 to be printed immediately after $2.
+Hyphenation is disabled while printing the actual URL; explicit breakpoints
+should be inserted with the
+.B \e:
+escape.
 Here is how to encode
-.URL "homepage for groff" http://groff.ffii.org/ :
+.URL "homepage for groff" http://\:groff.\:ffii.\:org/ :
 .sp
 .nf
-\s-2\fC\&.URL "homepage for groff" http://groff.ffii.org/ :\fP\s+2
+\s-2\fC\&.URL "homepage for groff" http://\e:groff.\e:ffii.\e:org/ :\fP\s+2
 .fi
 .sp
 If this is processed by a device other than \fC-Thtml\fP
 it appears as:
-homepage for groff \(lahttp://groff.ffii.org\(ra.
+homepage for groff \(lahttp://groff.\:ffii.\:org\(ra.
 The URL macro can be of any type; for example we can reference
 .URL "Eric Raymond's pic guide" pic.html
 by:
@@ -150,6 +154,7 @@ The first argument is mandatory as the email address.
 The optional second argument is the text you see in your browser, and
 an optional third argument is stuff printed immediately after the
 second argument.
+Hyphenation is disabled while printing the actual email address.
 For example, the groff maintainers are
 .MAILTO wl@gnu.org "Werner Lemberg"
 and
@@ -173,23 +178,30 @@ The first argument is the browser text and the second is the url.
 A third argument, similar to the macros above, is intended for stuff printed
 immediately after the second argument.
 The second and the third parameter are optional.
+Hyphenation is disabled while printing the actual URL.
 As an example, here the location of the
 .FTP "current groff development distribution" \
-ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz .
+ftp://ftp.ffii.org/\:pub/\:groff/\:devel/\:groff-current.tar.gz .
 The macro example above was specified by:
 .sp
 .nf
 \s-2\fC\&.FTP "current groff development distribution" \\
-ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz .\fP\s+2
+ftp://ftp.ffii.org/\e:pub/\e:groff/\e:devel/\e:groff-current.tar.gz .\fP\s+2
 .fi
 .sp
 .TP
 .B IMAGE
 allows the document to include pictures.
 The first argument is the image file.
-The next two arguments are optional:
-Argument two is the width in pixels (default is 400 pixels if absent).
-The third argument is the height in pixels (default is the width value if
+The second optional argument gives the horizontal location;
+.B l
+puts the image to the left border,
+.B r
+to the right.
+Any other value centers the image.
+The next two arguments are optional also:
+Argument three is the width in pixels (default is 400 pixels if absent).
+The fourth argument is the height in pixels (default is the width value if
 absent).
 .sp
 .TP
diff --git a/tmac/www.tmac b/tmac/www.tmac
index 808c6271..a19f8162 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
+\\$1 \%\(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
+\\$1 \%\(la\fC\\$2\fP\(ra\\$3
 .  \}
 ..
 .\"
@@ -90,7 +90,7 @@
 \fC\\$1\fP\\$3
 .    \}
 .    el \{\
-\\$2 \(la\fC\\$1\fP\(ra\\$3
+\\$2 \%\(la\fC\\$1\fP\(ra\\$3
 .    \}
 .  \}
 ..
@@ -103,20 +103,25 @@
 .\"
 .\" IMAGE - reference an image
 .\"         $1 is the image file
-.\"         $2 is the x width (default if absent 400 pixels)
-.\"         $3 is the y width (default if absent is the x value)
+.\"         $2 is the alignment r, l or c  (center by default)
+.\"         $3 is the x width (default if absent 400 pixels)
+.\"         $4 is the y width (default if absent is the x value)
 .\"
 .de IMAGE
 .  ie \\n[www-html] \{\
+.    ie '\\$2'r' .HTML-TAG ".right-image"
+.    el \{\
+.      ie '\\$2'l' .HTML-TAG ".left-image"
+.      el .HTML-TAG ".centered-image"
+.    \}
 .    nr HTMLWIDTH 400
-.    if !'\\$2'' \{\
-.      nr HTMLWIDTH \\$2
+.    if !'\\$3'' \{\
+.      nr HTMLWIDTH \\$3
 .    \}
 .    nr HTMLHEIGHT \\n[HTMLWIDTH]
-.    if !'\\$3'' \{\
-.      nr HTMLHEIGHT \\$3
+.    if !'\\$4'' \{\
+.      nr HTMLHEIGHT \\$4
 .    \}
-.    HTML-TAG ".centered-image"
 .    HTML <img src="\\$1" width=\\n[HTMLWIDTH] height=\\n[HTMLHEIGHT]>
 .  \}
 .  el \{\
@@ -206,6 +211,8 @@
 .   MAKE-UNIQUE-NAME
 .   HTML-DO-IMAGE \\*[HTML-UNIQUE-NAME] i
 ..
-.nr HY 0
-.nh
+.if \\n[www-html] \{\
+.   nh
+.   nr HY 0
+.\}
 .cp \n(_C