From 89ae130621f74f74eb8744109a5f500f7deb01cf Mon Sep 17 00:00:00 2001
From: wlemb <wlemb>
Date: Mon, 15 Apr 2002 10:21:12 +0000
Subject: Add new escape \F to switch font family.

* src/roff/troff/input.cc (token::next): Handle \F.
* src/roff/troff/env.cc (environment::set_family): Handle
`interrupted' flag.
* NEWS, doc/groff.texinfo, man/groff_diff.man, man/groff.man:
Document it.

* tmac/doc.tmac (doc-tag-list): Use \Z to avoid stretching of
spaces in tags.

* tmac/Xps.tmac: Remove some redundant code.

* tmac/doc-common, tmac/doc-ditroff, tmac/doc-nroff, tmac/doc.tmac,
tmac/dvi.tmac, contrib/groffer/groffer.man, man/roff.man,
man/groff_out.man, man/groff.man, man/groff_diff.man,
src/roff/groff/groff.man: Replace \f[P] with \f[].
---
 tmac/doc.tmac | 66 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'tmac/doc.tmac')

diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 3b640e75..334102ac 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -158,7 +158,7 @@
 .
 .  \" handle `|' and `...' specially
 .  ie        "\$1"|" \
-.    ds doc-arg\n[doc-arg-limit] \f[R]|\f[P]
+.    ds doc-arg\n[doc-arg-limit] \f[R]|\f[]
 .  el \{ .ie "\$1"..." \
 .    ds doc-arg\n[doc-arg-limit] \|.\|.\|.
 .  el \
@@ -207,7 +207,7 @@
 .  nr doc-arg-limit +1
 .
 .  ie        "\*[doc-arg\n[doc-arg-limit]]"|" \
-.    ds doc-arg\n[doc-arg-limit] \f[R]|\f[P]
+.    ds doc-arg\n[doc-arg-limit] \f[R]|\f[]
 .  el \{ .if "\*[doc-arg\n[doc-arg-limit]]"..." \
 .    ds doc-arg\n[doc-arg-limit] \|.\|.\|.
 .  \}
@@ -360,7 +360,7 @@
 .
 .    if !\n[.$] \{\
 .      \" no arguments
-.      nop \|\-\|\f[P]\s[0]
+.      nop \|\-\|\f[]\s[0]
 .  \}\}
 .
 .  if !\n[doc-arg-limit] \
@@ -369,12 +369,12 @@
 .  nr doc-arg-ptr +1
 .  ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
 .    \" last argument
-.    nop \|\-\f[P]\s[0]\c
+.    nop \|\-\f[]\s[0]\c
 .    doc-print-and-reset
 .  \}
 .  el \{\
 .    ie (\n[doc-type\n[doc-arg-ptr]] == 1) \{\
-.      nop \|\-\f[P]\s[0]\c
+.      nop \|\-\f[]\s[0]\c
 .      \*[doc-arg\n[doc-arg-ptr]]
 .    \}
 .    el \{\
@@ -403,7 +403,7 @@
 .  ds doc-str-dfr "\*[doc-arg\n[doc-arg-ptr]]
 .
 .  ie (\n[doc-reg-dfr1] == 1) \{\
-.    nop \f[P]\s[0]\c
+.    nop \f[]\s[0]\c
 .    \*[doc-str-dfr]
 .  \}
 .  el \{\
@@ -419,10 +419,10 @@
 .        nop \)\*[Ba]\c
 .      \}
 .      el \{\
-.        ie "\*[doc-str-dfr]"\f[R]|\f[P]" \{\
+.        ie "\*[doc-str-dfr]"\f[R]|\f[]" \{\
 .          if \n[doc-reg-Fl] \
 .            nop \|\-\*[doc-space]\c
-.          nop \f[R]|\f[P]\c
+.          nop \f[R]|\f[]\c
 .        \}
 .        el \{\
 .          \" two consecutive hyphen characters?
@@ -433,14 +433,14 @@
 .    \}\}\}
 .    el \{\
 .      nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
-.      nop \)\*[doc-str-dfr]\f[P]\s[0]\c
+.      nop \)\*[doc-str-dfr]\f[]\s[0]\c
 .    \}
 .
 .    ie (\n[doc-arg-limit] == \n[doc-arg-ptr]) \{\
 .      \" last argument
 .      if (\n[doc-reg-dfr1] == 4) \
 .        nop \|\-\c
-.      nop \f[P]\s[0]\c
+.      nop \f[]\s[0]\c
 .      doc-print-and-reset
 .    \}
 .    el \{\
@@ -489,7 +489,7 @@
 .    el \{\
 .      \" punctuation character
 .      nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
-.      nop \)\*[doc-str-dpr]\f[P]\s[0]\c
+.      nop \)\*[doc-str-dpr]\f[]\s[0]\c
 .    \}
 .
 .    nr doc-arg-ptr +1
@@ -516,7 +516,7 @@
 .    if !(\n[doc-type\n[doc-arg-ptr]] == 4) \
 .      break
 .    nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
-.    nop \)\*[doc-arg\n[doc-arg-ptr]]\f[P]\s[0]\c
+.    nop \)\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0]\c
 .    nr doc-arg-ptr +1
 .  \}
 ..
@@ -599,7 +599,7 @@
 .
 .    if !\n[.$] \{\
 .      \" no argument
-.      nop \)\*[doc-str-Ar-default]\&\f[P]\s[0]
+.      nop \)\*[doc-str-Ar-default]\&\f[]\s[0]
 .  \}\}
 .
 .  if !\n[doc-arg-limit] \
@@ -608,7 +608,7 @@
 .  nr doc-arg-ptr +1
 .  doc-print-prefixes
 .  ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
-.    nop \)\*[doc-str-Ar-default]\&\f[P]\s[0]\c
+.    nop \)\*[doc-str-Ar-default]\&\f[]\s[0]\c
 .    doc-print-and-reset
 .  \}
 .  el \{\
@@ -927,7 +927,7 @@
 .      doc-reset-args
 .    \}
 .    el \{\
-.      nop \*[doc-Nm-font]\*[doc-command-name]\f[P]\s[0]\c
+.      nop \*[doc-Nm-font]\*[doc-command-name]\f[]\s[0]\c
 .      doc-print-and-reset
 .  \}\}
 .  el \{\
@@ -940,7 +940,7 @@
 .      el \{\
 .        \" replace previous argument (Nm) with default value
 .        nr doc-arg-ptr -1
-.        ds doc-arg\n[doc-arg-ptr] "\*[doc-Nm-font]\*[doc-command-name]\f[P]\s[0]
+.        ds doc-arg\n[doc-arg-ptr] "\*[doc-Nm-font]\*[doc-command-name]\f[]\s[0]
 .        nr doc-type\n[doc-arg-ptr] 2
 .        ds doc-space\n[doc-arg-ptr] "\*[doc-space]
 .
@@ -992,7 +992,7 @@
 .
 .    if !\n[.$] \{\
 .      \" default value
-.      nop \*[doc-Pa-font]~\f[P]\s[0]
+.      nop \*[doc-Pa-font]~\f[]\s[0]
 .  \}\}
 .
 .  if !\n[doc-arg-limit] \
@@ -1019,7 +1019,7 @@
 .    doc-print-recursive
 .  \}
 .  el \{\
-.    nop \*[doc-Pa-font]~\f[P]\s[0]\c
+.    nop \*[doc-Pa-font]~\f[]\s[0]\c
 .    doc-print-and-reset
 .  \}
 ..
@@ -3858,7 +3858,7 @@
 .
 .de doc-bullet-list
 .  nr doc-in-list 1
-.  nop \)\*[doc-Sy-font]\[bu]\f[P]
+.  nop \)\*[doc-Sy-font]\[bu]\f[]
 .  doc-do-list
 ..
 .
@@ -3871,7 +3871,7 @@
 .
 .de doc-dash-list
 .  nr doc-in-list 1
-.  nop \)\*[doc-Sy-font]\-\f[P]
+.  nop \)\*[doc-Sy-font]\-\f[]
 .  doc-do-list
 ..
 .
@@ -3969,9 +3969,9 @@
 .  \}
 .  el \{\
 .    chop doc-item-box\n[doc-list-depth]
-.    nr doc-reg-dtl1 \n[.k]u
-.    nop \*[doc-item-box\n[doc-list-depth]]\c
-.    nop \h'|(\n[doc-reg-dtl1]u - \n[.k]u + \n[doc-reg-dtl]u)'\c
+.    \" Using \Z prevents stretching of the spaces in the tag
+.    nop \Z'\*[doc-item-box\n[doc-list-depth]]'\c
+.    nop \h'\n[doc-reg-dtl]u'\c
 .    nr doc-have-space 1
 .  \}
 .
@@ -4189,7 +4189,7 @@
 .    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
 .      nr doc-curr-font \n[.f]
 .      nr doc-curr-size \n[.ps]
-.      ds doc-arg\n[doc-arg-ptr] \*[doc-Xr-font]\*[doc-arg\n[doc-arg-ptr]]\f[P]\s[0]
+.      ds doc-arg\n[doc-arg-ptr] \*[doc-Xr-font]\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0]
 .
 .      if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
 .        nr doc-reg-Xr (\n[doc-arg-ptr] + 1)
@@ -4585,7 +4585,7 @@
 .
 .  if \n[.$] \
 .    nop \*[doc-Ft-font]\$*\c
-.  nop \ \f[P]\c
+.  nop \ \f[]\c
 ..
 .
 .
@@ -4681,12 +4681,12 @@
 .  if (\n[doc-func-arg-count] > 1) \{\
 .    nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|,\)\c
 .    nop \)\*[doc-space\n[doc-arg-ptr]]\*[doc-Fa-font]\c
-.    nop \)\*[doc-arg\n[doc-arg-ptr]]\f[P]\s[0]\c
+.    nop \)\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0]\c
 .  \}
 .
 .  if (\n[doc-func-arg-count] == 1) \{\
 .    nop \|\*[doc-Fa-font]\*[doc-arg\n[doc-arg-ptr]]\c
-.    nop \f[P]\s[0]\c
+.    nop \f[]\s[0]\c
 .  \}
 .  nr doc-func-arg-count +1
 .  doc-do-func
@@ -4775,7 +4775,7 @@
 .  nr doc-curr-font \n[.f]
 .  nr doc-curr-size \n[.ps]
 .  nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c
-.  nop \f[P]\s[0]\*[lp]\)\c
+.  nop \f[]\s[0]\*[lp]\)\c
 .
 .  nr doc-arg-ptr +1
 .  if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
@@ -4837,7 +4837,7 @@
 .    if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
 .      nr doc-reg-ddfa (\n[doc-arg-ptr] - 1)
 .      nop \|\f[\n[doc-curr-font]]\s[\n[doc-curr-size]u],\)\c
-.      nop \)\*[doc-space\n[doc-reg-ddfa]]\f[P]\s[0]\|\c
+.      nop \)\*[doc-space\n[doc-reg-ddfa]]\f[]\s[0]\|\c
 .      doc-do-func-args
 .  \}\}
 ..
@@ -4938,7 +4938,7 @@
 .    nr doc-curr-size \n[.ps]
 .
 .    nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c
-.    nop \f[P]\s[0]\*[lp]\)\c
+.    nop \f[]\s[0]\*[lp]\)\c
 .    doc-reset-args
 .  \}
 ..
@@ -6137,19 +6137,19 @@
 .ds doc-str-Rv-std-prefix "The
 .ds doc-str-Rv-std-suffix "function returns the value\~0 if successful;
 .as doc-str-Rv-std-suffix " otherwise the value\~-1 is returned and
-.as doc-str-Rv-std-suffix " the global variable \*[doc-Va-font]errno\f[P]
+.as doc-str-Rv-std-suffix " the global variable \*[doc-Va-font]errno\f[]
 .as doc-str-Rv-std-suffix " is set to indicate the error.
 .
 .ds doc-str-Rv-stds-prefix "The
 .ds doc-str-Rv-stds-and    "and
 .ds doc-str-Rv-stds-suffix "functions return the value\~0 if successful;
 .as doc-str-Rv-stds-suffix " otherwise the value\~-1 is returned and
-.as doc-str-Rv-stds-suffix " the global variable \*[doc-Va-font]errno\f[P]
+.as doc-str-Rv-stds-suffix " the global variable \*[doc-Va-font]errno\f[]
 .as doc-str-Rv-stds-suffix " is set to indicate the error.
 .
 .ds doc-str-Rv-std0 "Upon successful completion, the value\~0 is returned;
 .as doc-str-Rv-std0 " otherwise the value\~-1 is returned and
-.as doc-str-Rv-std0 " the global variable \*[doc-Va-font]errno\f[P]
+.as doc-str-Rv-std0 " the global variable \*[doc-Va-font]errno\f[]
 .as doc-str-Rv-std0 " is set to indicate the error.
 .
 .de Rv
-- 
cgit v1.2.1