7 files changed, 139 insertions, 9 deletions
diff --git a/tmac/X.tmac b/tmac/X.tmac
index 8b9a1ba8..74bd6a38 100644
--- a/tmac/X.tmac
+++ b/tmac/X.tmac
@@ -43,8 +43,30 @@
 .fchar \[rh] \[rA]
 .fchar \[bq] ,
 .fchar \[aq] '
+.fchar \[IJ] IJ
+.fchar \[ij] ij
+.
+.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+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
+\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
+\h'|\\\\n[acc]u'
+.  hcode \\$1\\$4
+..
+.
+.X-achar \['C] \'    C c
+.X-achar \['c] \'    c c
+.X-achar \[:Y] \[ad] Y y
+.
 .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 1064ba6b..764f9079 100644
--- a/tmac/Xps.tmac
+++ b/tmac/Xps.tmac
@@ -45,6 +45,27 @@
 .Xps-char \[%0] %\s[\En[.s]*6u/10u]\f[I]0
 .Xps-char \[lh] \[->]
 .Xps-char \[rh] \[<-]
+.
+.de Xps-achar
+.  \" Note that character definitions are always interpreted with
+.  \" compatibility mode off.
+.  fchar \\$1 \
+\\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
+\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
+\h'|\\\\n[acc]u'
+.  hcode \\$1\\$4
+..
+.
+.Xps-achar \['C] \' C c
+.Xps-achar \['c] \' c c
+.
+.fchar \[IJ] IJ
+.fchar \[ij] ij
+.
 .cp \n[_C]
 .
 .do ie '\[char97]'a' \
diff --git a/tmac/dvi.tmac b/tmac/dvi.tmac
index 4eb03b86..c532e841 100644
--- a/tmac/dvi.tmac
+++ b/tmac/dvi.tmac
@@ -17,18 +17,31 @@
 .fspecial HI CWI
 .fspecial HBI CWI
 .
-.\" This uses the dvi-char_1 string in font CW or CWI, dvi-char_0 otherwise.
-.fchar _ \
-\R'dvi-char_ ((\\n[.f] == \f[CW]\\n[.f]\f[]) : \
-              (\\n[.f] == \f[CWI]\\n[.f]\f[]))'\\*[dvi-char_\\n[dvi-char_]]
-.fchar \[ul] \R'dvi-char_ \w'M'==\w'i''\\*[dvi-char_\\n[dvi-char_]]
+.\" This uses the dvi-char-_-1 string in fixed-width fonts, dvi-char-_-0
+.\" otherwise.
+.fchar _ \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 _
+.ds dvi-char-_-0 \Z'\v'.08m'\D'R .54m .04m''\h'.5m'
+.\" In fixed-width fonts (CW and CWI) use a real _ character.
+.ds dvi-char-_-1 _
+.
+.fchar \[/l] \
+\R'dvi-char ((\w'M' == \w'i') + \
+             (\\n[.f] == \f[CWI]\\n[.f]\f[]))'\\*[dvi-char-/l-\\n[dvi-char]]
+.ds dvi-char-/l-0 \[slash@for@l]l
+.ds dvi-char-/l-1 \Z'\v'0.22v'\h'-0.02m'\''l
+.ds dvi-char-/l-2 \Z'\v'0.22v'\h'-0.13m'\''l
+.
+.fchar \[/L] \
+\R'dvi-char ((\w'M' == \w'i') + \
+             (\\n[.f] == \f[CWI]\\n[.f]\f[]))'\\*[dvi-char-/L-\\n[dvi-char]]
+.ds dvi-char-/L-0 \h'\w'L'u-\w'\[slash@for@l]L'u'\[slash@for@l]L
+.ds dvi-char-/L-1 \Z'\v'0.22v'\h'-0.14m'\''L
+.ds dvi-char-/L-2 \Z'\v'0.22v'\h'-0.21m'\''L
 .
 .fchar \[radicalex] \D'R .5m -.04m'\v'.04m'
+.fchar \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
 .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'
@@ -92,6 +105,9 @@ D\v'-.33m'\s0\v'.33m'
 .fchar \[Ye] \o'-Y'
 .fchar \[Cs] \o'\[mu]o'
 .
+.fchar \[IJ] IJ
+.fchar \[ij] ij
+.
 .de dvi-achar
 .  \" Note that character definitions are always interpreted with
 .  \" compatibility mode off.
@@ -112,6 +128,7 @@ D\v'-.33m'\s0\v'.33m'
 .dvi-achar \[~A] ~     A     a
 .dvi-achar \[:A] \[ad] A     a
 .dvi-achar \[oA] \[ao] A     a
+.dvi-achar \['C] \'    C     c
 .dvi-achar \[`E] \`    E     e
 .dvi-achar \['E] \'    E     e
 .dvi-achar \[^E] ^     E     e
@@ -138,6 +155,7 @@ D\v'-.33m'\s0\v'.33m'
 .dvi-achar \[~a] ~     a     a
 .dvi-achar \[:a] \[ad] a     a
 .dvi-achar \[oa] \[ao] a     a
+.dvi-achar \['c] \'    c     c
 .dvi-achar \[`e] \`    e     e
 .dvi-achar \['e] \'    e     e
 .dvi-achar \[^e] ^     e     e
diff --git a/tmac/ec.tmac b/tmac/ec.tmac
index d8bff62f..cc8ad341 100644
--- a/tmac/ec.tmac
+++ b/tmac/ec.tmac
@@ -40,7 +40,7 @@
 .fspecial CWEC CWTC
 .fspecial CWIEC CWITC
 .
-.\" remove definitions of glyphs which are TC fonts
+.\" remove definitions of glyphs which are in TC fonts
 .rchar \[co] \[rg]
 .rchar \[ct]
 .rchar \[tm]
diff --git a/tmac/lbp.tmac b/tmac/lbp.tmac
index e7641222..7eb71493 100644
--- a/tmac/lbp.tmac
+++ b/tmac/lbp.tmac
@@ -2,6 +2,7 @@
 .\"
 .nr _C \n(.C
 .cp 0
+.
 .ftr CW CR
 .ftr C CR
 .ftr CO CI
@@ -14,6 +15,56 @@
 .ftr Hx HNBI
 .ftr EBI EI
 .ftr CBI CI
+.
+.fchar \[fi] fi
+.fchar \[fl] fl
+.fchar \[ff] ff
+.fchar \[Fi] ffi
+.fchar \[Fl] ffl
+.fchar \[OE] OE
+.fchar \[oe] oe
+.fchar \[IJ] IJ
+.fchar \[ij] ij
+.fchar \[.i] i
+.
+.de lbp-achar
+.  \" Note that character definitions are always interpreted with
+.  \" compatibility mode off.
+.  fchar \\$1 \
+\\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
+\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
+\h'|\\\\n[acc]u'
+.  hcode \\$1\\$4
+..
+.
+.lbp-achar \['A] \'    A     a
+.lbp-achar \['C] \'    C     c
+.lbp-achar \['c] \'    c     c
+.lbp-achar \['I] \'    I     i
+.lbp-achar \['O] \'    O     o
+.lbp-achar \['U] \'    U     u
+.lbp-achar \['Y] \'    Y     y
+.lbp-achar \['y] \'    y     y
+.lbp-achar \[:E] \[ad] E     e
+.lbp-achar \[:I] \[ad] I     i
+.lbp-achar \[:Y] \[ad] Y     y
+.lbp-achar \[^A] ^     A     a
+.lbp-achar \[^E] ^     E     e
+.lbp-achar \[^I] ^     I     i
+.lbp-achar \[^O] ^     O     o
+.lbp-achar \[^U] ^     U     u
+.lbp-achar \[`A] \`    A     a
+.lbp-achar \[`E] \`    E     e
+.lbp-achar \[`I] \`    I     i
+.lbp-achar \[`O] \`    O     o
+.lbp-achar \[`U] \`    U     u
+.lbp-achar \[~O] ~     O     o
+.lbp-achar \[~o] ~     o     o
+.
 .cp \n(_C
 .
 .do mso latin1.tmac
diff --git a/tmac/ps.tmac b/tmac/ps.tmac
index 01868ce5..67209e72 100644
--- a/tmac/ps.tmac
+++ b/tmac/ps.tmac
@@ -50,6 +50,23 @@
 .fchar \[IJ] IJ
 .fchar \[tm] \s-3\v'-.3m'TM\v'+.3m'\s+3
 .
+.de ps-achar
+.  \" Note that character definitions are always interpreted with
+.  \" compatibility mode off.
+.  fchar \\$1 \
+\\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
+\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
+\h'|\\\\n[acc]u'
+.  hcode \\$1\\$4
+..
+.
+.ps-achar \['C] \' C c
+.ps-achar \['c] \' c c
+.
 .\" pic tests this register to see whether it should use \X'ps:...'
 .nr 0p 1
 .
diff --git a/tmac/tty.tmac b/tmac/tty.tmac
index e6bd5987..96ff0e18 100644
--- a/tmac/tty.tmac
+++ b/tmac/tty.tmac
@@ -52,6 +52,7 @@
 .fchar \[an] -
 .fchar \[eu] EUR
 .fchar \[Eu] EUR
+.fchar \[.i] i
 .
 .\" color definitions
 .defcolor black rgb #000000