X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/a50a1fa9e7b97ef6fe4aced1567b0bafdd5f4bd8..HEAD:/doc/tmac.rfc

diff --git a/doc/tmac.rfc b/doc/tmac.rfc
index 3b5e8a28..03609550 100644
--- a/doc/tmac.rfc
+++ b/doc/tmac.rfc
@@ -9,6 +9,8 @@
 .  if \n(.g \{\
 .    fam P
 .  \}
+.  ps 10
+.  vs 12
 .\}
 .el \{\
 .  po 0
@@ -29,18 +31,19 @@
 .
 .\"----- Font handling ------------------------------------------------------
 .
-.\" .Ff font [stuff more-stuff]
+.\" .Ff font nfont [stuff more-stuff]
 .\" Without stuff, changes to font.  With stuff, prints stuff in font
 .\" and more-stuff in the current font, with no intervening space.
 .ie t \{\
 .  de Ff
-.  ie '\\$2'' \f\\$1\c
-.  el \&\f\\$1\\$2\fP\\$3
+.  ie '\\$3'' \f\\$1\c
+.  el \&\f\\$1\\$3\fP\\$4
 ..
 .\}
 .el \{\
-.de Ff
-.if !'\\$2'' \\$2\\$3
+.  de Ff
+.  ie '\\$3'' \f\\$2\c
+.  el \&\f\\$2\\$3\fP\\$4
 ..
 .\}
 .
@@ -48,35 +51,48 @@
 .\" Change to appropriate font, or print stuff in chosen font followed
 .\" by more-stuff in current font, with no intervening space.
 .de R
-.Ff R "\\$1" "\\$2"
+.Ff R R "\\$1" "\\$2"
 ..
 .de B
-.Ff B "\\$1" "\\$2"
+.Ff B B "\\$1" "\\$2"
 ..
 .de I
-.Ff I "\\$1" "\\$2"
+.Ff I I "\\$1" "\\$2"
 ..
-.de P
-.Ff P "\\$1" "\\$2"
+.de PF
+.Ff P P "\\$1" "\\$2"
 ..
 .de C
-.Ff (CR "\\$1" "\\$2"
+.Ff (CR R "\\$1" "\\$2"
 ..
 .de CB
-.Ff (CB "\\$1" "\\$2"
+.Ff (CB B "\\$1" "\\$2"
 ..
 .de CI
-.Ff (CI "\\$1" "\\$2"
+.Ff (CI I "\\$1" "\\$2"
 ..
 .de H
-.Ff (HR "\\$1" "\\$2"
+.Ff (HR R "\\$1" "\\$2"
 ..
 .de HB
-.Ff (HB "\\$1" "\\$2"
+.Ff (HB B "\\$1" "\\$2"
 ..
 .de HI
-.Ff (HI "\\$1" "\\$2"
+.Ff (HI I "\\$1" "\\$2"
+..
+.
+.\"----- Paragraphs ---------------------------------------------------------
+.
+.ie t \{\
+.  de P
+.  sp .67
 ..
+.\}
+.el \{\
+.  de P
+.  sp 1
+..
+.\}
 .
 .\"----- Titling ------------------------------------------------------------
 .
@@ -85,7 +101,7 @@
 .de TL
 .B
 .tl '\\$1''\\$2'
-.P
+.PF
 ..
 .
 .\" .TT number author title
@@ -101,7 +117,7 @@
 .ce
 \&\\$4
 .ps
-.P
+.PF
 .fi
 .in +3m
 ..
@@ -124,7 +140,7 @@
 .  el \&\\$3.\ \ \c
 .\}
 \&\\$2
-.P
+.PF
 .ps
 .br
 ..
@@ -169,6 +185,7 @@
 .\" Puts in the header for a bibliography item.
 .de BR
 .ne 2
+.P
 .ti -\\n(bwu
 [\\$1]\h'\\n(bwu-\\w'[\\$1]'u'\c
 ..
@@ -210,7 +227,7 @@
 .nr ul 0
 .de do
 .ie t .ds b\\$1 \\$2
-.el .ds b\\$1 \\$3
+.el .ds b\\$1 \fB\\$3\fP
 ..
 .do 0 \(bu o
 .do 1 \(em \-
@@ -258,18 +275,18 @@
 .\" .DI name
 .\" Starts a definition item for `name'
 .de DI
-.br
+.P
 .B
 \h'-1i'\\$1\c
 .ie \w'\\$1\h'2n''u<1i \h'1i-\w'\\$1'u'\c
 .el .br
-.P
+.PF
 ..
 .
 .\" .LI [tag]
 .\" Starts a new list item
 .de LI
-.br
+.P
 .ie '\\$1'' .ds LL \\*L
 .el .ds LL \\$1
 \h'-\w'\\*(LL\h'1n''u'\\*(LL\h'1n'\c
@@ -280,6 +297,7 @@
 .\" .QS
 .\" Starts a display.
 .de QS
+.P
 .in +4n
 .ll -4n
 ..