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

2 files changed, 10 insertions, 4 deletions

diff --git a/font/devps/generate/textmap b/font/devps/generate/textmap
index 24001821..479542b5 100644
--- a/font/devps/generate/textmap
+++ b/font/devps/generate/textmap
@@ -187,6 +187,7 @@ ffi Fi
 ffl Fl
 fi fi
 five 5
+fiveeighths 58
 fl fl
 florin Fn
 four 4
@@ -220,7 +221,6 @@ lozenge lz
 lslash /l
 macron a-
 minus \-
-minusplus -+
 minute fm
 mu mc
 nine 9
@@ -239,6 +239,7 @@ oe oe
 ogonek ho
 ograve `o
 one 1
+oneeighth 18
 onehalf 12
 onequarter 14
 onesuperior S1
@@ -256,7 +257,6 @@ periodcentered pc
 perthousand %0
 perpendicular pp
 plus +
-plusmath pl
 propersubset sb
 propersuperset sp
 proportional pt
@@ -282,6 +282,7 @@ second sd
 section sc
 semicolon ;
 seven 7
+seveneighths 78
 similar ap
 similarequal ~=
 six 6
@@ -292,6 +293,7 @@ therefore 3d
 therefore tf
 thorn Tp
 three 3
+threeeighths 38
 threequarters 34
 threesuperior S3
 tilde a~
@@ -304,6 +306,7 @@ ucircumflex ^u
 udieresis :u
 ugrave `u
 underscore _
+uni2213 -+
 uni25A1 sq
 uni261C lh
 union cu
diff --git a/font/devps/symbolmap b/font/devps/symbolmap
index bfc00813..df2ead18 100644
--- a/font/devps/symbolmap
+++ b/font/devps/symbolmap
@@ -190,6 +190,7 @@ ffi Fi
 ffl Fl
 fi fi
 five 5
+fiveeighths 58
 fl fl
 florin Fn
 four 4
@@ -223,7 +224,6 @@ lozenge lz
 lslash /l
 macron a-
 minus \-
-minusplus -+
 minute fm
 mu mc
 nine 9
@@ -242,6 +242,7 @@ oe oe
 ogonek ho
 ograve `o
 one 1
+oneeighth 18
 onehalf 12
 onequarter 14
 onesuperior S1
@@ -259,7 +260,6 @@ periodcentered pc
 perthousand %0
 perpendicular pp
 plus +
-plusmath pl
 propersubset sb
 propersuperset sp
 proportional pt
@@ -285,6 +285,7 @@ second sd
 section sc
 semicolon ;
 seven 7
+seveneighths 78
 similar ap
 similarequal ~=
 six 6
@@ -295,6 +296,7 @@ therefore 3d
 therefore tf
 thorn Tp
 three 3
+threeeighths 38
 threequarters 34
 threesuperior S3
 tilde a~
@@ -307,6 +309,7 @@ ucircumflex ^u
 udieresis :u
 ugrave `u
 underscore _
+uni2213 -+
 uni25A1 sq
 uni261C lh
 union cu