summaryrefslogtreecommitdiffstats
path: root/contrib/groff/tmac
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/groff/tmac')
-rw-r--r--contrib/groff/tmac/an-old.tmac68
-rw-r--r--contrib/groff/tmac/doc-common2
-rw-r--r--contrib/groff/tmac/doc.tmac68
-rw-r--r--contrib/groff/tmac/groff_man.man8
-rw-r--r--contrib/groff/tmac/groff_mdoc.man8
-rw-r--r--contrib/groff/tmac/groff_me.man4
-rw-r--r--contrib/groff/tmac/groff_ms.man8
-rw-r--r--contrib/groff/tmac/groff_mwww.man34
-rw-r--r--contrib/groff/tmac/groff_tmac.man9
-rw-r--r--contrib/groff/tmac/troffrc-end20
-rw-r--r--contrib/groff/tmac/www.tmac41
11 files changed, 172 insertions, 98 deletions
diff --git a/contrib/groff/tmac/an-old.tmac b/contrib/groff/tmac/an-old.tmac
index 9ef041f..49264d7 100644
--- a/contrib/groff/tmac/an-old.tmac
+++ b/contrib/groff/tmac/an-old.tmac
@@ -35,9 +35,12 @@
.
.if !\n(.g .ab These man macros work only with groff.
.
-.nr _C \n[.C]
+.nr _C \n(.C
.cp 0
.
+.if (\n[.x]\n[.y]\n[.Y] < 1171) \
+. ab You need GNU troff version 1.17.1 or higher to run this version of man!
+.
.if !r D .nr D 0
.if !r C .nr C 0
.if !r S .nr S 10
@@ -53,7 +56,7 @@
.\}
.
.nr an-html 0
-.if '\*(.T'html' .nr an-html 1
+.if '\*[.T]'html' .nr an-html 1
.if \n[an-html] .nr C 1
.if r ps4html .nr C 1
.
@@ -62,12 +65,11 @@
..
.
.\" .TH title section extra1 extra2 extra3
-.de TH
+.de1 TH
. if \\n[an-html] \{\
. HTML-TAG ".tl"
\\$1
. \}
-. cp 0
.
. de an-init \" We have to do it like this to get multiple man pages right.
. ds an-title "\\$1
@@ -134,16 +136,16 @@
. \}
..
.
-.de DT
+.de1 DT
. ta T .5i \" This sets tabs every .5 inches
..
.
-.de PD
+.de1 PD
. ie \\n[.$] .nr PD (v;\\$1)
. el .nr PD (.4v >? \n[.V])
..
.
-.de an-header
+.de1 an-header
. an-init
. ev 1
. ps \\n[PS]u
@@ -163,13 +165,13 @@
. ns
..
.
-.de an-footer
+.de1 an-footer
' bp
..
.
.af an-page-letter a
.
-.de an-p-footer
+.de1 an-p-footer
. ev 1
. ps \\n[PS]u
. vs \\n[VS]u
@@ -201,7 +203,7 @@
. ev
..
.
-.de an-end
+.de1 an-end
. nr % 1
. pl +3v
. fl
@@ -212,7 +214,7 @@
.
.if \n[cR] .em an-end
.
-.de SH
+.de1 SH
. sp \\n[PD]u
. nr an-level 1
. set-an-margin
@@ -230,7 +232,7 @@
. if \\n[.$] \&\\$*
..
.
-.de SS
+.de1 SS
. sp \\n[PD]u
. nr an-level 1
. set-an-margin
@@ -247,32 +249,32 @@
. if \\n[.$] \&\\$*
..
.
-.de B
+.de1 B
. it 1 an-trap
. ft B
. if \\n[.$] \&\\$*
..
.
-.de I
+.de1 I
. it 1 an-trap
. ft I
. if \\n[.$] \&\\$*
..
.
-.de SM
+.de1 SM
. it 1 an-trap
. ps -1
. if \\n[.$] \&\\$*
..
.
-.de SB
+.de1 SB
. it 1 an-trap
. ps -1
. ft B
. if \\n[.$] \&\\$*
..
.
-.de TP
+.de1 TP
. sp \\n[PD]u
. if \\n[.$] .nr an-prevailing-indent (n;\\$1)
. it 1 an-trap
@@ -285,7 +287,7 @@
. nr an-div? 1
..
.
-.de an-trap
+.de1 an-trap
. ft R
. ps \\n[PS]u
. vs \\n[VS]u
@@ -321,7 +323,7 @@
. \}
..
.
-.de LP
+.de1 LP
. br
. sp \\n[PD]u
. ps \\n[PS]u
@@ -334,7 +336,7 @@
.als PP LP
.als P LP
.
-.de IP
+.de1 IP
. ie !\\n[.$] \{\
. ps \\n[PS]u
. vs \\n[VS]u
@@ -350,7 +352,7 @@
. \}
..
.
-.de HP
+.de1 HP
. ps \\n[PS]u
. vs \\n[VS]u
. ft R
@@ -363,7 +365,7 @@
.
.ds an-empty \" this is referenced to avoid looping on eg .RB ( \\ )
.
-.de RI
+.de1 RI
. if \\n[.$] \{\
. ds an-result \&\\$1
. shift
@@ -376,7 +378,7 @@
. \}
..
.
-.de IR
+.de1 IR
. if \\n[.$] \{\
. ds an-result \&\f[I]\\$1\f[R]
. shift
@@ -389,7 +391,7 @@
. \}
..
.
-.de IB
+.de1 IB
. if \\n[.$] \{\
. ds an-result \&\f[I]\\$1
. shift
@@ -403,7 +405,7 @@
. \}
..
.
-.de BI
+.de1 BI
. if \\n[.$] \{\
. ds an-result \&\f[B]\\$1
. shift
@@ -417,7 +419,7 @@
. \}
..
.
-.de RB
+.de1 RB
. ds an-result \&
. while (\\n[.$] >= 2) \{\
. as an-result \f[R]\\$1\f[B]\\$2\\*[an-empty]
@@ -428,7 +430,7 @@
. ft R
..
.
-.de BR
+.de1 BR
. ds an-result \&
. while (\\n[.$] >= 2) \{\
. as an-result \f[B]\\$1\f[R]\\$2\\*[an-empty]
@@ -439,7 +441,7 @@
. ft R
..
.
-.de RS
+.de1 RS
. br
. nr an-saved-margin\\n[an-level] \\n[an-margin]
. nr an-saved-prevailing-indent\\n[an-level] \\n[an-prevailing-indent]
@@ -450,7 +452,7 @@
. nr an-level +1
..
.
-.de RE
+.de1 RE
. br
. ie \\n[.$] .nr an-level ((;\\$1) <? \\n[an-level])
. el .nr an-level -1
@@ -460,10 +462,12 @@
. in \\n[an-margin]u
..
.
-.ds S \s[\\n[PS]]
-.ie c\[rg] .ds R \[rg]
+.\" these strings must work in compatibility mode also
+.
+.ds S \s(\\n(PS
+.ie c\[rg] .ds R \(rg
.el .ds R (Reg.)
-.ie c\[tm] .ds Tm \[tm]
+.ie c\[tm] .ds Tm \(tm
.el .ds Tm (TM)
.ds lq \(lq
.ds rq \(rq
diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index 8e788eb..d19a795 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -918,6 +918,8 @@
. tm doc-display-indent-stack\n[doc-reg-Rd] == \n[doc-display-indent-stack\n[doc-reg-Rd]]
. tm doc-display-ad-stack\n[doc-reg-Rd] == \n[doc-display-ad-stack\n[doc-reg-Rd]]
. tm doc-display-fi-stack\n[doc-reg-Rd] == \n[doc-display-fi-stack\n[doc-reg-Rd]]
+. tm doc-display-ft-stack\n[doc-reg-Rd] == \n[doc-display-ft-stack\n[doc-reg-Rd]]
+. tm doc-display-ps-stack\n[doc-reg-Rd] == \n[doc-display-ps-stack\n[doc-reg-Rd]]
. nr doc-reg-Rd +1
. \}
.
diff --git a/contrib/groff/tmac/doc.tmac b/contrib/groff/tmac/doc.tmac
index 815e3d4..3869864 100644
--- a/contrib/groff/tmac/doc.tmac
+++ b/contrib/groff/tmac/doc.tmac
@@ -54,7 +54,7 @@
.cp 0
.
.
-.if ((\n[.x] == 0) : ((\n[.x] == 1) & (\n[.y] < 17))) \
+.if (\n[.x]\n[.y] < 117) \
. ab You need GNU troff version 1.17 or higher to run this version of mdoc!
.
.
@@ -2583,6 +2583,24 @@
.nr doc-display-fi-stack0 0
.
.
+.\" NS doc-display-ft-stackXXX global register
+.\" NS stack of saved fonts
+.\" NS
+.\" NS limit:
+.\" NS doc-display-depth
+.
+.nr doc-display-ft-stack0 0
+.
+.
+.\" NS doc-display-ps-stackXXX global register
+.\" NS stack of saved font sizes
+.\" NS
+.\" NS limit:
+.\" NS doc-display-depth
+.
+.nr doc-display-ps-stack0 0
+.
+.
.\" NS Bd user macro
.\" NS begin display
.\" NS
@@ -2594,6 +2612,8 @@
.\" NS doc-display-depth
.\" NS doc-display-ad-stackXXX
.\" NS doc-display-fi-stackXXX
+.\" NS doc-display-ft-stackXXX
+.\" NS doc-display-ps-stackXXX
.\" NS doc-display-file
.\" NS doc-display-indent-stackXXX
.\" NS doc-display-type-stackXXX
@@ -2623,8 +2643,8 @@
.
. ie "\$1"-literal" \{\
. ds doc-display-type-stack\n[doc-display-depth] literal
-. nr doc-curr-font \n[.f]
-. nr doc-curr-size \n[.ps]
+. nr doc-display-ft-stack\n[doc-display-depth] \n[.f]
+. nr doc-display-ps-stack\n[doc-display-depth] \n[.ps]
.
. ie t \{\
. nop \*[doc-Li-font]\c
@@ -2816,8 +2836,8 @@
. \}
.
. if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \{\
-. ft \n[doc-curr-font]
-. ps \n[doc-curr-size]u
+. ft \n[doc-display-ft-stack\n[doc-display-depth]]
+. ps \n[doc-display-ps-stack\n[doc-display-depth]]u
. \}
.
. in -\n[doc-display-indent-stack\n[doc-display-depth]]u
@@ -3231,6 +3251,8 @@
. nr doc-display-indent-stack\n[doc-reg-dsgv]-saved \n[doc-display-indent-stack\n[doc-reg-dsgv]]
. nr doc-display-ad-stack\n[doc-reg-dsgv]-saved \n[doc-display-ad-stack\n[doc-reg-dsgv]]
. nr doc-display-fi-stack\n[doc-reg-dsgv]-saved \n[doc-display-fi-stack\n[doc-reg-dsgv]]
+. nr doc-display-ft-stack\n[doc-reg-dsgv]-saved \n[doc-display-ft-stack\n[doc-reg-dsgv]]
+. nr doc-display-ps-stack\n[doc-reg-dsgv]-saved \n[doc-display-ps-stack\n[doc-reg-dsgv]]
. nr doc-reg-dsgv +1
. \}
.
@@ -3368,6 +3390,8 @@
. nr doc-display-indent-stack\n[doc-reg-drgv] \n[doc-display-indent-stack\n[doc-reg-drgv]-saved]
. nr doc-display-ad-stack\n[doc-reg-drgv] \n[doc-display-ad-stack\n[doc-reg-drgv]-saved]
. nr doc-display-fi-stack\n[doc-reg-drgv] \n[doc-display-fi-stack\n[doc-reg-drgv]-saved]
+. nr doc-display-ft-stack\n[doc-reg-drgv] \n[doc-display-ft-stack\n[doc-reg-drgv]-saved]
+. nr doc-display-ps-stack\n[doc-reg-drgv] \n[doc-display-ps-stack\n[doc-reg-drgv]-saved]
. nr doc-reg-drgv +1
. \}
.
@@ -3654,6 +3678,10 @@
. nh
. doc-item-box\n[doc-list-depth]
.
+. if \n[doc-in-files-section] \
+. if n \
+. ds doc-Pa-font "\*[doc-saved-Pa-font]
+.
. nr doc-in-list 0
. doc-reset-args
..
@@ -3692,6 +3720,10 @@
. nr doc-have-space 1
. \}
.
+. if \n[doc-in-files-section] \
+. if n \
+. ds doc-Pa-font "\*[doc-saved-Pa-font]
+.
. nr doc-in-list 0
. doc-reset-args
..
@@ -3715,6 +3747,10 @@
. doc-item-box\n[doc-list-depth]
. br
.
+. if \n[doc-in-files-section] \
+. if n \
+. ds doc-Pa-font "\*[doc-saved-Pa-font]
+.
. nr doc-in-list 0
. doc-reset-args
..
@@ -6054,24 +6090,16 @@
.
.\" XXX: what does this function without `-std'?
.
-. if !\n[.$] \{\
-. tm Usage: .Rv [-std] (#\n[.c])
+. if \n[doc-arg-limit] \{\
+. tm Usage: .Rv not callable by other macros (#\n[.c])
+. doc-reset-args
. return
. \}
.
-. \" .ds doc-macro-name Rv
-. \" .nr doc-arg-ptr 0
-. \" .nr lR +1
-. \" .ds doc-arg1 \$2
-. \" .ds doc-arg2 \$3
-. \" .ds doc-arg3 \$4
-. \" .ds doc-arg4 \$5
-. \" .ds doc-arg5 \$6
-. \" .ds doc-arg6 \$7
-. \" .ds doc-arg7 \$8
-. \" .ds doc-arg8 \$9
-. \" .
-. \" .nr doc-num-args (\n[.$] - 1)
+. if !\n[.$] \{\
+. tm Usage: .Rv [-std] <function> (#\n[.c])
+. return
+. \}
.
. if "\$1"-std" \{\
. nr doc-reg-Rv \*[doc-section]
diff --git a/contrib/groff/tmac/groff_man.man b/contrib/groff/tmac/groff_man.man
index e35acab..89efa4f 100644
--- a/contrib/groff/tmac/groff_man.man
+++ b/contrib/groff/tmac/groff_man.man
@@ -1,5 +1,5 @@
-.ig \"-*- nroff -*-
-Copyright (C) 1999-2000 Free Software Foundation, Inc.
+.ig
+Copyright (C) 1999-2000, 2001 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -479,3 +479,7 @@ http://www.cs.pdx.edu/~trent/gnu/groff/groff_toc.html
This manual page was originally written for the Debian GNU/Linux system by
Susan G. Kleinmann <sgk@debian.org>, corrected and updated by Werner Lemberg
<wl@gnu.org>, and is now part of the GNU troff distribution.
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/groff/tmac/groff_mdoc.man b/contrib/groff/tmac/groff_mdoc.man
index 1144636..c2eec8b 100644
--- a/contrib/groff/tmac/groff_mdoc.man
+++ b/contrib/groff/tmac/groff_mdoc.man
@@ -1515,7 +1515,7 @@ macro generates text for use in the
.Sx RETURN VALUES
section.
.Pp
-.Dl Usage: .Rv Oo -std Oc Ao function Ac ...
+.Dl Usage: .Rv Oo -std Oc Ao function Ac
.Pp
For example,
.Ql ".Rv -std atexit"
@@ -1524,7 +1524,7 @@ produces:
.Bd -ragged -offset -indent
\# a small hack to suppress a warning message
.ds section-old "\*[section]
-.ds section 2
+.ds section 3
.Rv -std atexit
.ds section "\*[section-old]
.Ed
@@ -3945,3 +3945,7 @@ and certainly should be able to.
.\" .Xr nroff
.\" the right margin adjustment is normally ragged and the problem is
.\" not as severe.
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/groff/tmac/groff_me.man b/contrib/groff/tmac/groff_me.man
index 7debe29..91d2043 100644
--- a/contrib/groff/tmac/groff_me.man
+++ b/contrib/groff/tmac/groff_me.man
@@ -276,3 +276,7 @@ points.
\&.xp \fIx\fR - no Print index
.I x.
.ad
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/groff/tmac/groff_ms.man b/contrib/groff/tmac/groff_ms.man
index 91463d8..590b060 100644
--- a/contrib/groff/tmac/groff_ms.man
+++ b/contrib/groff/tmac/groff_ms.man
@@ -1,5 +1,5 @@
-.ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+.ig
+Copyright (C) 1989-1995, 2001 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -246,3 +246,7 @@ names containing only uppercase letters and digits.
.BR @g@eqn (@MAN1EXT@)
.br
.BR ms (@MAN7EXT@)
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/groff/tmac/groff_mwww.man b/contrib/groff/tmac/groff_mwww.man
index bec719c..4de8215 100644
--- a/contrib/groff/tmac/groff_mwww.man
+++ b/contrib/groff/tmac/groff_mwww.man
@@ -1,5 +1,5 @@
.TH GROFF_MWWW @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.\" Copyright (C) 2000 Free Software Foundation, Inc.
+.\" Copyright (C) 2000, 2001 Free Software Foundation, Inc.
.\" Written by Gaius Mulley (gaius@glam.ac.uk)
.\"
.\" This file is part of groff.
@@ -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
@@ -273,3 +285,7 @@ Report bugs to the
.MAILTO bug-groff@gnu.org "Groff Bug Mailing List" .
Include a complete, self-contained example that will allow the bug to be
reproduced, and say which version of groff you are using.
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/groff/tmac/groff_tmac.man b/contrib/groff/tmac/groff_tmac.man
index 4eb731c..e6f39bb 100644
--- a/contrib/groff/tmac/groff_tmac.man
+++ b/contrib/groff/tmac/groff_tmac.man
@@ -1,14 +1,11 @@
-.\" -*- nroff -*-
.ig /
groff_tmac.5
This file is part of groff, the GNU roff type-setting system.
-Copyright (C) 2000 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001 Free Software Foundation, Inc.
written by Bernd Warken <bwarken@mayn.de>
-Last update: 17 May 2000
-
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation; with the
@@ -448,3 +445,7 @@ and the formatters in
.LP
The Filesystem Hierarchy Standard (FHS) is available at
.BR http://www.pathname.com/fhs/ .
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/groff/tmac/troffrc-end b/contrib/groff/tmac/troffrc-end
index 631f6b0..f786059 100644
--- a/contrib/groff/tmac/troffrc-end
+++ b/contrib/groff/tmac/troffrc-end
@@ -2,18 +2,18 @@
.\" final startup file for troff
.\" this file is parsed after all macro sets have been read
.\"
-.do if '\*(.T'html' .mso html.tmac
-.\" if we are running the postscript device for html images then load -mwww
+.do if '\*[.T]'html' .do mso html.tmac
+.\" if we are running the postscript device for html images then load www.tmac
.\"
-.do if r ps4html .mso www.tmac
+.do if r ps4html .do mso www.tmac
.\"
.\" for all other devices blank out these macros
.\"
-.do if !d HTML-IMAGE-INLINE .ds HTML-IMAGE-INLINE
-.do if !d HTML-IMAGE .ds HTML-IMAGE
-.do if !d HTML-IMAGE-RIGHT .ds HTML-IMAGE-RIGHT
-.do if !d HTML-IMAGE-LEFT .ds HTML-IMAGE-LEFT
-.do if !d HTML-IMAGE-END .ds HTML-IMAGE-END
-.do if !d HTML-TAG .ds HTML-TAG
-.do if !d HTML-DO-IMAGE .ds HTML-DO-IMAGE
+.do if !d HTML-IMAGE-INLINE .do ds HTML-IMAGE-INLINE
+.do if !d HTML-IMAGE .do ds HTML-IMAGE
+.do if !d HTML-IMAGE-RIGHT .do ds HTML-IMAGE-RIGHT
+.do if !d HTML-IMAGE-LEFT .do ds HTML-IMAGE-LEFT
+.do if !d HTML-IMAGE-END .do ds HTML-IMAGE-END
+.do if !d HTML-TAG .do ds HTML-TAG
+.do if !d HTML-DO-IMAGE .do ds HTML-DO-IMAGE
.\" Don't let blank lines creep in here.
diff --git a/contrib/groff/tmac/www.tmac b/contrib/groff/tmac/www.tmac
index 8358c86..0bef6b6 100644
--- a/contrib/groff/tmac/www.tmac
+++ b/contrib/groff/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 \{\
@@ -159,19 +164,19 @@
. image \\$2 \\$1.png
. bp
. tl ''''
-\O0\O1
+\O[0]\O[1]
. \}
-. if \\n[www-html] .begin \{
+. if \\n[www-html] .begin \{\
. image \\$2 \\$1.png
-\O0
+\O[0]
. \}
..
.\"
.\" HTML-IMAGE-END - terminates an image for html
.\"
.de HTML-IMAGE-END
-. if r ps4html \O2\O1\O4
-. if \\n[www-html] \O2\O1\O4
+. if r ps4html \O[2]\O[1]\O[4]
+. if \\n[www-html] \O[2]\O[1]\O[4]
..
.nr png-no 0
.\"
@@ -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
OpenPOWER on IntegriCloud