Add PS font for various Euro glyphs.

* font/devps/generate/freeeuro.sfd: New master font file for
pfaedit.
* font/devps/generate/sfdtopfa.pe: New conversion script for
pfaedit.
* font/devps/generate/Makefile (FONTS): Add `EURO'.
(EURO, freeeuro.afm, freeeuro.pfa): New rules.
* font/devps/freeeuro.pfa, font/devps/freeeuro.afm: Generated from
`freeeuro.sfd'.
* font/devps/EURO: Generated from `freeeuro.afm'.
* font/devps/download: Add `freeuro.pfa'.
* font/devps/Makefile.sub (NORMALFILES): Adde `EURO' and
`freeeuro.pfa'.

* tmac/europs.tmac: New file.
* tmac/ps.tmac: Include `europs.tmac'.
* tmac/Makefile.sub (DISTFILES): Add `europs.tmac'.


* font/devdvi/generate/texsy.map: Remove `lh' and `rh'.
* font/devdvi/S: Regenerated.
* font/devhtml/R.proto: Fix `CR' and `ci'.
Add `OK'.
* font/devps/generate/textmap: Fix `lh', `rh', and `sq'.
Remove `bs'.
* font/devps/symbolmap: Regenerated.
* font/devutf8/R.proto: Fix `CR' and `ci'.
Add `OK'.
* font/devutf8/NOTES: Updated.

* src/roff/troff/uniglyph.cc (unicode_to_glyph_list): Fix `CR' and
`ci'.
Add `OK'.
* src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Ditto.

* tmac/dvi.tmac: Add `lh' and `rh'.
* tmac/Xps.tmac: Fix `lh' and `rh'.
* tmac/X.tmac: Add `OK'.
* tmac/lj4.tmac: Ditto.

4 files changed, 567 insertions, 5 deletions

diff --git a/font/devps/generate/Makefile b/font/devps/generate/Makefile
index 5916e6a6..a9f2e609 100644
--- a/font/devps/generate/Makefile
+++ b/font/devps/generate/Makefile
@@ -37,7 +37,7 @@ GREEKFONTS=SS
 TEXTFONTS=AB ABI AI AR BMB BMBI BMI BMR CB CBI CI CR HB HBI HI HR HNB HNBI \
   HNI HNR NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
 
-FONTS=$(TEXTFONTS) $(SPECIALFONTS) $(GREEKFONTS) $(DINGBATSFONTS)
+FONTS=$(TEXTFONTS) $(SPECIALFONTS) $(GREEKFONTS) $(DINGBATSFONTS) EURO
 
 DESC=$(srcdir)/../DESC
 AFMTODIT=afmtodit -d$(DESC)
@@ -196,6 +196,13 @@ S: symbol.afm
 ZDR: zapfdr.afm
 	$(AFMTODIT) -s $(RFLAG) zapfdr.afm $(srcdir)/dingbats.rmap $@
 
+# the map is just a dummy
+EURO: freeeuro.afm
+	$(AFMTODIT) $(RFLAG) freeeuro.afm symbolmap $@
+
+freeeuro.afm freeeuro.pfa: generate/freeeuro.sfd
+	pfaedit -script generate/sfdtopfa generate/freeeuro.sfd
+
 symbol.afm: $(srcdir)/symbol.sed
 	-rm -f $@
 	sed -f $(srcdir)/symbol.sed `$(AFMNAME) $(afmdir)/Symbol.afm` >$@
diff --git a/font/devps/generate/freeeuro.sfd b/font/devps/generate/freeeuro.sfd
new file mode 100644
index 00000000..a52e096a
--- /dev/null
+++ b/font/devps/generate/freeeuro.sfd
@@ -0,0 +1,548 @@
+SplineFontDB: 1.0
+FontName: FreeEuro
+FullName: FreeEuro
+FamilyName: FreeEuro
+Weight: Medium
+Copyright: Created by Werner Lemberg with PfaEdit 1.0 (http://pfaedit.sf.net); the serif shapes are based on the Omega fonts created by Yannis Haralambous.
+Version: 001.000
+ItalicAngle: 0
+UnderlinePosition: -100
+UnderlineWidth: 50
+Ascent: 800
+Descent: 200
+NeedsXUIDChange: 1
+FSType: 12
+PfmFamily: 65
+TTFWeight: 500
+TTFWidth: 5
+Panose: 3 0 6 3 0 0 0 0 0 0
+LineGap: 90
+VLineGap: 0
+
+Encoding: custom
+DisplaySize: -96
+AntiAlias: 1
+BeginChars: 256 14
+StartChar: Euro.symbol
+Encoding: 0 8364
+Width: 780
+Flags: MW
+HStem: -17 59<469 503> 251 59<62 133 205 601> 370 59<62 133 205 649> 638 59<469 503>
+Fore
+143 251 m 9
+ 38 251 l 17
+ 63 310 l 1
+ 133 310 l 1
+ 131 329 131 351 133 370 c 1
+ 38 370 l 1
+ 63 429 l 1
+ 143 429 l 17
+ 174 564 307 697 490 697 c 0
+ 635 697 724 611 742 592 c 9
+ 717 531 l 17
+ 666 591 587 638 489 638 c 1
+ 348 638 241 543 205 429 c 1
+ 674 429 l 9
+ 649 370 l 25
+ 193 370 l 17
+ 191 351 191 329 193 310 c 1
+ 625 310 l 9
+ 600 251 l 25
+ 205 251 l 17
+ 245 122 364 42 488 42 c 1
+ 588 42 663 87 717 149 c 9
+ 717 65 l 17
+ 660 18 582 -17 489 -17 c 1
+ 338 -17 187 80 143 251 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.symbol.bold
+Encoding: 1 8364
+Width: 791
+Flags: MW
+HStem: -17 89<501 535> 221 89<72 156 272 604> 370 89<72 156 272 662> 608 89<501 535>
+Fore
+272 221 m 9
+ 604 221 l 25
+ 639 310 l 17
+ 246 310 l 1
+ 243 330 244 351 246 370 c 9
+ 662 370 l 25
+ 697 459 l 17
+ 272 459 l 1
+ 323 561 423 608 512 608 c 0
+ 623 608 690 544 717 512 c 9
+ 753 604 l 17
+ 668 680 577 697 512 697 c 0
+ 339 697 214 575 175 459 c 9
+ 73 459 l 25
+ 38 370 l 1
+ 156 370 l 1
+ 155 351 155 329 156 310 c 1
+ 73 310 l 1
+ 38 221 l 1
+ 175 221 l 17
+ 222 97 335 -17 520 -17 c 1
+ 589 -17 668 12 717 48 c 9
+ 717 168 l 17
+ 670 114 602 72 513 72 c 0
+ 436 72 330 108 272 221 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.serif
+Encoding: 2 8364
+Width: 741
+Flags: MW
+HStem: -14 44<435 463> 253 46<53 102 224 568> 369 46<53 104 224 618> 636 40<433 467>
+Fore
+224 253 m 1
+ 245 130 319 30 463 30 c 0
+ 555 30 625 68 689 131 c 1
+ 707 113 l 1
+ 651 30 532 -14 436 -14 c 0
+ 257 -14 138 91 109 253 c 1
+ 34 253 l 1
+ 54 299 l 1
+ 103 299 l 1
+ 102 308 102 319 102 331 c 0
+ 102 344 103 357 104 369 c 1
+ 34 369 l 1
+ 54 415 l 1
+ 111 415 l 1
+ 145 569 272 676 442 676 c 0
+ 537 676 653 631 707 549 c 1
+ 689 531 l 1
+ 624 594 543 636 451 636 c 0
+ 394 636 342 613 301 575 c 0
+ 256 534 234 476 224 415 c 1
+ 638 415 l 1
+ 618 369 l 1
+ 219 369 l 1
+ 218 356 218 342 218 329 c 0
+ 218 319 218 309 219 299 c 1
+ 588 299 l 1
+ 568 253 l 1
+ 224 253 l 1
+EndSplineSet
+MinimumDistance: x22,-1 
+EndChar
+StartChar: Euro.serif.bold
+Encoding: 3 8364
+Width: 800
+Flags: MW
+HStem: -19 48<486 510> 231 69<72 129 313 612> 368 69<72 131 312 669> 649 42<476 510>
+Fore
+142 231 m 1
+ 45 231 l 1
+ 73 300 l 1
+ 130 300 l 1
+ 129 310 129 321 129 332 c 0
+ 129 344 130 356 131 368 c 1
+ 45 368 l 1
+ 73 437 l 1
+ 143 437 l 1
+ 183 586 310 691 483 691 c 0
+ 611 691 689 628 762 545 c 1
+ 732 520 l 1
+ 649 613 572 649 494 649 c 0
+ 377 649 328 560 312 437 c 1
+ 697 437 l 1
+ 669 368 l 1
+ 307 368 l 1
+ 306 359 306 348 306 336 c 0
+ 306 325 306 312 307 300 c 1
+ 640 300 l 1
+ 612 231 l 1
+ 313 231 l 1
+ 319 190 330 149 349 116 c 0
+ 391 44 470 29 501 29 c 0
+ 579 29 654 59 737 152 c 1
+ 767 127 l 1
+ 694 44 616 -19 488 -19 c 0
+ 300 -19 181 89 142 231 c 1
+EndSplineSet
+MinimumDistance: x16,-1 
+EndChar
+StartChar: Euro.serif.italic
+Encoding: 4 8364
+Width: 734
+Flags: MW
+HStem: -18 45<401 426> 253 46<85 140 257 565> 369 46<117 161 289 636> 630 36<544 567>
+Fore
+143 299 m 1
+ 147 322 152 346 161 369 c 1
+ 98 369 l 1
+ 118 415 l 1
+ 179 415 l 1
+ 243 551 380 666 546 666 c 0
+ 694 666 734 560 745 516 c 1
+ 720 502 l 1
+ 700 549 668 630 554 630 c 0
+ 425 630 336 528 289 415 c 1
+ 656 415 l 1
+ 636 369 l 1
+ 272 369 l 1
+ 266 347 261 323 257 299 c 1
+ 585 299 l 1
+ 565 253 l 1
+ 252 253 l 1
+ 252 241 l 0
+ 252 110 307 27 426 27 c 0
+ 539 27 609 98 657 145 c 1
+ 674 131 l 1
+ 637 87 548 -18 402 -18 c 0
+ 286 -18 140 52 140 253 c 1
+ 66 253 l 1
+ 86 299 l 1
+ 143 299 l 1
+EndSplineSet
+MinimumDistance: x16,-1 
+EndChar
+StartChar: Euro.serif.bold.italic
+Encoding: 5 8364
+Width: 800
+Flags: W
+HStem: -19 48<400 427> 231 69<60 114 295 584> 368 69<92 135 332 673> 649 42<544 586>
+Fore
+114 231 m 1
+ 17 231 l 1
+ 61 300 l 1
+ 118 300 l 1
+ 119 310 122 321 124 332 c 0
+ 127 344 131 356 135 368 c 1
+ 49 368 l 1
+ 93 437 l 1
+ 163 437 l 1
+ 239 586 390 691 563 691 c 0
+ 691 691 754 628 808 545 c 1
+ 772 520 l 1
+ 711 613 642 649 564 649 c 0
+ 447 649 377 560 332 437 c 1
+ 717 437 l 1
+ 673 368 l 1
+ 311 368 l 1
+ 308 359 305 348 302 336 c 0
+ 300 325 297 312 295 300 c 1
+ 628 300 l 1
+ 584 231 l 1
+ 285 231 l 1
+ 281 190 282 149 293 116 c 0
+ 318 44 394 29 425 29 c 0
+ 503 29 585 59 690 152 c 1
+ 714 127 l 1
+ 621 44 529 -19 401 -19 c 0
+ 213 -19 119 89 114 231 c 1
+EndSplineSet
+EndChar
+StartChar: Euro.sansserif
+Encoding: 6 8364
+Width: 791
+Flags: MW
+HStem: -23 82<503 537> 236 88<71 164 275 611> 396 87<71 164 276 671> 659 82<487 521>
+Fore
+275 236 m 9
+ 611 236 l 25
+ 644 324 l 17
+ 257 324 l 1
+ 256 346 256 375 257 396 c 9
+ 671 396 l 25
+ 704 483 l 17
+ 276 483 l 1
+ 312 591 403 659 509 659 c 0
+ 624 659 688 604 726 544 c 9
+ 763 642 l 17
+ 684 723 584 741 516 741 c 0
+ 309 741 208 599 179 483 c 9
+ 72 483 l 25
+ 40 396 l 1
+ 164 396 l 1
+ 162 376 163 344 164 324 c 1
+ 72 324 l 1
+ 40 236 l 1
+ 178 236 l 17
+ 216 95 332 -23 513 -23 c 1
+ 585 -23 659 -12.5 727 36.5 c 9
+ 727 143 l 17
+ 647 76.3333 604 59 516 59 c 0
+ 406 59 313 124 275 236 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.sansserif.bold
+Encoding: 7 8364
+Width: 834
+Flags: MW
+HStem: -23 128<549 599> 228 104<70 147 324 646> 388 103<71 147 324 698> 613 128<549 599>
+Fore
+755.5 563.5 m 1
+ 694 602 644 613 560 613 c 0
+ 510 613 380 596 324 491 c 1
+ 732 491 l 9
+ 698 388 l 25
+ 296 388 l 17
+ 295 367 295 354 296 332 c 1
+ 679 332 l 9
+ 646 228 l 25
+ 324 228 l 17
+ 351 175 440 105 567 105 c 0
+ 674 105 715.5 130.5 747 150 c 13
+ 747 6 l 17
+ 712 -7 650 -23 564 -23 c 1
+ 347 -23 215 90 168 228 c 9
+ 38 228 l 1
+ 71 332 l 1
+ 147 332 l 1
+ 145 352 144 368 147 388 c 1
+ 38 388 l 1
+ 72 491 l 25
+ 168 491 l 17
+ 200 579 295 741 568 741 c 0
+ 658 741 734 722 796 689 c 0
+ 755.5 563.5 l 1
+EndSplineSet
+EndChar
+StartChar: Euro.sansserif.slanted
+Encoding: 8 8364
+Width: 781
+Flags: W
+HStem: -23 82<429 454> 236 88<63 152 249 585> 396 87<98 172 302 679> 659 82<571 600>
+Fore
+249 236 m 9
+ 585 236 l 25
+ 636 324 l 17
+ 249 324 l 1
+ 253 346 260 375 265 396 c 9
+ 679 396 l 25
+ 730 483 l 17
+ 302 483 l 1
+ 361 591 467 659 573 659 c 0
+ 688 659 722 610 770 550 c 9
+ 823 642 l 17
+ 761 723 665 741 598 741 c 0
+ 391 741 259 599 205 483 c 9
+ 99 483 l 25
+ 47 396 l 1
+ 172 396 l 1
+ 166 376 160 344 157 324 c 1
+ 64 324 l 1
+ 14 236 l 1
+ 152 236 l 17
+ 160 95 251 -23 432 -23 c 1
+ 503 -23 581 -6 660 43 c 9
+ 685 158 l 21
+ 603 98 541 59 452 59 c 0
+ 342 59 263 124 249 236 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.sansserif.bold.slanted
+Encoding: 9 8364
+Width: 812
+Flags: W
+HStem: -23 128<482 515> 228 104<65 141 296 618> 388 103<99 153 352 704> 613 127.037<612 635>
+Fore
+799 563 m 1
+ 743.667 593.667 698 613 614 613 c 0
+ 564 613 431 596 352 491 c 1
+ 760 491 l 9
+ 704 388 l 25
+ 302 388 l 17
+ 297 367 294 354 291 332 c 1
+ 674 332 l 9
+ 618 228 l 25
+ 296 228 l 17
+ 312 175 386 105 513 105 c 0
+ 620 105 664.667 138 705 156 c 1
+ 672 6 l 1
+ 634 -7 569 -23 483 -23 c 1
+ 266 -23 158 90 140 228 c 9
+ 10 228 l 1
+ 66 332 l 1
+ 141 332 l 1
+ 144 352 146 368 153 388 c 1
+ 44 388 l 1
+ 100 491 l 25
+ 196 491 l 17
+ 247 579 376 741 649 741 c 0
+ 739 741 811 722 866 689 c 0
+ 799 563 l 1
+EndSplineSet
+EndChar
+StartChar: Euro.mono
+Encoding: 10 8364
+Width: 600
+Flags: MW
+HStem: -16 41<314 332> 217 37<26 63 106 385> 314 37<26 63 106 430> 535 41<314 332>
+Fore
+322 576 m 0
+ 196 576 80 480 65 351 c 1
+ 33 351 l 2
+ 16 351 11 346 11 333 c 0
+ 11 319 17 314 33 314 c 2
+ 63 314 l 1
+ 63 254 l 1
+ 33 254 l 2
+ 17 254 11 249 11 236 c 0
+ 11 222 17 217 33 217 c 2
+ 65 217 l 1
+ 80 89 196 -16 322 -16 c 0
+ 386 -16 446 9 496 55 c 0
+ 522 79 534 96 534 106 c 0
+ 534 117 526 125 514 125 c 0
+ 507 125 503 123 496 115 c 0
+ 442 51 391 25 322 25 c 0
+ 216 25 124 107 106 217 c 1
+ 383 217 l 2
+ 398 217 404 222 404 236 c 0
+ 404 249 399 254 383 254 c 2
+ 104 254 l 1
+ 104 314 l 1
+ 428 314 l 2
+ 444 314 450 319 450 333 c 0
+ 450 346 444 351 428 351 c 2
+ 106 351 l 1
+ 124 460 216 535 322 535 c 0
+ 391 535 442 509 496 445 c 0
+ 503 437 507 435 514 435 c 0
+ 526 435 534 443 534 454 c 0
+ 534 464 522 481 496 505 c 0
+ 446 551 386 576 322 576 c 0
+EndSplineSet
+MinimumDistance: x23,-1 x22,25 x22,23 x21,18 x21,20 x6,9 x6,7 x5,2 x5,4 
+EndChar
+StartChar: Euro.mono.bold
+Encoding: 11 8364
+Width: 600
+Flags: W
+HStem: -14 100<307.635 341> 205 56<22.3275 59 174 388> 303 56<22.3275 59 173 428> 497 100<323 341>
+Fore
+173 359 m 1
+ 424 359 l 2
+ 442 359 452 349 452 331 c 0
+ 452 313 442 303 424 303 c 2
+ 169 303 l 1
+ 169 261 l 1
+ 386 261 l 2
+ 404 261 414 251 414 233 c 0
+ 414 215 404 205 386 205 c 2
+ 174 205 l 1
+ 190 130 247 86 329 86 c 0
+ 367 86 404 95 426 109 c 0
+ 436 115 436 115 461 143 c 0
+ 471 154 481 159 492 159 c 0
+ 517 159 538 136 538 109 c 0
+ 538 86 521 60 490 36 c 0
+ 451 5 389 -14 325 -14 c 0
+ 187 -14 84 72 62 205 c 1
+ 31 205 l 2
+ 14 205 4 215 4 233 c 0
+ 4 251 13 261 31 261 c 2
+ 59 261 l 1
+ 59 303 l 1
+ 31 303 l 2
+ 14 303 4 313 4 331 c 0
+ 4 349 13 359 31 359 c 2
+ 62 359 l 1
+ 78 498 187 597 325 597 c 0
+ 389 597 451 582 490 551 c 1
+ 521 527 539 505 539 478 c 0
+ 539 455 517 426 492 426 c 1
+ 481 426 471 431 461 442 c 0
+ 436 470 436 470 426 476 c 1
+ 404 490 367 497 329 497 c 0
+ 247 497 188 444 173 359 c 1
+EndSplineSet
+EndChar
+StartChar: Euro.mono.slanted
+Encoding: 12 8364
+Width: 600
+Flags: MW
+HStem: -16 41<306 324> 217 37<66 102 148 428> 314 37<88 120 171 496> 535 41<418 447>
+Fore
+435 576 m 0
+ 309 576 173 480 130 351 c 1
+ 98 351 l 2
+ 81 351 75 346 72 333 c 0
+ 71 330 71 328 71 326 c 0
+ 71 317 77 314 90 314 c 2
+ 120 314 l 1
+ 107 254 l 1
+ 77 254 l 2
+ 61 254 54 249 52 236 c 0
+ 51 233 51 231 51 229 c 0
+ 51 220 57 217 70 217 c 2
+ 102 217 l 1
+ 101 209 101 201 101 193 c 0
+ 101 76 191 -16 309 -16 c 0
+ 373 -16 438 9 498 55 c 0
+ 529 79 545 96 547 106 c 0
+ 547 107 547 109 547 110 c 0
+ 547 119 541 125 531 125 c 0
+ 524 125 520 123 511 115 c 0
+ 443 51 387 25 318 25 c 0
+ 216 25 143 101 143 205 c 0
+ 143 217 l 1
+ 420 217 l 2
+ 435 217 445 225 445 241 c 0
+ 445 250 441 254 427 254 c 2
+ 148 254 l 1
+ 161 314 l 1
+ 486 314 l 2
+ 502 314 508 319 511 333 c 0
+ 512 336 512 338 512 340 c 0
+ 512 348 507 351 494 351 c 2
+ 171 351 l 1
+ 212 460 320 535 426 535 c 0
+ 495 535 541 509 581 445 c 0
+ 586 437 590 435 597 435 c 0
+ 609 435 621 443 621 457 c 0
+ 621 467 613 483 594 505 c 0
+ 554 551 499 576 435 576 c 0
+EndSplineSet
+MinimumDistance: x27,-1 
+EndChar
+StartChar: Euro.mono.bold.slanted
+Encoding: 13 8364
+Width: 600
+Flags: MW
+HStem: -14 100<322 348> 205 56<85 107 226 438> 303 56<101 124 250 495> 497 100<429 456>
+Fore
+250 359 m 1
+ 501 359 l 2
+ 516 359 524 352 524 339 c 0
+ 524 317 509 303 489 303 c 2
+ 234 303 l 1
+ 226 261 l 1
+ 443 261 l 2
+ 458 261 465 254 465 242 c 0
+ 465 219 450 205 431 205 c 2
+ 219 205 l 1
+ 219 130 266 86 348 86 c 0
+ 386 86 425 95 450 109 c 0
+ 461 115 461 115 492 143 c 0
+ 505 154 516 159 527 159 c 0
+ 548 159 563 142 563 120 c 0
+ 563 89 536 61 499 36 c 0
+ 453 5 387 -14 323 -14 c 0
+ 190 -14 107 66 107 190 c 0
+ 107 205 l 1
+ 76 205 l 2
+ 62 205 54 212 54 225 c 0
+ 54 247 68 261 88 261 c 2
+ 116 261 l 1
+ 124 303 l 1
+ 96 303 l 2
+ 82 303 74 310 74 323 c 0
+ 74 346 89 359 108 359 c 2
+ 139 359 l 1
+ 185 498 315 597 453 597 c 0
+ 517 597 576 582 608 551 c 1
+ 630 530 643 511 643 489 c 0
+ 643 459 612 426 584 426 c 1
+ 573 426 564 431 556 442 c 0
+ 537 470 537 470 528 476 c 1
+ 509 490 474 497 436 497 c 0
+ 354 497 283 444 250 359 c 1
+EndSplineSet
+MinimumDistance: x9,-1 
+EndChar
+EndChars
+EndSplineFont
diff --git a/font/devps/generate/sfdtopfa.pe b/font/devps/generate/sfdtopfa.pe
new file mode 100644
index 00000000..c063f466
--- /dev/null
+++ b/font/devps/generate/sfdtopfa.pe
@@ -0,0 +1,8 @@
+# sfdtopfa.pe
+#
+# This script generates a PFA file from the master SFD using pfaedit.
+#
+# The argument is the name of the SFD without extension.
+
+Open($1:t + ".sfd");
+Generate($1:t + ".pfa");
diff --git a/font/devps/generate/textmap b/font/devps/generate/textmap
index 4fdd08b4..90e79e21 100644
--- a/font/devps/generate/textmap
+++ b/font/devps/generate/textmap
@@ -93,6 +93,7 @@ Ugrave `U
 Yacute 'Y
 Ydieresis :Y
 Zcaron vZ
+a14 rh
 aacute 'a
 acircumflex ^a
 acute aa
@@ -128,7 +129,6 @@ backslash \
 backslash rs
 bar ba
 bar |
-bell bs
 braceleft lC
 braceleft {
 braceright rC
@@ -199,8 +199,6 @@ guillemotleft Fo
 guillemotright Fc
 guilsinglleft fo
 guilsinglright fc
-handleft lh
-handright rh
 hbar -h
 hungarumlaut a"
 hyphen -
@@ -289,7 +287,6 @@ similarequal ~=
 six 6
 slash /
 slash sl
-square sq
 sterling Po
 therefore 3d
 therefore tf
@@ -307,6 +304,8 @@ ucircumflex ^u
 udieresis :u
 ugrave `u
 underscore _
+uni25A1 sq
+uni261C lh
 union cu
 universal fa
 weierstrass wp