* 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.

6 files changed, 128 insertions, 149 deletions

diff --git a/ChangeLog b/ChangeLog
index 58fb0f90..a1d8a838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-24  Werner LEMBERG  <wl@gnu.org>
+
+	* 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.
+
 2002-03-23  Phil Lobbes  <phil@perkpartners.com>
 
 	* Makefile.comm (.y.o): New rule for make on Solaris 2.5.1 -- the
diff --git a/man/groff_char.man b/man/groff_char.man
index 1f9e0408..f67a2b6a 100644
--- a/man/groff_char.man
+++ b/man/groff_char.man
@@ -35,6 +35,10 @@ the original English.
 .	\"
 .	\" The following line prevents this.
 .	if '\*[.T]'dvi' .if !r ECFONTS .ds aq \'
+.	\" The same is true for X
+.	ds dev \*[.T]
+.	substring dev 1 1
+.	if '\*[dev]'X' .ds aq \'
 .\}
 .
 .if !\n(.g .ig
diff --git a/tmac/X.tmac b/tmac/X.tmac
index 464770c6..0473fc90 100644
--- a/tmac/X.tmac
+++ b/tmac/X.tmac
@@ -10,39 +10,41 @@
 .ftr HO HI
 .ftr HX HBI
 .ftr NX NBI
-.char \(ru \D'l .5m 0'
-.char \(ul \v'.25m'\D'l .5m 0'\v'-.25m'
-.char \(br \v'.25m'\D'l 0 -1m'\v'.75m'
-.char \(rn \v'-.75m'\D'l .5m 0'\v'.75m'
-.char ~ \v'-.55m'\\s[\\n(.s/2u]\v'.2m'\(ti\v'-.2m'\s0\v'.55m'
-.char ^ \v'-.55m'\\s[\\n(.s/2u]\v'.3m'\(ha\v'-.3m'\s0\v'.55m'
-.if !c\(va .char \(va \o'\(ua\(da'
-.if !c\(em .char \(em --
-.if !c\(en .char \(en \-
-.if !c\(fi .char \(fi fi
-.if !c\(fl .char \(fl fl
-.if !c\(ff .char \(ff ff
-.if !c\(Fi .char \(Fi ffi
-.if !c\(Fl .char \(Fl ffl
-.if !c\(ci .char \(ci \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
-.if !c\(sq .char \(sq \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
-.if !c\(ga .char \(ga \Z'\v'-.7m'\D'l .22m .18m''\h'.33m'
-.if !c\(dg .char \(dg \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
+.char \[ru] \D'l .5m 0'
+.char \[ul] \v'.25m'\D'l .5m 0'\v'-.25m'
+.char \[br] \v'.25m'\D'l 0 -1m'\v'.75m'
+.char \[rn] \v'-.75m'\D'l .5m 0'\v'.75m'
+.char ~ \v'-.55m'\\s[\\n(.s/2u]\v'.2m'\[ti]\v'-.2m'\s0\v'.55m'
+.char ^ \v'-.55m'\\s[\\n(.s/2u]\v'.3m'\[ha]\v'-.3m'\s0\v'.55m'
+.fchar \[va] \o'\[ua]\[da]'
+.fchar \[em] --
+.fchar \[en] \-
+.fchar \[fi] fi
+.fchar \[fl] fl
+.fchar \[ff] ff
+.fchar \[Fi] ffi
+.fchar \[Fl] ffl
+.fchar \[ci] \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
+.fchar \[sq] \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
+.fchar \[ga] \Z'\v'-.7m'\D'l .22m .18m''\h'.33m'
+.fchar \[dg] \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
 \D'l .39m 0''\h'.5m'
-.if !c\(dd .char \(dd \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
+.fchar \[dd] \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
 \D'l .39m 0'\v'.4m'\D'l -.39m 0''\h'.5m'
-.if !c\(lq .char \(lq ``
-.if !c\(rq .char \(rq ''
-.if !c\(Bq .char \(Bq ,,
-.if !c\(OE .char \(OE O\h'-.25m'E
-.if !c\(oe .char \(oe o\h'-.14m'e
-.if !c\(ah .char \(ah \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
-.if !c\(ao .char \(ao \v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'
-.if !c\(ho .char \(ho \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
-.if !c\(lh .tr \(lh\(lA
-.if !c\(rh .tr \(rh\(rA
-.if !c\(bq .tr \(bq,
-.if !c\(aq .tr \(aq'
-.if '\*(.T'X100' .char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
-.if !\n(_C .mso pspic.tmac
-.cp \n(_C
+.fchar \[lq] ``
+.fchar \[rq] ''
+.fchar \[Bq] ,,
+.fchar \[OE] O\h'-.25m'E
+.fchar \[oe] o\h'-.14m'e
+.fchar \[ah] \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
+.fchar \[ao] \v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'
+.fchar \[ho] \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
+.fchar \[lh] \[lA]
+.fchar \[rh] \[rA]
+.fchar \[bq] ,
+.fchar \[aq] '
+.if '\*[.T]'X100' \
+.  char \[radicalex] \h'-\w'\[sr]'u'\[radicalex]\h'\w'\[sr]'u'
+.if !\n[_C] \
+.  mso pspic.tmac
+.cp \n[_C]
diff --git a/tmac/Xps.tmac b/tmac/Xps.tmac
index ddb037a0..b8ce311b 100644
--- a/tmac/Xps.tmac
+++ b/tmac/Xps.tmac
@@ -4,43 +4,45 @@
 .nr _C \n(.C
 .cp 0
 .de Xps-char
-.char \\$1 \Z"\X'ps: invis'\\$2\X'ps: endinvis'"\\$1
+.  char \\$1 \Z"\X'ps: invis'\\$2\X'ps: endinvis'"\\$1
 ..
-.Xps-char \(bu \fS\(bu\fP
-.Xps-char \(em "\v'-.25m'\h'.05m'\D'l .9m 0'\h'.05m'"
-.Xps-char \(aq '
-.Xps-char \(bq ,
-.Xps-char \(Bq ,,
-.Xps-char \(lq ``
-.Xps-char \(rq ''
-.Xps-char \(OE OE
-.Xps-char \(oe oe
-.Xps-char \(Fn \fS\(Fn\fP
-.Xps-char \(vS \o'\(ahS'
-.Xps-char \(vs \o'\(ahs'
-.Xps-char \(vZ \o'\(ahZ'
-.Xps-char \(vz \o'\(ahz'
-.Xps-char \(/L \o'/L'
-.Xps-char \(/l \o'/l'
-.Xps-char \(:Y \o'\(adY'
-.Xps-char \(a" \(sd
-.Xps-char \(a. \v'-.6m'.
-.Xps-char \(ga "\Z'\v'-.7m'\D'l .22m .18m''\h'.33m'"
-.Xps-char \(ab \v'-.55m'\s'\\\\n(.s*6u/10u'u\s0
-.Xps-char \(ah \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
-.Xps-char \(ao "\v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'"
-.Xps-char \(ho \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
-.Xps-char \(.i i
-.Xps-char \(fo <
-.Xps-char \(fc >
-.Xps-char \(OK \s'\\\\n(.s*6u/10u'\e\s0/
-.Xps-char \(tm \v'-.3m'\s'\\\\n(.s*6u/10u'TM\s0\v'.3m'
-.Xps-char \(dd "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0'\v'.4m'\D'l -.39m 0''\h'.5m'"
-.Xps-char \(dg "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0''\h'.5m'"
-.Xps-char \(en \-
-.Xps-char \(%0 %\s'\\\\n(.s*6u/10u'\fI0\fP\s0
-.Xps-char \(lh \(->
-.Xps-char \(rh \(<-
-.cp \n(_C
+.
+.Xps-char \[bu] \f[S]\[bu]\f[P]
+.Xps-char \[f/] \f[S]\[f/]\f[P]
+.Xps-char \[em] "\v'-.25m'\h'.05m'\D'l .9m 0'"
+.Xps-char \[aq] '
+.Xps-char \[bq] ,
+.Xps-char \[Bq] ,,
+.Xps-char \[lq] ``
+.Xps-char \[rq] ''
+.Xps-char \[OE] OE
+.Xps-char \[oe] oe
+.Xps-char \[Fn] \f[S]\[Fn]\f[P]
+.Xps-char \[vS] \o'\[ah]S'
+.Xps-char \[vs] \o'\[ah]s'
+.Xps-char \[vZ] \o'\[ah]Z'
+.Xps-char \[vz] \o'\[ah]z'
+.Xps-char \[/L] \o'/L'
+.Xps-char \[/l] \o'/l'
+.Xps-char \[:Y] \o'\[ad]Y'
+.Xps-char \[a"] \[sd]
+.Xps-char \[a.] \v'-.6m'.
+.Xps-char \[ga] "\Z'\v'-.7m'\D'l .22m .18m''"
+.Xps-char \[ab] \v'-.55m'\s[\En[.s]*6u/10u]u\s[0]
+.Xps-char \[ah] \v'-.55m'\s[\En[.s]/2u]v\s[0]
+.Xps-char \[ao] "\v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s[0]"
+.Xps-char \[ho] \s[\En[.s]/2u]\v'.4m'c\s[0]
+.Xps-char \[.i] i
+.Xps-char \[fo] <
+.Xps-char \[fc] >
+.Xps-char \[OK] \s[\En[.s]*6u/10u]\e\s[0]/
+.Xps-char \[tm] \v'-.3m'\s[\En[.s]*6u/10u]TM\s[0]
+.Xps-char \[dd] "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
+\D'l .39m 0'\v'.4m'\D'l -.39m 0''"
+.Xps-char \[dg] "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
+\D'l .39m 0''"
+.Xps-char \[en] \-
+.Xps-char \[%0] %\s[\En[.s]*6u/10u]\f[I]0\f[P]\s[0]
+.Xps-char \[lh] \[->]
+.Xps-char \[rh] \[<-]
+.cp \n[_C]
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
diff --git a/tmac/ec.tmac b/tmac/ec.tmac
index 420606cf..2104abb4 100644
--- a/tmac/ec.tmac
+++ b/tmac/ec.tmac
@@ -40,41 +40,6 @@
 .fspecial CWEC CWTC
 .fspecial CWIEC CWITC
 .
-.rchar _
-.rchar \[rn]
-.rchar \[co] \[rg]
-.rchar \[de]
-.rchar \[ct]
-.rchar \[sq]
-.rchar \[tm]
-.rchar \[aq]
-.rchar \[bq] \[Bq]
-.rchar \[ho]
-.rchar \[-D]
-.rchar \[Sd]
-.rchar \[TP] \[Tp]
-.rchar \[14] \[12] \[34]
-.rchar \[S1] \[S2] \[S3]
-.rchar \[Of] \[Om]
-.rchar \[Fo] \[Fc]
-.rchar \[bb]
-.rchar \[Ye] \[Cs]
-.rchar \[`A] \['A] \[^A] \[~A] \[:A] \[oA]
-.rchar \[`E] \['E] \[^E] \[:E]
-.rchar \[`I] \['I] \[^I] \[:I]
-.rchar \[~N]
-.rchar \[`O] \['O] \[^O] \[~O] \[:O]
-.rchar \[`U] \['U] \[^U] \[:U]
-.rchar \['Y]
-.rchar \[`a] \['a] \[^a] \[~a] \[:a] \[oa]
-.rchar \[`e] \['e] \[^e] \[:e]
-.rchar \[`i] \['i] \[^i] \[:i]
-.rchar \[~n]
-.rchar \[`o] \['o] \[^o] \[~o] \[:o]
-.rchar \[`u] \['u] \[^u] \[:u]
-.rchar \['y] \[:y]
-.rchar \[,C] \[,c]
-.
 .\" an ID register
 .nr ECFONTS 1
 .