* font/devhtml/R.proto, font/devutf8/R.proto: Add `ne' and `nc'.

* font/devps/textmap: Fix entries for `ne' and `nc'.
* font/devps/symbolmap: Regenerated.

* src/roff/troff/glyphuni.cc (glyph_to_unicode_list),
src/roff/troff/uniglyph.cc (unicode_to_glyph_list): Add `18',
`38', `58', `78', `-+', `|=', `nc', `ne'.

* tmac/dvi.tmac: Add `nm', `ne', `nc'.
Use `schar' for `aq'.
* tmac/ps.tmac, tmac/X.tmac: Add `nc' and `ne'.
* tmac/ec.tmac: Add `SC' to special fonts for `CW' and `CWI'.
* tmac/tty.tmac: Add `ne'.

* src/roff/troff/node.cc (make_glyph_node): Test with `get_macro'
for fallback glyphs.

16 files changed, 21 insertions, 16 deletions

diff --git a/font/devhtml/R.proto b/font/devhtml/R.proto
index fcdaf8c2..9fa36028 100644
--- a/font/devhtml/R.proto
+++ b/font/devhtml/R.proto
@@ -366,6 +366,7 @@ ap	24	0	0x223C	∼
 ~=	"
 !=	24	0	0x2260	≠
 ==	24	0	0x2261	≡
+ne	24	0	0x2262	≢
 <=	24	0	0x2264	&le;
 >=	24	0	0x2265	&ge;
 <<	24	0	0x226A	&#8810;
@@ -373,6 +374,7 @@ ap	24	0	0x223C	&sim;
 sb	24	0	0x2282	&sub;
 sp	24	0	0x2283	&sup;
 nb	24	0	0x2284	&nsub;
+nc	24	0	0x2285	&#8837;
 ib	24	0	0x2286	&sube;
 ip	24	0	0x2287	&supe;
 c+	24	0	0x2295	&oplus;
diff --git a/font/devlbp/HB b/font/devlbp/HB
index 0c4fea28..d40a9672 100644
--- a/font/devlbp/HB
+++ b/font/devlbp/HB
@@ -359,7 +359,7 @@ if	2027	0	0x3a5	 8,19	 # infinity
 md	2027	0	0x3b7	 8,32	 # dotmath
 mo	2027	0	0x3ce	 8,15	 # element
 mu	2027	0	0x3b4	 8,39	 # multiply
-nc	2027	0	0x3cb	 8,197	 # notpropersuperset
+nc	2027	0	0x3cb	 8,197	 # uni2285
 nm	2027	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1947	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/HBI b/font/devlbp/HBI
index a15aa4aa..b2ba7cd6 100644
--- a/font/devlbp/HBI
+++ b/font/devlbp/HBI
@@ -360,7 +360,7 @@ if	2027	0	0x3a5	 8,19	 # infinity
 md	2027	0	0x3b7	 8,32	 # dotmath
 mo	2027	0	0x3ce	 8,15	 # element
 mu	2027	0	0x3b4	 8,39	 # multiply
-nc	2027	0	0x3cb	 8,197	 # notpropersuperset
+nc	2027	0	0x3cb	 8,197	 # uni2285
 nm	2027	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1947	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/HI b/font/devlbp/HI
index f00a4ca9..ee05b16f 100644
--- a/font/devlbp/HI
+++ b/font/devlbp/HI
@@ -360,7 +360,7 @@ if	1893	0	0x3a5	 8,19	 # infinity
 md	1893	0	0x3b7	 8,32	 # dotmath
 mo	1893	0	0x3ce	 8,15	 # element
 mu	1893	0	0x3b4	 8,39	 # multiply
-nc	1893	0	0x3cb	 8,197	 # notpropersuperset
+nc	1893	0	0x3cb	 8,197	 # uni2285
 nm	1893	0	0x3cf	 8,209	 # notelement
 pl	927	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1947	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/HNB b/font/devlbp/HNB
index df013c26..4d1857fe 100644
--- a/font/devlbp/HNB
+++ b/font/devlbp/HNB
@@ -359,7 +359,7 @@ if	499	0	0x3a5	 8,19	 # infinity
 md	499	0	0x3b7	 8,32	 # dotmath
 mo	499	0	0x3ce	 8,15	 # element
 mu	499	0	0x3b4	 8,39	 # multiply
-nc	499	0	0x3cb	 8,197	 # notpropersuperset
+nc	499	0	0x3cb	 8,197	 # uni2285
 nm	499	0	0x3cf	 8,209	 # notelement
 pl	273	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	479	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/HNBI b/font/devlbp/HNBI
index 4ae28184..6cf52fb4 100644
--- a/font/devlbp/HNBI
+++ b/font/devlbp/HNBI
@@ -359,7 +359,7 @@ if	499	0	0x3a5	 8,19	 # infinity
 md	499	0	0x3b7	 8,32	 # dotmath
 mo	499	0	0x3ce	 8,15	 # element
 mu	499	0	0x3b4	 8,39	 # multiply
-nc	499	0	0x3cb	 8,197	 # notpropersuperset
+nc	499	0	0x3cb	 8,197	 # uni2285
 nm	499	0	0x3cf	 8,209	 # notelement
 pl	273	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	479	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/HNI b/font/devlbp/HNI
index e9ec3504..16c569d2 100644
--- a/font/devlbp/HNI
+++ b/font/devlbp/HNI
@@ -359,7 +359,7 @@ if	466	0	0x3a5	 8,19	 # infinity
 md	466	0	0x3b7	 8,32	 # dotmath
 mo	466	0	0x3ce	 8,15	 # element
 mu	466	0	0x3b4	 8,39	 # multiply
-nc	466	0	0x3cb	 8,197	 # notpropersuperset
+nc	466	0	0x3cb	 8,197	 # uni2285
 nm	466	0	0x3cf	 8,209	 # notelement
 pl	228	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	479	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/HNR b/font/devlbp/HNR
index e592803c..2e82f70d 100644
--- a/font/devlbp/HNR
+++ b/font/devlbp/HNR
@@ -359,7 +359,7 @@ if	466	0	0x3a5	 8,19	 # infinity
 md	466	0	0x3b7	 8,32	 # dotmath
 mo	466	0	0x3ce	 8,15	 # element
 mu	466	0	0x3b4	 8,39	 # multiply
-nc	466	0	0x3cb	 8,197	 # notpropersuperset
+nc	466	0	0x3cb	 8,197	 # uni2285
 nm	466	0	0x3cf	 8,209	 # notelement
 pl	228	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	479	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/HR b/font/devlbp/HR
index fca5fec1..a28930bc 100644
--- a/font/devlbp/HR
+++ b/font/devlbp/HR
@@ -359,7 +359,7 @@ if	1893	0	0x3a5	 8,19	 # infinity
 md	1893	0	0x3b7	 8,32	 # dotmath
 mo	1893	0	0x3ce	 8,15	 # element
 mu	1893	0	0x3b4	 8,39	 # multiply
-nc	1893	0	0x3cb	 8,197	 # notpropersuperset
+nc	1893	0	0x3cb	 8,197	 # uni2285
 nm	1893	0	0x3cf	 8,209	 # notelement
 pl	927	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1947	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/TB b/font/devlbp/TB
index 9376d5da..ea6e5d17 100644
--- a/font/devlbp/TB
+++ b/font/devlbp/TB
@@ -361,7 +361,7 @@ if	1633	0	0x3a5	 8,19	 # infinity
 md	1633	0	0x3b7	 8,32	 # dotmath
 mo	1633	0	0x3ce	 8,15	 # element
 mu	1633	0	0x3b4	 8,39	 # multiply
-nc	1633	0	0x3cb	 8,197	 # notpropersuperset
+nc	1633	0	0x3cb	 8,197	 # uni2285
 nm	1633	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1900	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/TBI b/font/devlbp/TBI
index 0c06b64a..d0497967 100644
--- a/font/devlbp/TBI
+++ b/font/devlbp/TBI
@@ -361,7 +361,7 @@ if	1633	0	0x3a5	 8,19	 # infinity
 md	1633	0	0x3b7	 8,32	 # dotmath
 mo	1633	0	0x3ce	 8,15	 # element
 mu	1633	0	0x3b4	 8,39	 # multiply
-nc	1633	0	0x3cb	 8,197	 # notpropersuperset
+nc	1633	0	0x3cb	 8,197	 # uni2285
 nm	1633	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1900	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/TI b/font/devlbp/TI
index cd3af794..98709959 100644
--- a/font/devlbp/TI
+++ b/font/devlbp/TI
@@ -361,7 +361,7 @@ if	1723	0	0x3a5	 8,19	 # infinity
 md	1723	0	0x3b7	 8,32	 # dotmath
 mo	1723	0	0x3ce	 8,15	 # element
 mu	1723	0	0x3b4	 8,39	 # multiply
-nc	1723	0	0x3cb	 8,197	 # notpropersuperset
+nc	1723	0	0x3cb	 8,197	 # uni2285
 nm	1723	0	0x3cf	 8,209	 # notelement
 pl	1297	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	2250	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devlbp/TR b/font/devlbp/TR
index 2126402f..51245378 100644
--- a/font/devlbp/TR
+++ b/font/devlbp/TR
@@ -360,7 +360,7 @@ if	1723	0	0x3a5	 8,19	 # infinity
 md	1723	0	0x3b7	 8,32	 # dotmath
 mo	1723	0	0x3ce	 8,15	 # element
 mu	1723	0	0x3b4	 8,39	 # multiply
-nc	1723	0	0x3cb	 8,197	 # notpropersuperset
+nc	1723	0	0x3cb	 8,197	 # uni2285
 nm	1723	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1880	0	0x33d	 0,61	 # equalmath "equals sign in special font"
diff --git a/font/devps/generate/textmap b/font/devps/generate/textmap
index b37631e9..a68fc8eb 100644
--- a/font/devps/generate/textmap
+++ b/font/devps/generate/textmap
@@ -225,8 +225,6 @@ mu mc
 nine 9
 notelement nm
 notequal !=
-notequivalence ne
-notpropersuperset nc
 notsubset nb
 ntilde ~n
 numbersign #
@@ -307,6 +305,8 @@ ugrave `u
 underscore _
 uni2213 -+
 uni2243 |=
+uni2262 ne
+uni2285 nc
 uni25A1 sq
 uni261C lh
 union cu
diff --git a/font/devps/symbolmap b/font/devps/symbolmap
index 5651ab15..b85e4081 100644
--- a/font/devps/symbolmap
+++ b/font/devps/symbolmap
@@ -228,8 +228,6 @@ mu mc
 nine 9
 notelement nm
 notequal !=
-notequivalence ne
-notpropersuperset nc
 notsubset nb
 ntilde ~n
 numbersign #
@@ -309,6 +307,9 @@ udieresis :u
 ugrave `u
 underscore _
 uni2213 -+
+uni2243 |=
+uni2262 ne
+uni2285 nc
 uni25A1 sq
 uni261C lh
 union cu
diff --git a/font/devutf8/R.proto b/font/devutf8/R.proto
index 7e0a6bcd..3d25e39b 100644
--- a/font/devutf8/R.proto
+++ b/font/devutf8/R.proto
@@ -368,6 +368,7 @@ ap	24	0	0x223C
 ~=	"
 !=	24	0	0x2260
 ==	24	0	0x2261
+ne	24	0	0x2262
 <=	24	0	0x2264
 >=	24	0	0x2265
 <<	24	0	0x226A
@@ -375,6 +376,7 @@ ap	24	0	0x223C
 sb	24	0	0x2282
 sp	24	0	0x2283
 nb	24	0	0x2284
+nc	24	0	0x2285
 ib	24	0	0x2286
 ip	24	0	0x2287
 c+	24	0	0x2295