* tmac/dvi.tmac, tmac/X.tmac: Replace `.char' with `.fchar'.

* tmac/ec.tmac: Remove `.rchar' calls (no longer necessary since
we use `.fchar' in dvi.tmac.
* tmac/Xps.tmac: Simplify some char definitions.
Add definition for \[f/].
* man/groff_char.man: Updated for new X.tmac.

1 files changed, 38 insertions, 41 deletions

diff --git a/tmac/dvi.tmac b/tmac/dvi.tmac
index 39e2d7d0..1abebf25 100644
--- a/tmac/dvi.tmac
+++ b/tmac/dvi.tmac
@@ -18,57 +18,56 @@
 .fspecial HBI CWI
 .
 .\" This uses the dvi-char_1 string in font CW or CWI, dvi-char_0 otherwise.
-.char _ \
+.fchar _ \
 \R'dvi-char_ ((\\n[.f] == \f[CW]\\n[.f]\f[P]) : \
               (\\n[.f] == \f[CWI]\\n[.f]\f[P]))'\\*[dvi-char_\\n[dvi-char_]]
-.char \[ul] \R'dvi-char_ \w'M'==\w'i''\\*[dvi-char_\\n[dvi-char_]]
+.fchar \[ul] \R'dvi-char_ \w'M'==\w'i''\\*[dvi-char_\\n[dvi-char_]]
 .\" Normally use a rule.
 .\" This is designed so that \(ul, \(rn and \(br form corners.
 .ds dvi-char_0 \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
 .\" In font CW and CWI use a real _ character.
 .ds dvi-char_1 _
 .
-.if !c\[radicalex] .char \[radicalex] \D'R .5m -.04m'\v'.04m'
-.if !c\[br] .char \[br] \Z'\v'.25m'\D'R .04m -1m''
-.if !c\[ru] .char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
-.if !c\[rn] .char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
-.if !c\[co] .char \[co] \
+.fchar \[radicalex] \D'R .5m -.04m'\v'.04m'
+.fchar \[br] \Z'\v'.25m'\D'R .04m -1m''
+.fchar \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
+.fchar \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.fchar \[co] \
 \z\s-2\[ci]\s0\
 \h'\w'\s-2\[ci]\s0'u-\w'\s-4C\s0'u/2u'\
 \s-4C\s0\
 \h'\w'\s-2\[ci]\s0'u-\w'\s-4C\s0'u/2u'
-.if !c\[rg] .char \[rg] \
+.fchar \[rg] \
 \z\s-2\[ci]\s0\
 \h'\w'\s-2\[ci]\s0'u-\w'\s-4R\s0'u/2u'\
 \s-4R\s0\
 \h'\w'\s-2\[ci]\s0'u-\w'\s-4R\s0'u/2u'
-.if !c\[fm] .char \[fm] \v'-.35m'\s[\\n[.s]*7u/10u]\[prime]\s0\v'.35m'
-.if !c\[de] .char \[de] \h'.05m'\v'-.54m'\D'c .3m'\v'.54m'\h'.05m'
-.if !c\[ct] .char \[ct] \o'c/'
-.if !c\[sq] .char \[sq] \
+.fchar \[fm] \v'-.35m'\s[\\n[.s]*7u/10u]\[prime]\s0\v'.35m'
+.fchar \[de] \h'.05m'\v'-.54m'\D'c .3m'\v'.54m'\h'.05m'
+.fchar \[ct] \o'c/'
+.fchar \[sq] \
 \Z'\h'.05m'\D'R .4m -.04m'\v'.04m'\h'-.04m'\
 \D'R .04m -.4m'\v'.04m'\D'R -.4m -.04m'\D'R .04m .4m''\h'.5m'
 .\"char \[sq] \h'.05m'\D'l .4m 0'\D'l 0 -.4m'\D'l -.4m 0'\D'l 0 .4m'\h'.45m'
-.if !c\[!=] .char \[!=] \[slashnot]\[eq]
-.if !c\[tm] .char \[tm] \v'-.3m'\s[\\n[.s]/2u]TM\s0\v'.3m'
-.if !c\[aq] .char \[aq] '
-.if !c\[bq] .char \[bq] ,
-.if !c\[Bq] .char \[Bq] ,\h'\w'\[rq]'u-(2u*\w"'"u)',
-.if !c\[ho] .char \[ho] \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
-.if !c\[-D] .char \[-D] \Z'\v'-.1m'\h'.05m'-'D
-.if !c\[Sd] .char \[Sd] \Z'\v'-.3m'\h'.35m'-'\[pd]
-.if !c\[TP] .char \[TP] \
+.fchar \[!=] \[slashnot]\[eq]
+.fchar \[tm] \v'-.3m'\s[\\n[.s]/2u]TM\s0\v'.3m'
+.fchar \[aq] '
+.fchar \[bq] ,
+.fchar \[Bq] ,\h'\w'\[rq]'u-(2u*\w"'"u)',
+.fchar \[ho] \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
+.fchar \[-D] \Z'\v'-.1m'\h'.05m'-'D
+.fchar \[Sd] \Z'\v'-.3m'\h'.35m'-'\[pd]
+.fchar \[TP] \
 I\h'-.25m'\v'-.33m'\s[\En[.s]*6u/10u]\v'.33m'\
 D\v'-.33m'\s0\v'.33m'
-.if !c\[Tp] .char \[Tp] \zlp
-.if !c\[nb] .char \[nb] \[slashnot]\[sb]
+.fchar \[Tp] \zlp
+.fchar \[nb] \[slashnot]\[sb]
 .cflags 8 \[an]
-.if !c\[an] .char \[an] \h'-.167m'\[mi]\h'-.167m'
+.fchar \[an] \h'-.167m'\[mi]\h'-.167m'
 .
 .\" Define some fractions.
 .de dvi-frac
-.  if !c\[\\$1\\$2] \
-.    char \[\\$1\\$2] \
+.  fchar \[\\$1\\$2] \
 \v'-.25m'\s[\\\\n[.s]*7u/10u]\\$1\s0\v'.25m'\h'-.2m'\
 /\h'-.2m'\v'.25m'\s[\\\\n[.s]*7u/10u]\\$2\s0\v'-.25m'
 ..
@@ -82,22 +81,21 @@ D\v'-.33m'\s0\v'.33m'
 .dvi-frac 7 8
 .
 .\" support for ISO Latin-1
-.if !c\[S1] .char \[S1] \v'-.2m'\s-31\s+3\v'+.2m'
-.if !c\[S2] .char \[S2] \v'-.2m'\s-32\s+3\v'+.2m'
-.if !c\[S3] .char \[S3] \v'-.2m'\s-33\s+3\v'+.2m'
-.if !c\[Of] .char \[Of] \v'-.2m'\s'\En[.s]*6u/10u'\o'_a'\s0\v'.2m'
-.if !c\[Om] .char \[Om] \v'-.2m'\s'\En[.s]*6u/10u'\o'_o'\s0\v'.2m'
-.if !c\[Fo] .char \[Fo] <<
-.if !c\[Fc] .char \[Fc] >>
-.if !c\[bb] .char \[bb] |
-.if !c\[Ye] .char \[Ye] \o'-Y'
-.if !c\[Cs] .char \[Cs] \o'\[mu]o'
+.fchar \[S1] \v'-.2m'\s-31\s+3\v'+.2m'
+.fchar \[S2] \v'-.2m'\s-32\s+3\v'+.2m'
+.fchar \[S3] \v'-.2m'\s-33\s+3\v'+.2m'
+.fchar \[Of] \v'-.2m'\s'\En[.s]*6u/10u'\o'_a'\s0\v'.2m'
+.fchar \[Om] \v'-.2m'\s'\En[.s]*6u/10u'\o'_o'\s0\v'.2m'
+.fchar \[Fo] <<
+.fchar \[Fc] >>
+.fchar \[bb] |
+.fchar \[Ye] \o'-Y'
+.fchar \[Cs] \o'\[mu]o'
 .
 .de dvi-achar
 .  \" Note that character definitions are always interpreted with
 .  \" compatibility mode off.
-.  if !c\\$1 \{\
-.    char \\$1 \
+.  fchar \\$1 \
 \\$3\
 \k[acc]\
 \h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
@@ -105,7 +103,6 @@ D\v'-.33m'\s0\v'.33m'
 \\$2\
 \v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
 \h'|\\\\n[acc]u'
-.  \}
 .  hcode \\$1\\$4
 ..
 .
@@ -160,9 +157,9 @@ D\v'-.33m'\s0\v'.33m'
 .dvi-achar \[:u] \[ad] u     u
 .dvi-achar \['y] \'    y     y
 .dvi-achar \[:y] \[ad] y     y
-.if !c\[,C] .char \[,C] \o'\[ac]C'
+.fchar \[,C] \o'\[ac]C'
 .hcode \[,C]c
-.if !c\[,c] .char \[,c] \o'\[ac]c'
+.fchar \[,c] \o'\[ac]c'
 .hcode \[,c]c
 .
 .\" now for color definitions