diff options
Diffstat (limited to 'tmac')
| -rw-r--r-- | tmac/Makefile.sub | 4 | ||||
| -rw-r--r-- | tmac/an-ext.tmac | 124 | ||||
| -rw-r--r-- | tmac/an-old.tmac | 93 | ||||
| -rw-r--r-- | tmac/s.tmac | 14 |
4 files changed, 181 insertions, 54 deletions
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub index 837d9a00..5bbe86c2 100644 --- a/tmac/Makefile.sub +++ b/tmac/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # @@ -27,7 +27,7 @@ MAN7=\ groff_www.n NORMALFILES=\ - man.tmac mandoc.tmac andoc.tmac an-old.tmac \ + man.tmac mandoc.tmac andoc.tmac an-old.tmac an-ext.tmac \ ms.tmac \ me.tmac \ mdoc.tmac \ diff --git a/tmac/an-ext.tmac b/tmac/an-ext.tmac new file mode 100644 index 00000000..1a1b99fd --- /dev/null +++ b/tmac/an-ext.tmac @@ -0,0 +1,124 @@ +.\" an-ext.tmac +.\" +.\" Written by Eric S. Raymond <esr@thyrsus.com> +.\" Werner Lemberg <wl@gnu.org> +.\" +.\" Version 2006-Jan-14 +.\" +.\" This file is explicitly placed into the public domain. +.\" +.\" +.\" The code below provides extension macros for the `man' macro package. +.\" It is written without any groff extensions so that other `man' +.\" implementations can use it without changes. +.\" +.\" With groff, this file is sourced by the `man' macro package itself. +.\" Man page authors who are concerned about portability might add the +.\" used macros directly to the prologue of the man page(s). +. +. +.if n \{\ +. do ftr CR R +. do ftr CI I +. do ftr CB B +.\} +. +.if '\(.T'dvi' \ +. do ftr CB CW +. +.ie \n(.g \{\ +. ds la \[la]\" +. ds ra \[ra]\" +.\} +.el \{\ +. ds la <\" +. ds ra >\" +. nr HY 1 +.\} +. +.nr SY 0 +. +. +.\" Declare start of command synopsis. Sets up hanging indentation. +.de SY +. if !\\n(SY \{\ +. nh +. nr SY 1 +. nr a \\n(.j +. ad l +. nr i \\n(.i +. \} +. +. HP \w'\fB\\$1\fP 'u +. B "\\$1" +.. +. +. +.\" End of command synopsis. Restores adjustment. +.de YS +. in \\niu +. ad \\na +. hy \\n(HY +. nr SY 0 +.. +. +. +.\" Declare optional option. +.de OP +. ie \\n(.$-1 \ +. RI "[\fB\\$1\fP" "\ \\$2" "]" +. el \ +. RB "[" "\\$1" "]" +.. +. +. +.\" Universal resource locator. +.\" XXX to be modified +.de URL +. nh +. if \\n(.$-1 \ +\\$2 \*(laURL:\\$1\*(ra\" +. el \ +\*(la\\$1\*(ra\" +. hy \n(HY +.. +. +. +.\" Continuation line for .TP header. +.de TQ +. br +. ns +. TP "\\$1" +.. +. +. +.\" Start example. +.de EX +. sp 0.5 +. nf +. nh +. ft CW +.. +. +. +.\" End example. +.de EE +. ft +. fi +. hy \n(HY +. sp 0.5 +.. +. +. +.\" Start display. +.de DS +. \" XXX to be written +.. +. +. +.\" End display. +.de DE +. \" XXX to be written +.. +. +.\" EOF diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac index 904e60ef..bdb882bd 100644 --- a/tmac/an-old.tmac +++ b/tmac/an-old.tmac @@ -1,6 +1,6 @@ .\" an-old.tmac .\" -.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005 +.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005, 2007 .\" Free Software Foundation, Inc. .\" Written by James Clark (jjc@jclark.com) .\" @@ -89,7 +89,7 @@ .nr FT -.5i . .\" Default heading font -.ds HF B +.ds HF B\" . .nr an-first 1 . @@ -129,17 +129,17 @@ .de1 TH . if \\n[an-html] \{\ . DEVTAG-TL -\\$1 +. nop \\$1 . DEVTAG-EO-TL . \} . . de an-init \" We have to do it like this to get multiple man pages right. -. ds an-title "\\$1 -. ds an-section "\\$2 -. ds an-extra1 "\\$3 -. ie (\\n[.$] > 3) .ds an-extra2 "\\$4 +. ds an-title "\\$1\" +. ds an-section "\\$2\" +. ds an-extra1 "\\$3\" +. ie (\\n[.$] > 3) .ds an-extra2 "\\$4\" . el .ds an-extra2 \"Sun Release 4.0 -. ie (\\n[.$] > 4) .ds an-extra3 "\\$5 +. ie (\\n[.$] > 4) .ds an-extra3 "\\$5\" . el .ds an-extra3 \"System Programmer's Manual . ds an-init \\.. @@ -208,22 +208,22 @@ .\" BSD compatibility macros: .AT and .UC . .de1 AT -. ds an-extra2 "7th Edition -. if "\\$1"3" .ds an-extra2 "7th Edition -. if "\\$1"4" .ds an-extra2 "System III +. ds an-extra2 "7th Edition\" +. if "\\$1"3" .ds an-extra2 "7th Edition\" +. if "\\$1"4" .ds an-extra2 "System III\" . if "\\$1"5" \{\ -. ie "\\$2"" .ds an-extra2 "System V -. el .ds an-extra2 "System V Release \\$2 +. ie "\\$2"" .ds an-extra2 "System V\" +. el .ds an-extra2 "System V Release \\$2\" . \} .. . .de1 UC -. ds an-extra2 "3rd Berkeley Distribution -. if "\\$1"3" .ds an-extra2 "3rd Berkeley Distribution -. if "\\$1"4" .ds an-extra2 "4th Berkeley Distribution -. if "\\$1"5" .ds an-extra2 "4.2 Berkeley Distribution -. if "\\$1"6" .ds an-extra2 "4.3 Berkeley Distribution -. if "\\$1"7" .ds an-extra2 "4.4 Berkeley Distribution +. ds an-extra2 "3rd Berkeley Distribution\" +. if "\\$1"3" .ds an-extra2 "3rd Berkeley Distribution\" +. if "\\$1"4" .ds an-extra2 "4th Berkeley Distribution\" +. if "\\$1"5" .ds an-extra2 "4.2 Berkeley Distribution\" +. if "\\$1"6" .ds an-extra2 "4.3 Berkeley Distribution\" +. if "\\$1"7" .ds an-extra2 "4.4 Berkeley Distribution\" .. . .de1 DT @@ -299,14 +299,14 @@ . ie r X \{\ . if (\\n[%] > \\n[X]) \{\ . nr an-page-letter (\\n[%] - \\n[X]) -. ds an-page-string \\n[X]\\n[an-page-letter] +. ds an-page-string \\n[X]\\n[an-page-letter]\" . \} . \} . el \{\ . ie \\n[cR] \ -. ds an-page-string "\\*[an-title](\\*[an-section]) +. ds an-page-string "\\*[an-title](\\*[an-section])\" . el \ -. ds an-page-string \\n[%] +. ds an-page-string \\n[%]\" . \} . \} . BT @@ -487,13 +487,13 @@ . .de1 RI . if \\n[.$] \{\ -. ds an-result \&\f[R]\\$1 +. ds an-result \&\f[R]\\$1\" . shift . while (\\n[.$] >= 2) \{\ -. as an-result \,\f[I]\\$1\f[R]\/\\$2\\*[an-empty] +. as an-result \,\f[I]\\$1\f[R]\/\\$2\\*[an-empty]\" . shift 2 . \} -. if \\n[.$] .as an-result \,\f[I]\\$1 +. if \\n[.$] .as an-result \,\f[I]\\$1\" \\*[an-result] . ft R . \} @@ -501,13 +501,13 @@ . .de1 IR . if \\n[.$] \{\ -. ds an-result \&\f[I]\\$1\f[R] +. ds an-result \&\f[I]\\$1\f[R]\" . shift . while (\\n[.$] >= 2) \{\ -. as an-result \/\\$1\f[I]\,\\$2\f[R] +. as an-result \/\\$1\f[I]\,\\$2\f[R]\" . shift 2 . \} -. if \\n[.$] .as an-result \/\\$1 +. if \\n[.$] .as an-result \/\\$1\" \\*[an-result] . ft R . \} @@ -515,13 +515,13 @@ . .de1 IB . if \\n[.$] \{\ -. ds an-result \&\f[I]\\$1 +. ds an-result \&\f[I]\\$1\" . shift . while (\\n[.$] >= 2) \{\ -. as an-result \/\f[B]\\$1\f[I]\,\\$2\\*[an-empty] +. as an-result \/\f[B]\\$1\f[I]\,\\$2\\*[an-empty]\" . shift 2 . \} -. if \\n[.$] .as an-result \/\f[B]\\$1 +. if \\n[.$] .as an-result \/\f[B]\\$1\" \\*[an-result] . ft R . \} @@ -529,36 +529,36 @@ . .de1 BI . if \\n[.$] \{\ -. ds an-result \&\f[B]\\$1 +. ds an-result \&\f[B]\\$1\" . shift . while (\\n[.$] >= 2) \{\ -. as an-result \,\f[I]\\$1\f[B]\/\\$2\\*[an-empty] +. as an-result \,\f[I]\\$1\f[B]\/\\$2\\*[an-empty]\" . shift 2 . \} -. if \\n[.$] .as an-result \,\f[I]\\$1 +. if \\n[.$] .as an-result \,\f[I]\\$1\" \\*[an-result] . ft R . \} .. . .de1 RB -. ds an-result \& +. ds an-result \&\" . while (\\n[.$] >= 2) \{\ -. as an-result \f[R]\\$1\f[B]\\$2\\*[an-empty] +. as an-result \f[R]\\$1\f[B]\\$2\\*[an-empty]\" . shift 2 . \} -. if \\n[.$] .as an-result \f[R]\\$1 +. if \\n[.$] .as an-result \f[R]\\$1\" \\*[an-result] . ft R .. . .de1 BR -. ds an-result \& +. ds an-result \&\" . while (\\n[.$] >= 2) \{\ -. as an-result \f[B]\\$1\f[R]\\$2\\*[an-empty] +. as an-result \f[B]\\$1\f[R]\\$2\\*[an-empty]\" . shift 2 . \} -. if \\n[.$] .as an-result \f[B]\\$1 +. if \\n[.$] .as an-result \f[B]\\$1\" \\*[an-result] . ft R .. @@ -620,11 +620,11 @@ . .\" these strings must work in compatibility mode also . -.ds S \s'\\n(PSu' -.ie c\[tm] .ds Tm \(tm -.el .ds Tm (TM) -.ds lq \(lq -.ds rq \(rq +.ds S \s'\\n(PSu'\" +.ie c\[tm] .ds Tm \(tm\" +.el .ds Tm (TM)\" +.ds lq \(lq\" +.ds rq \(rq\" . .if !\n[an-html] \{\ . if !rHY \{\ @@ -636,6 +636,9 @@ . hy \n[HY] .\} . +.\" Load man macro extensions. +.mso an-ext.tmac +. .\" Load local modifications. .mso man.local . diff --git a/tmac/s.tmac b/tmac/s.tmac index 7927c233..f652c005 100644 --- a/tmac/s.tmac +++ b/tmac/s.tmac @@ -272,8 +272,8 @@ Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. .par@reset .if !'\\$1'no' \{\ . if '\*(.T'html' \{\ -. nf -. sp +. nf +. sp . \} . ft I . ce 1 @@ -1690,7 +1690,7 @@ Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. . nr eqn*have-num 0 . if !'\\*[eqn*num]'' .nr eqn*have-num 1 . ie \\n[dl]:\\n[eqn*have-num] \{\ -. sp \\n[DD]u +. sp \\n[DD]u . par@reset . ds eqn*tabs \\n[.tabs] . nf @@ -1698,8 +1698,8 @@ Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. .\" --fixme-- this really should not be necessary .\" and indicates that there is extra space creeping into .\" an equation when ps4html is enabled.. -. ie r ps4html .ds@need \\n[dn]u-1v+\n[.V]u+1i -. el .ds@need \\n[dn]u-1v+\n[.V]u +. ie r ps4html .ds@need \\n[dn]u-1v+\n[.V]u+1i +. el .ds@need \\n[dn]u-1v+\n[.V]u . chop eqn*div . ie \\n[eqn*type]=0 \{\ . ta (u;\\n[.l]-\\n[.i])R @@ -1717,8 +1717,8 @@ Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. . ta (u;\\n[.l]-\\n[.i])R \t\\*[eqn*num] . \} -.\". if !'\*(.T'html' .sp \\n[DD]u -. sp \\n[DD]u +.\". if !'\*(.T'html' .sp \\n[DD]u +. sp \\n[DD]u . ta \\*[eqn*tabs] . \} . el \{ |