1 files changed, 77 insertions, 7 deletions
diff --git a/contrib/groff/tmac/X.tmac b/contrib/groff/tmac/X.tmac
index 8b9a1ba..d19280e 100644
--- a/contrib/groff/tmac/X.tmac
+++ b/contrib/groff/tmac/X.tmac
@@ -14,16 +14,17 @@
 .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'
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.char ~ \v'-.55m'\s[\En(.s/2u]\v'.2m'\[ti]\v'-.2m'\s0\v'.55m'
+.char ^ \v'-.55m'\s[\En(.s/2u]\v'.3m'\[ha]\v'-.3m'\s0\v'.55m'
 .fchar \[va] \o'\[ua]\[da]'
-.fchar \[em] --
+.fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0'
 .fchar \[en] \-
 .fchar \[fi] fi
 .fchar \[fl] fl
 .fchar \[ff] ff
-.fchar \[Fi] ffi
-.fchar \[Fl] ffl
+.fchar \[Fi] f\[fi]
+.fchar \[Fl] f\[fl]
 .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'
@@ -43,10 +44,79 @@
 .fchar \[rh] \[rA]
 .fchar \[bq] ,
 .fchar \[aq] '
+.fchar \[IJ] IJ
+.fchar \[ij] ij
+.fchar \[fo] <
+.fchar \[fc] >
+.fchar \[OK] \s[\En[.s]*6u/10u]\[rs]\s[0]/
+.
+.fchar \[<<] <\h'-.3m'<
+.fchar \[>>] >\h'-.3m'>
+.fchar \[|=] \v'.1m'\Z'\[mi]'\v'-.2m'\[ap]\v'.1m'
+.fchar \[nc] \v'.1m'\Z'\h'.2m'\F[T]\f[R]/'\v'-.1m'\[sp]
+.fchar \[ne] \v'.07m'\Z'\h'.2m'\F[T]\f[R]/'\v'-.07m'\[==]
+.fchar \[-h] \F[T]\f[I]\v'-.58m'\Z'\h'.1m'\D'l .3m 0''\v'.58m'h
+.fchar \[hbar] \[-h]
+.
+.de X-achar
+.  \" Note that character definitions are always interpreted with
+.  \" compatibility mode off.
+.  fchar \\$1 \
+\\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\En[skw]+(\w'x'*0)-\\En[skw])'\
+\v'(u;\w'x'*0+\\En[rst]+(\w'\\$3'*0)-\\En[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\En[rst]+(\w'\\$3'*0)+\\En[rst])'\
+\h'|\\En[acc]u'
+.  hcode \\$1\\$4
+..
+.
+.X-achar \['C] \'    C c
+.X-achar \['c] \'    c c
+.X-achar \[:Y] \[ad] Y y
+.
+.de X-frac
+.  schar \[\\$1\\$2] \
+\v'-.28m'\s[\\En[.s]*6u/10u]\\$1\s0\v'.28m'\
+\h'-.1m'\[f/]\h'-.1m'\
+\s[\\En[.s]*6u/10u]\\$2
+..
+.
+.de X-frac-mono
+.  fschar \\$1 \[\\$2\\$3] \
+\Z'\v'-.28m'\s[\\En[.s]*5u/10u]\\$2\s0\v'.28m''\
+\Z'\h'0.25m'\[f/]'\
+\Z'\h'.35m'\s[\\En[.s]*5u/10u]\\$3\s0'\
+\h'\w'M'u'
+..
+.
+.X-frac 1 8
+.X-frac 3 8
+.X-frac 5 8
+.X-frac 7 8
+.
+.X-frac-mono CR 1 8
+.X-frac-mono CR 3 8
+.X-frac-mono CR 5 8
+.X-frac-mono CR 7 8
+.X-frac-mono CI 1 8
+.X-frac-mono CI 3 8
+.X-frac-mono CI 5 8
+.X-frac-mono CI 7 8
+.X-frac-mono CB 1 8
+.X-frac-mono CB 3 8
+.X-frac-mono CB 5 8
+.X-frac-mono CB 7 8
+.X-frac-mono CBI 1 8
+.X-frac-mono CBI 3 8
+.X-frac-mono CBI 5 8
+.X-frac-mono CBI 7 8
+.
 .if '\*[.T]'X100' \
 .  char \[radicalex] \h'-\w'\[sr]'u'\[radicalex]\h'\w'\[sr]'u'
-.if !\n[_C] \
-.  mso pspic.tmac
+.fchar \[sqrtex] \[radicalex]
+.
 .cp \n[_C]
 .
 .do ie '\[char97]'a' \