* font/devX*/S: Regenerated.

* font/devdvi/generate/ec.map: Remove `pl'.
* font/devdvi/generate/tc.map: Remove `mi', `14', `12', `34'.
* font/devdvi/*{TC,EC}: Regenerated.
* font/devhtml/R.proto: Add `-+'.
Remove double entries for `rk', `lk', `lt', `rt', `rb', `lb'.
* font/devlbp/*: Remove `or'.
* font/devlj4/generate/special.map: Remove `or'.
* font/devlj4/S: Regenerated.
* font/devps/generate/textmap: Add `fiveeighths', `oneeighth',
`seveneighths', `threeeighths'.
Remove `plusmath'.
Replace `minusplus' with `uni2213'.
* font/devps/symbolmap: Regenerated.
* font/devutf8/R.proto: Replace `shc' with unnamed glyph.
Add `-+'.

* src/roff/troff/charinfo.h (charinfo): Add `is_normal' inline
function.
* src/roff/troff/node.cc (troff_output_file::put_char_width):
Call glyph_color and fill_color even if tcommand_flag isn't set.
(make_node, node::add_char): Check not ci->is_fallback but
ci->is_normal.

* tmac/lj4.tmac, tmac/lbp.tmac: Define `or'.
* tmac/ec.tmac: Add remove entry for `f/'.
Don't remove `12', `14', `34'.
Define `pl' to be always roman.
* tmac/ps.tmac (ps-frac, ps-frac-mono): New macros.
Define `18', `38', `58', `78'.
* tmac/tty.tmac: Add `-+'.
* tmac/dvi.tmac: Define `f/'.
(dvi-frac): Use `f/'.
* tmac/X.tmac (X-frac, X-frac-mono): New macros.
Define `18', `38', `58', `78'.

8 files changed, 88 insertions, 4 deletions

diff --git a/tmac/X.tmac b/tmac/X.tmac
index 23aaf936c..91062974c 100644
--- a/tmac/X.tmac
+++ b/tmac/X.tmac
@@ -68,6 +68,43 @@
 .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'
 .
diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 589fcafe8..290431a80 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -767,7 +767,7 @@
 .
 .
 .\" NS doc-do-func-decl macro
-.\" NS   do someting special while in SYNOPSIS
+.\" NS   do something special while in SYNOPSIS
 .\" NS
 .\" NS modifies:
 .\" NS   doc-curr-font
diff --git a/tmac/dvi.tmac b/tmac/dvi.tmac
index 112c098df..1f8f1c0e8 100644
--- a/tmac/dvi.tmac
+++ b/tmac/dvi.tmac
@@ -94,11 +94,14 @@ D\v'-.33m'\s0\v'.33m'
 .fchar \[lh] \[lA]
 .fchar \[rh] \[rA]
 .
+.fchar \[f/] /
+.
 .\" Define some fractions.
 .de dvi-frac
 .  fchar \[\\$1\\$2] \
-\v'-.25m'\s[\\En[.s]*7u/10u]\\$1\s0\v'.25m'\h'-.2m'\
-/\h'-.2m'\v'.25m'\s[\\En[.s]*7u/10u]\\$2\s0\v'-.25m'
+\v'-.25m'\s[\\En[.s]*7u/10u]\\$1\s0\v'.25m'\
+\h'-.2m'\[f/]\h'-.2m'\
+\v'.25m'\s[\\En[.s]*7u/10u]\\$2\s0\v'-.25m'
 ..
 .
 .dvi-frac 1 2
diff --git a/tmac/ec.tmac b/tmac/ec.tmac
index f302d0f25..3d13d1d51 100644
--- a/tmac/ec.tmac
+++ b/tmac/ec.tmac
@@ -45,12 +45,15 @@
 .rchar \[co] \[rg]
 .rchar \[ct]
 .rchar \[tm]
-.rchar \[12] \[14] \[34]
+.rchar \[f/]
 .rchar \[S1] \[S2] \[S3]
 .rchar \[Of] \[Om]
 .rchar \[Cs]
 .rchar \[de]
 .
+.\" \[pl] must be roman
+.char \[pl] \f[TREC]+
+.
 .\" an ID register
 .nr ECFONTS 1
 .
diff --git a/tmac/lbp.tmac b/tmac/lbp.tmac
index 866484129..59b9ef25e 100644
--- a/tmac/lbp.tmac
+++ b/tmac/lbp.tmac
@@ -32,6 +32,8 @@
 .fchar \[fc] \v'-.1m'\s-3>\s+3\v'+.1m'
 .fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0'
 .
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.
 .\" 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'
diff --git a/tmac/lj4.tmac b/tmac/lj4.tmac
index 3d12f1ca4..3b78e1459 100644
--- a/tmac/lj4.tmac
+++ b/tmac/lj4.tmac
@@ -14,6 +14,8 @@
 .ftr HO UI
 .ftr HX UBI
 .
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.
 .\" 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'
diff --git a/tmac/ps.tmac b/tmac/ps.tmac
index d438ccfa0..b8b7e7bde 100644
--- a/tmac/ps.tmac
+++ b/tmac/ps.tmac
@@ -71,6 +71,42 @@
 .ps-achar \['C] \' C c
 .ps-achar \['c] \' c c
 .
+.de ps-frac
+.  schar \[\\$1\\$2] \
+\v'-.28m'\s[\\En[.s]*6u/10u]\\$1\s0\v'.28m'\
+\[f/]\
+\s[\\En[.s]*6u/10u]\\$2
+..
+.
+.de ps-frac-mono
+.  fschar \\$1 \[\\$2\\$3] \
+\Z'\v'-.28m'\s[\\En[.s]*5u/10u]\\$2\s0\v'.28m''\
+\Z'\h'.35m'\s[\\En[.s]*5u/10u]\\$3\s0'\
+\h'.02m'\[f/]\h'-.02m'
+..
+.
+.ps-frac 1 8
+.ps-frac 3 8
+.ps-frac 5 8
+.ps-frac 7 8
+.
+.ps-frac-mono CR 1 8
+.ps-frac-mono CR 3 8
+.ps-frac-mono CR 5 8
+.ps-frac-mono CR 7 8
+.ps-frac-mono CI 1 8
+.ps-frac-mono CI 3 8
+.ps-frac-mono CI 5 8
+.ps-frac-mono CI 7 8
+.ps-frac-mono CB 1 8
+.ps-frac-mono CB 3 8
+.ps-frac-mono CB 5 8
+.ps-frac-mono CB 7 8
+.ps-frac-mono CBI 1 8
+.ps-frac-mono CBI 3 8
+.ps-frac-mono CBI 5 8
+.ps-frac-mono CBI 7 8
+.
 .\" 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 f09da2bb4..54fc1f00c 100644
--- a/tmac/tty.tmac
+++ b/tmac/tty.tmac
@@ -32,6 +32,7 @@
 .fchar \[em] --
 .fchar \[+-] +-
 .fchar \[t+-] +-
+.fchar \[-+] -+
 .fchar \[co] (C)
 .fchar \[<=] <=
 .fchar \[>=] >=