6 files changed, 34 insertions, 36 deletions
diff --git a/tmac/X.tmac b/tmac/X.tmac
index 37c319eb..8d133904 100644
--- a/tmac/X.tmac
+++ b/tmac/X.tmac
@@ -14,6 +14,7 @@
 .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 \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
 .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]'
diff --git a/tmac/Xps.tmac b/tmac/Xps.tmac
index 764f9079..61493668 100644
--- a/tmac/Xps.tmac
+++ b/tmac/Xps.tmac
@@ -46,26 +46,6 @@
 .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 5ab7fe4e..a7cc66c1 100644
--- a/tmac/dvi.tmac
+++ b/tmac/dvi.tmac
@@ -11,7 +11,7 @@
 .ftr TT CW
 .ftr H HR
 .
-.special TR TI MI S CW
+.special TR TI MI S SA SB CW
 .fspecial TI CWI
 .fspecial TBI CWI
 .fspecial HI CWI
@@ -23,7 +23,6 @@
 .\" 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'.08m'\D'R .54m .04m''\h'.5m'
 .\" In fixed-width fonts (CW and CWI) use a real _ character.
 .ds dvi-char-_-1 _
@@ -42,11 +41,15 @@
 .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
 .
+.\" This is designed so that \(ul, \(rn and \(br form corners.
+.char \[br] \Z'\v'.25m'\D'R .04m -1m''
+.char \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
+.
 .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'
 .fchar \[co] \
 \z\s-2\[ci]\s0\
 \h'\w'\s-2\[ci]\s0'u-\w'\s-4C\s0'u/2u'\
@@ -78,7 +81,9 @@ D\v'-.33m'\s0\v'.33m'
 .fchar \[Tp] \zlp
 .fchar \[nb] \[slashnot]\[sb]
 .cflags 8 \[an]
-.fchar \[an] \h'-.167m'\[mi]\h'-.167m'
+.schar \[an] \h'-.167m'\[mi]\h'-.167m'
+.fschar CW \[an] -
+.fschar CWI \[an] \f[CW]\[mi]
 .\" we follow the EC ligatures for fixed-width dashes
 .fchar \[em] --
 .fchar \[en] -
diff --git a/tmac/lbp.tmac b/tmac/lbp.tmac
index 9cfe463c..142f14ee 100644
--- a/tmac/lbp.tmac
+++ b/tmac/lbp.tmac
@@ -32,6 +32,13 @@
 .fchar \[fc] \v'-.1m'\s-3>\s+3\v'+.1m'
 .fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0'
 .
+.\" This is designed so that \[ul], \[rn], and \[br] form corners.
+.char \[br] \Z'\v'.25m'\D'R .04m -1m''
+.char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.char \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.
+.char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
+.
 .de lbp-achar
 .  \" Note that character definitions are always interpreted with
 .  \" compatibility mode off.
diff --git a/tmac/lj4.tmac b/tmac/lj4.tmac
index 524e9350..31e2f9ea 100644
--- a/tmac/lj4.tmac
+++ b/tmac/lj4.tmac
@@ -15,10 +15,11 @@
 .ftr HX UBI
 .
 .\" This is designed so that \[ul], \[rn], and \[br] form corners.
-.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 \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.char \[br] \Z'\v'.25m'\D'R .04m -1m''
+.char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.char \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.
+.char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
 .
 .cp \n[_C]
 .
diff --git a/tmac/ps.tmac b/tmac/ps.tmac
index 67209e72..59e80390 100644
--- a/tmac/ps.tmac
+++ b/tmac/ps.tmac
@@ -35,14 +35,18 @@
 .char \[parenrightbt] \[parenrightbt]\h'.016m'
 .char \[parenrightex] \[parenrightex]\h'.016m'
 .
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.
+.\" This is designed so that \(ul, \(rn and \(br form corners.
+.char \[ul] \v'.25m'\D'l .5m 0'\v'-.25m'
+.char \[br] \Z'\v'.25m'\D'l 0 -1m''
+.char \[rn] \v'-.75m'\D'l .5m 0'\v'.75m'
+.
+.char \[ru] \D'l .5m 0'
+.
 .fchar \[va] \o'\[ua]\[da]'
 .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 \[ru] \D'l .5m 0'
-.fchar \[ul] \v'.25m'\D'l .5m 0'\v'-.25m'
-.fchar \[br] \Z'\v'.25m'\D'l 0 -1m''
-.fchar \[rn] \v'-.75m'\D'l .5m 0'\v'.75m'
-.fchar \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
 .fchar \[Fi] ffi
 .fchar \[Fl] ffl
 .fchar \[ff] ff