catch up with ASCII renderings in chars.c rev. 1.72

21 files changed, 118 insertions, 113 deletions

diff --git a/regress/char/unicode/latin1.in b/regress/char/unicode/latin1.in
index e9960b7c..34a6caaf 100644
--- a/regress/char/unicode/latin1.in
+++ b/regress/char/unicode/latin1.in
@@ -9,6 +9,7 @@ BEGINTEST
 \[u00A4]\(Cs	CURRENCY SIGN
 \[u00A5]\(Ye	YEN SIGN
 \[u00A6]\(bb	BROKEN BAR
+\[u00A7]\(sc	SECTION SIGN
 \[u00A8]\(ad	DIAERESIS
 \[u00A9]\(co	COPYRIGHT SIGN
 \[u00AA]\(Of	FEMININE ORDINAL INDICATOR
@@ -16,11 +17,13 @@ BEGINTEST
 \[u00AC]\(no\[tno]	NOT SIGN
 \[u00AD]    SOFT HYPHEN
 \[u00AE]\(rg	REGISTERED SIGN
+\[u00B0]\(de	DEGREE SIGN
 \[u00B1]\(+-\[t+-]	PLUS-MINUS SIGN
 \[u00B2]\(S2	SUPERSCRIPT TWO
 \[u00B3]\(S3	SUPERSCRIPT THREE
 \[u00B4]\'\(aa	ACUTE ACCENT
 \[u00B5]\(mc	MICRO SIGN
+\[u00B6]\(ps	PILCROW SIGN
 \[u00B7]\(pc	MIDDLE DOT
 \[u00B8]\(ac	CEDILLA
 \[u00B9]\(S1	SUPERSCRIPT ONE
@@ -75,6 +78,7 @@ BEGINTEST
 \[u00ED]\('i	LATIN SMALL LETTER I WITH ACUTE
 \[u00EE]\(^i	LATIN SMALL LETTER I WITH CIRCUMFLEX
 \[u00EF]\(:i	LATIN SMALL LETTER I WITH DIAERESIS
+\[u00F0]\(Sd	LATIN SMALL LETTER ETH
 \[u00F1]\(~n	LATIN SMALL LETTER N WITH TILDE
 \[u00F2]\(`o	LATIN SMALL LETTER O WITH GRAVE
 \[u00F3]\('o	LATIN SMALL LETTER O WITH ACUTE
diff --git a/regress/char/unicode/latin1.out_ascii b/regress/char/unicode/latin1.out_ascii
index e772f9f7..7b2e5198 100644
--- a/regress/char/unicode/latin1.out_ascii
+++ b/regress/char/unicode/latin1.out_ascii
@@ -11,6 +11,7 @@ DDEESSCCRRIIPPTTIIOONN
        oxox   CURRENCY SIGN
        =Y=Y   YEN SIGN
        ||   BROKEN BAR
+       <section><section>  SECTION SIGN
        ""   DIAERESIS
        (C)(C)    COPYRIGHT SIGN
        _a_a   FEMININE ORDINAL INDICATOR
@@ -18,14 +19,16 @@ DDEESSCCRRIIPPTTIIOONN
        ~~~  NOT SIGN
            SOFT HYPHEN
        (R)(R)    REGISTERED SIGN
+       <degree><degree>    DEGREE SIGN
        +-+-+-    PLUS-MINUS SIGN
-       22   SUPERSCRIPT TWO
-       33   SUPERSCRIPT THREE
+       ^2^2 SUPERSCRIPT TWO
+       ^3^3 SUPERSCRIPT THREE
        '''  ACUTE ACCENT
-       ,u,u   MICRO SIGN
+       <micro><micro> MICRO SIGN
+       <paragraph><paragraph>   PILCROW SIGN
        ..   MIDDLE DOT
        ,,   CEDILLA
-       11   SUPERSCRIPT ONE
+       ^1^1 SUPERSCRIPT ONE
        _o_o   MASCULINE ORDINAL INDICATOR
        >>>> RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
        1/41/4    VULGAR FRACTION ONE QUARTER
@@ -47,7 +50,7 @@ DDEESSCCRRIIPPTTIIOONN
        'I'I   LATIN CAPITAL LETTER I WITH ACUTE
        ^I^I   LATIN CAPITAL LETTER I WITH CIRCUMFLEX
        "I"I   LATIN CAPITAL LETTER I WITH DIAERESIS
-       -D-D   LATIN CAPITAL LETTER ETH
+       DhDh LATIN CAPITAL LETTER ETH
        ~N~N   LATIN CAPITAL LETTER N WITH TILDE
        `O`O   LATIN CAPITAL LETTER O WITH GRAVE
        'O'O   LATIN CAPITAL LETTER O WITH ACUTE
@@ -77,13 +80,14 @@ DDEESSCCRRIIPPTTIIOONN
        'i'i   LATIN SMALL LETTER I WITH ACUTE
        ^i^i   LATIN SMALL LETTER I WITH CIRCUMFLEX
        "i"i   LATIN SMALL LETTER I WITH DIAERESIS
+       dhdh LATIN SMALL LETTER ETH
        ~n~n   LATIN SMALL LETTER N WITH TILDE
        `o`o   LATIN SMALL LETTER O WITH GRAVE
        'o'o   LATIN SMALL LETTER O WITH ACUTE
        ^o^o   LATIN SMALL LETTER O WITH CIRCUMFLEX
        ~o~o   LATIN SMALL LETTER O WITH TILDE
        "o"o   LATIN SMALL LETTER O WITH DIAERESIS
-       -:--:--:- DIVISION SIGN
+       ///  DIVISION SIGN
        /o/o   LATIN SMALL LETTER O WITH STROKE
        `u`u   LATIN SMALL LETTER U WITH GRAVE
        'u'u   LATIN SMALL LETTER U WITH ACUTE
diff --git a/regress/char/unicode/latin1.out_html b/regress/char/unicode/latin1.out_html
index b7d45ecb..abd8a3a5 100644
--- a/regress/char/unicode/latin1.out_html
+++ b/regress/char/unicode/latin1.out_html
@@ -3,6 +3,7 @@ BEGINTEST
 &#x00A4;&#x00A4;	CURRENCY SIGN
 &#x00A5;&#x00A5;	YEN SIGN
 &#x00A6;&#x00A6;	BROKEN BAR
+&#x00A7;&#x00A7;	SECTION SIGN
 &#x00A8;&#x00A8;	DIAERESIS
 &#x00A9;&#x00A9;	COPYRIGHT SIGN
 &#x00AA;&#x00AA;	FEMININE ORDINAL INDICATOR
@@ -10,11 +11,13 @@ BEGINTEST
 &#x00AC;&#x00AC;&#x00AC;	NOT SIGN
 &#x00AD;    SOFT HYPHEN
 &#x00AE;&#x00AE;	REGISTERED SIGN
+&#x00B0;&#x00B0;	DEGREE SIGN
 &#x00B1;&#x00B1;&#x00B1;	PLUS-MINUS SIGN
 &#x00B2;&#x00B2;	SUPERSCRIPT TWO
 &#x00B3;&#x00B3;	SUPERSCRIPT THREE
 &#x00B4;&#x00B4;&#x00B4;	ACUTE ACCENT
 &#x00B5;&#x00B5;	MICRO SIGN
+&#x00B6;&#x00B6;	PILCROW SIGN
 &#x00B7;&#x00B7;	MIDDLE DOT
 &#x00B8;&#x00B8;	CEDILLA
 &#x00B9;&#x00B9;	SUPERSCRIPT ONE
@@ -69,6 +72,7 @@ BEGINTEST
 &#x00ED;&#x00ED;	LATIN SMALL LETTER I WITH ACUTE
 &#x00EE;&#x00EE;	LATIN SMALL LETTER I WITH CIRCUMFLEX
 &#x00EF;&#x00EF;	LATIN SMALL LETTER I WITH DIAERESIS
+&#x00F0;&#x00F0;	LATIN SMALL LETTER ETH
 &#x00F1;&#x00F1;	LATIN SMALL LETTER N WITH TILDE
 &#x00F2;&#x00F2;	LATIN SMALL LETTER O WITH GRAVE
 &#x00F3;&#x00F3;	LATIN SMALL LETTER O WITH ACUTE
diff --git a/regress/char/unicode/latin1.out_utf8 b/regress/char/unicode/latin1.out_utf8
index b9f1ad85..36078a1b 100644
--- a/regress/char/unicode/latin1.out_utf8
+++ b/regress/char/unicode/latin1.out_utf8
@@ -11,6 +11,7 @@ DDEESSCCRRIIPPTTIIOONN
        ¤¤   CURRENCY SIGN
        ¥¥   YEN SIGN
        ¦¦   BROKEN BAR
+       §§   SECTION SIGN
        ¨¨   DIAERESIS
        ©©   COPYRIGHT SIGN
        ªª   FEMININE ORDINAL INDICATOR
@@ -18,11 +19,13 @@ DDEESSCCRRIIPPTTIIOONN
        ¬¬¬  NOT SIGN
        ­    SOFT HYPHEN
        ®®   REGISTERED SIGN
+       °°   DEGREE SIGN
        ±±±  PLUS-MINUS SIGN
        ²²   SUPERSCRIPT TWO
        ³³   SUPERSCRIPT THREE
        ´´´  ACUTE ACCENT
        µµ   MICRO SIGN
+       ¶¶   PILCROW SIGN
        ··   MIDDLE DOT
        ¸¸   CEDILLA
        ¹¹   SUPERSCRIPT ONE
@@ -77,6 +80,7 @@ DDEESSCCRRIIPPTTIIOONN
        íí   LATIN SMALL LETTER I WITH ACUTE
        îî   LATIN SMALL LETTER I WITH CIRCUMFLEX
        ïï   LATIN SMALL LETTER I WITH DIAERESIS
+       ðð   LATIN SMALL LETTER ETH
        ññ   LATIN SMALL LETTER N WITH TILDE
        òò   LATIN SMALL LETTER O WITH GRAVE
        óó   LATIN SMALL LETTER O WITH ACUTE
diff --git a/regress/char/unicode/latin1diff.in b/regress/char/unicode/latin1diff.in
index 6455a1ef..e00e44de 100644
--- a/regress/char/unicode/latin1diff.in
+++ b/regress/char/unicode/latin1diff.in
@@ -7,14 +7,10 @@ char-unicode-latin1diff \- Unicode characters in the ISO-8859-1 range
 BEGINTEST
 \[u00A1]\(r!	INVERTED EXCLAMATION MARK
 \[u00A3]\(Po	POUND SIGN
-\[u00A7]\(sc	SECTION SIGN
 \[u00AF]\(a-	MACRON
-\[u00B0]\(de	DEGREE SIGN
-\[u00B6]\(ps	PILCROW SIGN
 \[u00BF]\(r?	INVERTED QUESTION MARK
 \[u00DE]\(TP	LATIN CAPITAL LETTER THORN
 \[u00DF]\(ss	LATIN SMALL LETTER SHARP S
-\[u00F0]\(Sd	LATIN SMALL LETTER ETH
 \[u00FE]\(Tp	LATIN SMALL LETTER THORN
 ENDTEST
 .fi
diff --git a/regress/char/unicode/latin1diff.out_ascii b/regress/char/unicode/latin1diff.out_ascii
index 94095dd9..40fe33ef 100644
--- a/regress/char/unicode/latin1diff.out_ascii
+++ b/regress/char/unicode/latin1diff.out_ascii
@@ -9,14 +9,10 @@ DDEESSCCRRIIPPTTIIOONN
        BEGINTEST
        !!   INVERTED EXCLAMATION MARK
        GBPGBP    POUND SIGN
-       <sec><sec>     SECTION SIGN
        --   MACRON
-       <deg><deg>     DEGREE SIGN
-       <par><par>     PILCROW SIGN
        ??   INVERTED QUESTION MARK
        ThTh LATIN CAPITAL LETTER THORN
        ssss LATIN SMALL LETTER SHARP S
-       dd   LATIN SMALL LETTER ETH
        thth LATIN SMALL LETTER THORN
        ENDTEST
 
diff --git a/regress/char/unicode/latin1diff.out_html b/regress/char/unicode/latin1diff.out_html
index 19070713..38bbade9 100644
--- a/regress/char/unicode/latin1diff.out_html
+++ b/regress/char/unicode/latin1diff.out_html
@@ -1,13 +1,9 @@
 BEGINTEST
 &#x00A1;&#x00A1;	INVERTED EXCLAMATION MARK
 &#x00A3;&#x00A3;	POUND SIGN
-&#x00A7;&#x00A7;	SECTION SIGN
 &#x00AF;&#x00AF;	MACRON
-&#x00B0;&#x00B0;	DEGREE SIGN
-&#x00B6;&#x00B6;	PILCROW SIGN
 &#x00BF;&#x00BF;	INVERTED QUESTION MARK
 &#x00DE;&#x00DE;	LATIN CAPITAL LETTER THORN
 &#x00DF;&#x00DF;	LATIN SMALL LETTER SHARP S
-&#x00F0;&#x00F0;	LATIN SMALL LETTER ETH
 &#x00FE;&#x00FE;	LATIN SMALL LETTER THORN
 ENDTEST
diff --git a/regress/char/unicode/latin1diff.out_utf8 b/regress/char/unicode/latin1diff.out_utf8
index 58bb0c08..6a679b29 100644
--- a/regress/char/unicode/latin1diff.out_utf8
+++ b/regress/char/unicode/latin1diff.out_utf8
@@ -9,14 +9,10 @@ DDEESSCCRRIIPPTTIIOONN
        BEGINTEST
        ¡¡   INVERTED EXCLAMATION MARK
        ££   POUND SIGN
-       §§   SECTION SIGN
        ¯¯   MACRON
-       °°   DEGREE SIGN
-       ¶¶   PILCROW SIGN
        ¿¿   INVERTED QUESTION MARK
        ÞÞ   LATIN CAPITAL LETTER THORN
        ßß   LATIN SMALL LETTER SHARP S
-       ðð   LATIN SMALL LETTER ETH
        þþ   LATIN SMALL LETTER THORN
        ENDTEST
 
diff --git a/regress/char/unicode/named.in b/regress/char/unicode/named.in
index cfc87139..615824c9 100644
--- a/regress/char/unicode/named.in
+++ b/regress/char/unicode/named.in
@@ -20,6 +20,7 @@ BEGINTEST
 \[u02DD]\(a"	DOUBLE ACUTE ACCENT
 \[u0391]\(*A	GREEK CAPITAL LETTER ALPHA
 \[u0392]\(*B	GREEK CAPITAL LETTER BETA
+\[u0393]\(*G	GREEK CAPITAL LETTER GAMMA
 \[u0394]\(*D	GREEK CAPITAL LETTER DELTA
 \[u0395]\(*E	GREEK CAPITAL LETTER EPSILON
 \[u0396]\(*Z	GREEK CAPITAL LETTER ZETA
@@ -34,6 +35,7 @@ BEGINTEST
 \[u039F]\(*O	GREEK CAPITAL LETTER OMICRON
 \[u03A0]\(*P	GREEK CAPITAL LETTER PI
 \[u03A1]\(*R	GREEK CAPITAL LETTER RHO
+\[u03A3]\(*S	GREEK CAPITAL LETTER SIGMA
 \[u03A4]\(*T	GREEK CAPITAL LETTER TAU
 \[u03A5]\(*U	GREEK CAPITAL LETTER UPSILON
 \[u03A6]\(*F	GREEK CAPITAL LETTER PHI
@@ -111,7 +113,9 @@ BEGINTEST
 \[u2202]\(pd	PARTIAL DIFFERENTIAL
 \[u2203]\(te	THERE EXISTS
 \[u2205]\(es	EMPTY SET
+\[u2207]\(gr	NABLA
 \[u2208]\(mo	ELEMENT OF
+\[u2209]\(nm	NOT AN ELEMENT OF
 \[u220B]\(st	CONTAINS AS MEMBER
 \[u2212]\(mi	MINUS SIGN
 \[u2213]\(-+	MINUS-OR-PLUS SIGN
diff --git a/regress/char/unicode/named.out_ascii b/regress/char/unicode/named.out_ascii
index b527ad13..cc9fd758 100644
--- a/regress/char/unicode/named.out_ascii
+++ b/regress/char/unicode/named.out_ascii
@@ -22,55 +22,57 @@ DDEESSCCRRIIPPTTIIOONN
        ""   DOUBLE ACUTE ACCENT
        AA   GREEK CAPITAL LETTER ALPHA
        BB   GREEK CAPITAL LETTER BETA
-       _/_\_/_\ GREEK CAPITAL LETTER DELTA
+       <Gamma><Gamma> GREEK CAPITAL LETTER GAMMA
+       <Delta><Delta> GREEK CAPITAL LETTER DELTA
        EE   GREEK CAPITAL LETTER EPSILON
        ZZ   GREEK CAPITAL LETTER ZETA
        HH   GREEK CAPITAL LETTER ETA
-       -O-O   GREEK CAPITAL LETTER THETA
+       <Theta><Theta> GREEK CAPITAL LETTER THETA
        II   GREEK CAPITAL LETTER IOTA
        KK   GREEK CAPITAL LETTER KAPPA
-       /\/\ GREEK CAPITAL LETTER LAMDA
+       <Lambda><Lambda>    GREEK CAPITAL LETTER LAMDA
        MM   GREEK CAPITAL LETTER MU
        NN   GREEK CAPITAL LETTER NU
-       _H_H   GREEK CAPITAL LETTER XI
+       <Xi><Xi>  GREEK CAPITAL LETTER XI
        OO   GREEK CAPITAL LETTER OMICRON
-       TTTT GREEK CAPITAL LETTER PI
+       <Pi><Pi>  GREEK CAPITAL LETTER PI
        PP   GREEK CAPITAL LETTER RHO
+       <Sigma><Sigma> GREEK CAPITAL LETTER SIGMA
        TT   GREEK CAPITAL LETTER TAU
        YY   GREEK CAPITAL LETTER UPSILON
-       IOIO   GREEK CAPITAL LETTER PHI
+       <Phi><Phi>     GREEK CAPITAL LETTER PHI
        XX   GREEK CAPITAL LETTER CHI
-       IYIY   GREEK CAPITAL LETTER PSI
-       _O_O   GREEK CAPITAL LETTER OMEGA
-       aa   GREEK SMALL LETTER ALPHA
-       BB   GREEK SMALL LETTER BETA
-       yy   GREEK SMALL LETTER GAMMA
-       dd   GREEK SMALL LETTER DELTA
-       ee   GREEK SMALL LETTER EPSILON
-       ,C,C   GREEK SMALL LETTER ZETA
-       nn   GREEK SMALL LETTER ETA
-       -0-0   GREEK SMALL LETTER THETA
-       ii   GREEK SMALL LETTER IOTA
-       kk   GREEK SMALL LETTER KAPPA
-       >\>\   GREEK SMALL LETTER LAMDA
-       ,u,u   GREEK SMALL LETTER MU
-       vv   GREEK SMALL LETTER NU
-       ,E,E   GREEK SMALL LETTER XI
+       <Psi><Psi>     GREEK CAPITAL LETTER PSI
+       <Omega><Omega> GREEK CAPITAL LETTER OMEGA
+       <alpha><alpha> GREEK SMALL LETTER ALPHA
+       <beta><beta>   GREEK SMALL LETTER BETA
+       <gamma><gamma> GREEK SMALL LETTER GAMMA
+       <delta><delta> GREEK SMALL LETTER DELTA
+       <epsilon><epsilon>  GREEK SMALL LETTER EPSILON
+       <zeta><zeta>   GREEK SMALL LETTER ZETA
+       <eta><eta>     GREEK SMALL LETTER ETA
+       <theta><theta> GREEK SMALL LETTER THETA
+       <iota><iota>   GREEK SMALL LETTER IOTA
+       <kappa><kappa> GREEK SMALL LETTER KAPPA
+       <lambda><lambda>    GREEK SMALL LETTER LAMDA
+       <mu><mu>  GREEK SMALL LETTER MU
+       <nu><nu>  GREEK SMALL LETTER NU
+       <xi><xi>  GREEK SMALL LETTER XI
        oo   GREEK SMALL LETTER OMICRON
-       -n-n   GREEK SMALL LETTER PI
-       pp   GREEK SMALL LETTER RHO
-       ss   GREEK SMALL LETTER FINAL SIGMA
-       -o-o   GREEK SMALL LETTER SIGMA
-       ~t~t   GREEK SMALL LETTER TAU
-       uu   GREEK SMALL LETTER UPSILON
-       |o|o   GREEK SMALL LETTER PHI
-       xx   GREEK SMALL LETTER CHI
-       |u|u   GREEK SMALL LETTER PSI
-       ww   GREEK SMALL LETTER OMEGA
-       -0-0   GREEK THETA SYMBOL
-       |o|o   GREEK PHI SYMBOL
-       -w-w   GREEK PI SYMBOL
-       ee   GREEK LUNATE EPSILON SYMBOL
+       <pi><pi>  GREEK SMALL LETTER PI
+       <rho><rho>     GREEK SMALL LETTER RHO
+       <sigma><sigma> GREEK SMALL LETTER FINAL SIGMA
+       <sigma><sigma> GREEK SMALL LETTER SIGMA
+       <tau><tau>     GREEK SMALL LETTER TAU
+       <upsilon><upsilon>  GREEK SMALL LETTER UPSILON
+       <phi><phi>     GREEK SMALL LETTER PHI
+       <chi><chi>     GREEK SMALL LETTER CHI
+       <psi><psi>     GREEK SMALL LETTER PSI
+       <omega><omega> GREEK SMALL LETTER OMEGA
+       <theta><theta> GREEK THETA SYMBOL
+       <phi><phi>     GREEK PHI SYMBOL
+       <pi><pi>  GREEK PI SYMBOL
+       <epsilon><epsilon>  GREEK LUNATE EPSILON SYMBOL
        --   HYPHEN
        --   EN DASH
        ---- EM DASH
@@ -80,20 +82,20 @@ DDEESSCCRRIIPPTTIIOONN
        ""   LEFT DOUBLE QUOTATION MARK
        ""   RIGHT DOUBLE QUOTATION MARK
        ,,,, DOUBLE LOW-9 QUOTATION MARK
-       |-|-   DAGGER
-       |=|=   DOUBLE DAGGER
+       <*><*>    DAGGER
+       <**><**>  DOUBLE DAGGER
        +o+o   BULLET
-       %o%o PER MILLE SIGN
+       <permille><permille>     PER MILLE SIGN
        ''   PRIME
        '''' DOUBLE PRIME
        <<   SINGLE LEFT-POINTING ANGLE QUOTATION MARK
        >>   SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
        //   FRACTION SLASH
        EUREUREUR EURO SIGN
-       II   BLACK-LETTER CAPITAL I
-       RR   BLACK-LETTER CAPITAL R
+       <Im><Im>  BLACK-LETTER CAPITAL I
+       <Re><Re>  BLACK-LETTER CAPITAL R
        tmtm TRADE MARK SIGN
-       NN   ALEF SYMBOL
+       <Aleph><Aleph> ALEF SYMBOL
        1/81/8    VULGAR FRACTION ONE EIGHTH
        3/83/8    VULGAR FRACTION THREE EIGHTHS
        5/85/8    VULGAR FRACTION FIVE EIGHTHS
@@ -103,31 +105,33 @@ DDEESSCCRRIIPPTTIIOONN
        ->-> RIGHTWARDS ARROW
        |v|v   DOWNWARDS ARROW
        <-><->    LEFT RIGHT ARROW
-       _|_| DOWNWARDS ARROW WITH CORNER LEFTWARDS
+       <cr><cr>  DOWNWARDS ARROW WITH CORNER LEFTWARDS
        <=<= LEFTWARDS DOUBLE ARROW
        =^=^   UPWARDS DOUBLE ARROW
        =>=> RIGHTWARDS DOUBLE ARROW
        =v=v   DOWNWARDS DOUBLE ARROW
        <=><=>    LEFT RIGHT DOUBLE ARROW
-       -V-V   FOR ALL
-       aa   PARTIAL DIFFERENTIAL
-       33   THERE EXISTS
+       <for all><for all>  FOR ALL
+       <del><del>     PARTIAL DIFFERENTIAL
+       <there exists><there exists>  THERE EXISTS
        {}{} EMPTY SET
-       EE   ELEMENT OF
-       -)-) CONTAINS AS MEMBER
+       <nabla><nabla> NABLA
+       <element of><element of> ELEMENT OF
+       <not element of><not element of>   NOT AN ELEMENT OF
+       <such that><such that>   CONTAINS AS MEMBER
        --   MINUS SIGN
        -+-+ MINUS-OR-PLUS SIGN
        **   ASTERISK OPERATOR
-       \/\/ SQUARE ROOT
-       ococ PROPORTIONAL TO
-       oooo INFINITY
-       _/_/   ANGLE
+       <sqrt><sqrt>   SQUARE ROOT
+       <proportional to><proportional to> PROPORTIONAL TO
+       <infinity><infinity>     INFINITY
+       <angle><angle> ANGLE
        ^^   LOGICAL AND
        vv   LOGICAL OR
-       (^)(^)    INTERSECTION
-       UU   UNION
-       ',I',I   INTEGRAL
-       .:..:..:. THEREFORE
+       <intersection><intersection>  INTERSECTION
+       <union><union> UNION
+       <integral><integral>     INTEGRAL
+       <therefore><therefore><therefore>  THEREFORE
        ~~   TILDE OPERATOR
        -~-~ ASYMPTOTICALLY EQUAL TO
        =~=~ APPROXIMATELY EQUAL TO
@@ -137,13 +141,13 @@ DDEESSCCRRIIPPTTIIOONN
        !==!==    NOT IDENTICAL TO
        <=<= LESS-THAN OR EQUAL TO
        >=>= GREATER-THAN OR EQUAL TO
-       (=(= SUBSET OF
-       =)=) SUPERSET OF
-       (=_(=_ SUBSET OF OR EQUAL TO
-       =_)=_) SUPERSET OF OR EQUAL TO
+       <proper subset><proper subset>     SUBSET OF
+       <proper superset><proper superset> SUPERSET OF
+       <subset or equal><subset or equal> SUBSET OF OR EQUAL TO
+       <superset or equal><superset or equal>  SUPERSET OF OR EQUAL TO
        O+O+   CIRCLED PLUS
        OxOx   CIRCLED TIMES
-       _|_|   UP TACK
+       <perpendicular><perpendicular>     UP TACK
        ..   DOT OPERATOR
        |~|~ LEFT CEILING
        ~|~| RIGHT CEILING
diff --git a/regress/char/unicode/named.out_html b/regress/char/unicode/named.out_html
index e8368088..6e444470 100644
--- a/regress/char/unicode/named.out_html
+++ b/regress/char/unicode/named.out_html
@@ -14,6 +14,7 @@ BEGINTEST
 &#x02DD;&#x02DD;	DOUBLE ACUTE ACCENT
 &#x0391;&#x0391;	GREEK CAPITAL LETTER ALPHA
 &#x0392;&#x0392;	GREEK CAPITAL LETTER BETA
+&#x0393;&#x0393;	GREEK CAPITAL LETTER GAMMA
 &#x0394;&#x0394;	GREEK CAPITAL LETTER DELTA
 &#x0395;&#x0395;	GREEK CAPITAL LETTER EPSILON
 &#x0396;&#x0396;	GREEK CAPITAL LETTER ZETA
@@ -28,6 +29,7 @@ BEGINTEST
 &#x039F;&#x039F;	GREEK CAPITAL LETTER OMICRON
 &#x03A0;&#x03A0;	GREEK CAPITAL LETTER PI
 &#x03A1;&#x03A1;	GREEK CAPITAL LETTER RHO
+&#x03A3;&#x03A3;	GREEK CAPITAL LETTER SIGMA
 &#x03A4;&#x03A4;	GREEK CAPITAL LETTER TAU
 &#x03A5;&#x03A5;	GREEK CAPITAL LETTER UPSILON
 &#x03A6;&#x03A6;	GREEK CAPITAL LETTER PHI
@@ -105,7 +107,9 @@ BEGINTEST
 &#x2202;&#x2202;	PARTIAL DIFFERENTIAL
 &#x2203;&#x2203;	THERE EXISTS
 &#x2205;&#x2205;	EMPTY SET
+&#x2207;&#x2207;	NABLA
 &#x2208;&#x2208;	ELEMENT OF
+&#x2209;&#x2209;	NOT AN ELEMENT OF
 &#x220B;&#x220B;	CONTAINS AS MEMBER
 &#x2212;&#x2212;	MINUS SIGN
 &#x2213;&#x2213;	MINUS-OR-PLUS SIGN
diff --git a/regress/char/unicode/named.out_utf8 b/regress/char/unicode/named.out_utf8
index 24910b81..ccf0f200 100644
--- a/regress/char/unicode/named.out_utf8
+++ b/regress/char/unicode/named.out_utf8
@@ -22,6 +22,7 @@ DDEESSCCRRIIPPTTIIOONN
        ˝˝   DOUBLE ACUTE ACCENT
        ΑΑ   GREEK CAPITAL LETTER ALPHA
        ΒΒ   GREEK CAPITAL LETTER BETA
+       ΓΓ   GREEK CAPITAL LETTER GAMMA
        ΔΔ   GREEK CAPITAL LETTER DELTA
        ΕΕ   GREEK CAPITAL LETTER EPSILON
        ΖΖ   GREEK CAPITAL LETTER ZETA
@@ -36,6 +37,7 @@ DDEESSCCRRIIPPTTIIOONN
        ΟΟ   GREEK CAPITAL LETTER OMICRON
        ΠΠ   GREEK CAPITAL LETTER PI
        ΡΡ   GREEK CAPITAL LETTER RHO
+       ΣΣ   GREEK CAPITAL LETTER SIGMA
        ΤΤ   GREEK CAPITAL LETTER TAU
        ΥΥ   GREEK CAPITAL LETTER UPSILON
        ΦΦ   GREEK CAPITAL LETTER PHI
@@ -113,7 +115,9 @@ DDEESSCCRRIIPPTTIIOONN
        ∂∂   PARTIAL DIFFERENTIAL
        ∃∃   THERE EXISTS
        ∅∅   EMPTY SET
+       ∇∇   NABLA
        ∈∈   ELEMENT OF
+       ∉∉   NOT AN ELEMENT OF
        ∋∋   CONTAINS AS MEMBER
        −−   MINUS SIGN
        ∓∓   MINUS-OR-PLUS SIGN
diff --git a/regress/char/unicode/namediff.in b/regress/char/unicode/namediff.in
index 7b98650e..bbbca0f5 100644
--- a/regress/char/unicode/namediff.in
+++ b/regress/char/unicode/namediff.in
@@ -7,15 +7,11 @@ char-unicode-namediff \- Unicode characters having named escapes
 BEGINTEST
 \[u0237]\(.j LATIN SMALL LETTER DOTLESS J
 \[u02D9]\(a. DOT ABOVE
-\[u0393]\(*G GREEK CAPITAL LETTER GAMMA
-\[u03A3]\(*S GREEK CAPITAL LETTER SIGMA
 \[u203E]\(rn OVERLINE
 \[u210F]\[hbar]\(-h PLANCK CONSTANT OVER TWO PI
 \[u2118]\(wp SCRIPT CAPITAL P
 \[u2195]\(va UP DOWN ARROW
 \[u21D5]\(vA UP DOWN DOUBLE ARROW
-\[u2207]\(gr NABLA
-\[u2209]\(nm NOT AN ELEMENT OF
 \[u220F]\[product] N-ARY PRODUCT
 \[u2210]\[coproduct] N-ARY COPRODUCT
 \[u2211]\[sum] N-ARY SUMMATION
diff --git a/regress/char/unicode/namediff.out_ascii b/regress/char/unicode/namediff.out_ascii
index 9422f2f8..8e309636 100644
--- a/regress/char/unicode/namediff.out_ascii
+++ b/regress/char/unicode/namediff.out_ascii
@@ -9,15 +9,11 @@ DDEESSCCRRIIPPTTIIOONN
        BEGINTEST
        jj LATIN SMALL LETTER DOTLESS J
        .. DOT ABOVE
-       GG GREEK CAPITAL LETTER GAMMA
-       SS GREEK CAPITAL LETTER SIGMA
        -- OVERLINE
        /h/h/h PLANCK CONSTANT OVER TWO PI
        PP SCRIPT CAPITAL P
        ^v^v UP DOWN ARROW
        ^=v^=v UP DOWN DOUBLE ARROW
-       VV NABLA
-       !E!E NOT AN ELEMENT OF
        TTTT N-ARY PRODUCT
        UU N-ARY COPRODUCT
        EE N-ARY SUMMATION
diff --git a/regress/char/unicode/namediff.out_html b/regress/char/unicode/namediff.out_html
index 4cf287d6..8936a5c7 100644
--- a/regress/char/unicode/namediff.out_html
+++ b/regress/char/unicode/namediff.out_html
@@ -1,15 +1,11 @@
 BEGINTEST
 &#x0237;&#x0237; LATIN SMALL LETTER DOTLESS J
 &#x02D9;&#x02D9; DOT ABOVE
-&#x0393;&#x0393; GREEK CAPITAL LETTER GAMMA
-&#x03A3;&#x03A3; GREEK CAPITAL LETTER SIGMA
 &#x203E;&#x203E; OVERLINE
 &#x210F;&#x210F;&#x210F; PLANCK CONSTANT OVER TWO PI
 &#x2118;&#x2118; SCRIPT CAPITAL P
 &#x2195;&#x2195; UP DOWN ARROW
 &#x21D5;&#x21D5; UP DOWN DOUBLE ARROW
-&#x2207;&#x2207; NABLA
-&#x2209;&#x2209; NOT AN ELEMENT OF
 &#x220F;&#x220F; N-ARY PRODUCT
 &#x2210;&#x2210; N-ARY COPRODUCT
 &#x2211;&#x2211; N-ARY SUMMATION
diff --git a/regress/char/unicode/namediff.out_utf8 b/regress/char/unicode/namediff.out_utf8
index 6c3de0db..ca6ef0af 100644
--- a/regress/char/unicode/namediff.out_utf8
+++ b/regress/char/unicode/namediff.out_utf8
@@ -9,15 +9,11 @@ DDEESSCCRRIIPPTTIIOONN
        BEGINTEST
        ȷȷ LATIN SMALL LETTER DOTLESS J
        ˙˙ DOT ABOVE
-       ΓΓ GREEK CAPITAL LETTER GAMMA
-       ΣΣ GREEK CAPITAL LETTER SIGMA
        ‾‾ OVERLINE
        ℏℏℏ PLANCK CONSTANT OVER TWO PI
        ℘℘ SCRIPT CAPITAL P
        ↕↕ UP DOWN ARROW
        ⇕⇕ UP DOWN DOUBLE ARROW
-       ∇∇ NABLA
-       ∉∉ NOT AN ELEMENT OF
        ∏∏ N-ARY PRODUCT
        ∐∐ N-ARY COPRODUCT
        ∑∑ N-ARY SUMMATION
diff --git a/regress/eqn/delim/basic.out_ascii b/regress/eqn/delim/basic.out_ascii
index 3f317b69..c0bdb4ba 100644
--- a/regress/eqn/delim/basic.out_ascii
+++ b/regress/eqn/delim/basic.out_ascii
@@ -4,6 +4,7 @@ NNAAMMEE
      ddeelliimm--bbaassiicc - inline eqn delimiters
 
 DDEESSCCRRIIPPTTIIOONN
-     initial text a inline B y inline <delta> e inline ,C final text
+     initial text <alpha> inline <beta> <gamma> inline <delta> <epsilon>
+     inline <zeta> final text
 
 OpenBSD                          July 4, 2017                          OpenBSD
diff --git a/regress/eqn/fromto/basic.out_ascii b/regress/eqn/fromto/basic.out_ascii
index b67ec47b..86697c94 100644
--- a/regress/eqn/fromto/basic.out_ascii
+++ b/regress/eqn/fromto/basic.out_ascii
@@ -4,6 +4,6 @@ NNAAMMEE
      ffrroommttoo--bbaassiicc - vertical stacking
 
 DDEESSCCRRIIPPTTIIOONN
-     initial text E_(_i = 1)^oo 1/(_i^2) final text
+     initial text E_(_i = 1)^<infinity> 1/(_i^2) final text
 
 OpenBSD                          July 4, 2017                          OpenBSD
diff --git a/regress/eqn/nullary/symbol.out_ascii b/regress/eqn/nullary/symbol.out_ascii
index 90459c37..40e94b6a 100644
--- a/regress/eqn/nullary/symbol.out_ascii
+++ b/regress/eqn/nullary/symbol.out_ascii
@@ -4,7 +4,7 @@ NNAAMMEE
      nnuullllaarryy--ssyymmbbooll - equation tokens for symbols
 
 DDEESSCCRRIIPPTTIIOONN
-     initial text -- unquoted words: e ' -- quoted words: _e_p_s_i_l_o_n _p_r_i_m_e --
-     composite word: _e_p_s_i_l_o_n - _p_r_i_m_e -- final text
+     initial text -- unquoted words: <epsilon> ' -- quoted words: _e_p_s_i_l_o_n
+     _p_r_i_m_e -- composite word: _e_p_s_i_l_o_n - _p_r_i_m_e -- final text
 
 OpenBSD                          July 4, 2017                          OpenBSD
diff --git a/regress/roff/esc/multi.out_ascii b/regress/roff/esc/multi.out_ascii
index e88e140b..e879dece 100644
--- a/regress/roff/esc/multi.out_ascii
+++ b/regress/roff/esc/multi.out_ascii
@@ -4,7 +4,7 @@ NNAAMMEE
      eesscc--mmuullttii - roff multi-character escape sequences
 
 DDEESSCCRRIIPPTTIIOONN
-     ~ +- x -:- 1/2 1/4 3/4
-     ~ +- x -:- 1/2 1/4 3/4
+     ~ +- x / 1/2 1/4 3/4
+     ~ +- x / 1/2 1/4 3/4
 
 OpenBSD                          July 4, 2017                          OpenBSD
diff --git a/regress/roff/esc/two.out_ascii b/regress/roff/esc/two.out_ascii
index abef08e0..3771d2d8 100644
--- a/regress/roff/esc/two.out_ascii
+++ b/regress/roff/esc/two.out_ascii
@@ -5,22 +5,26 @@ NNAAMMEE
 
 DDEESSCCRRIIPPTTIIOONN
      lines: | | _ | / \
-     markers: +o <> [] <= => @ # _|
+     markers: +o <> [] <= => @ # <cr>
      legal: (C) (R) tm
      punctuation: -- - -
      quotes: ,, , ` ' ' " << >> < >
      brackets: [ ] { } < > | ,- { -. } -'
      arrows: <- -> <= => <=>
-     logical: ^ v ~ 3 -) .:. .:. |
-     mathematical: + - -+ +- . x -:- / * <= >= << >> = != == !== =~ ~ ~~ ~= oc
-     {} E (= =) (^) U \/ |~ ~| |_ _| oo N I R a
+     logical: ^ v ~ <there exists> <such that> <therefore> <therefore> |
+     mathematical: + - -+ +- . x / / * <= >= << >> = != == !== =~ ~ ~~ ~=
+     <proportional to> {} <element of> <proper subset> <proper superset>
+     <intersection> <union> <sqrt> |~ ~| |_ _| <infinity> <Aleph> <Im> <Re>
+     <del>
      ligatures: ff fi fl ffi ffl AE ae OE oe IJ ij
      accents: " ^ ' ` '` , " v o ~ , ^ ~
      accented and special letters: 'A 'E 'I 'O 'U 'a 'e 'i 'o 'u `A `E `I `O `U `a `e `i `o `u ~A ~N
-     ~O ~a ~n ~o "A "E "I "O "U "a "e "i "o "u "y ^A ^E ^I ^O ^U ^a ^e ^i ^o ^u ,C ,c /L /l /O /o oA oa -D i
+     ~O ~a ~n ~o "A "E "I "O "U "a "e "i "o "u "y ^A ^E ^I ^O ^U ^a ^e ^i ^o ^u ,C ,c /L /l /O /o oA oa Dh i
      currency: $ /c EUR EUR =Y <<
-     units: ' ,u
-     greek letters: A B  E Z H  I K /\ M N  O TT P T Y  X IY _O a B y d e ,C n -0
-     i k >\ ,u v ,E o -n p -o ~t u |o x |u w -0 |o +p e s
+     units: ' <micro>
+     greek letters: A B  E Z H  I K <Lambda> M N  O <Pi> P T Y  X <Psi>
+     <Omega> <alpha> <beta> <gamma> <delta> <epsilon> <zeta> <eta> <theta>
+     <iota> <kappa> <lambda> <mu> <nu> <xi> o <pi> <rho> <sigma> <tau>
+     <upsilon> <phi> <chi> <psi> <omega> <theta> <phi> +p <epsilon> <sigma>
 
 OpenBSD                          July 4, 2017                          OpenBSD