From 216cbacf6f480c3af6ee9be705a5f5b50ad9c738 Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Mon, 14 Mar 2005 06:25:50 +0000 Subject: [PATCH] Add Cyrillic support to devutf8. * font/devutf8/R.proto: Add Cyrillic blocks. * tmac/unicode.tmac: New file. * tmac/tty.tmac: Include unicode.tmac if device is utf8. * tmac/Makefile.sub (NORMALFILES): Add unicode.tmac. * NEWS: Updated. --- ChangeLog | 14 +++ font/devutf8/R.proto | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++ tmac/Makefile.sub | 1 + tmac/tty.tmac | 3 + tmac/unicode.tmac | 12 +++ 5 files changed, 294 insertions(+) create mode 100644 tmac/unicode.tmac diff --git a/ChangeLog b/ChangeLog index 483cdcc1..6a2e54c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-03-14 Werner LEMBERG + + Add Cyrillic support to devutf8. + + * font/devutf8/R.proto: Add Cyrillic blocks. + + * tmac/unicode.tmac: New file. + + * tmac/tty.tmac: Include unicode.tmac if device is utf8. + + * tmac/Makefile.sub (NORMALFILES): Add unicode.tmac. + + * NEWS: Updated. + 2005-03-02 Keith Marshall * src/libs/libdriver/printer.cpp (check_for_output_error): New diff --git a/font/devutf8/R.proto b/font/devutf8/R.proto index 3a65b1b9..176bdca0 100644 --- a/font/devutf8/R.proto +++ b/font/devutf8/R.proto @@ -1,3 +1,5 @@ +# Entities which has a `non-spacing' comment need a corresponding macro +# in unicode.tmac since grotty doesn't support real non-spacing glyphs. name R internalname 0 spacewidth 24 @@ -405,6 +407,268 @@ ts 24 0 0x03C2 *f 24 0 0x03D5 +p 24 0 0x03D6 +e 24 0 0x03F5 +u0415_0300 24 0 0x0400 +u0415_0308 24 0 0x0401 +u0402 24 0 0x0402 +u0413_0301 24 0 0x0403 +u0404 24 0 0x0404 +u0405 24 0 0x0405 +u0406 24 0 0x0406 +u0406_0308 24 0 0x0407 +u0408 24 0 0x0408 +u0409 24 0 0x0409 +u040A 24 0 0x040A +u040B 24 0 0x040B +u041A_0301 24 0 0x040C +u0418_0300 24 0 0x040D +u0423_0306 24 0 0x040E +u040F 24 0 0x040F +u0410 24 0 0x0410 +u0411 24 0 0x0411 +u0412 24 0 0x0412 +u0413 24 0 0x0413 +u0414 24 0 0x0414 +u0415 24 0 0x0415 +u0416 24 0 0x0416 +u0417 24 0 0x0417 +u0418 24 0 0x0418 +u0418_0306 24 0 0x0419 +u041A 24 0 0x041A +u041B 24 0 0x041B +u041C 24 0 0x041C +u041D 24 0 0x041D +u041E 24 0 0x041E +u041F 24 0 0x041F +u0420 24 0 0x0420 +u0421 24 0 0x0421 +u0422 24 0 0x0422 +u0423 24 0 0x0423 +u0424 24 0 0x0424 +u0425 24 0 0x0425 +u0426 24 0 0x0426 +u0427 24 0 0x0427 +u0428 24 0 0x0428 +u0429 24 0 0x0429 +u042A 24 0 0x042A +u042B 24 0 0x042B +u042C 24 0 0x042C +u042D 24 0 0x042D +u042E 24 0 0x042E +u042F 24 0 0x042F +u0430 24 0 0x0430 +u0431 24 0 0x0431 +u0432 24 0 0x0432 +u0433 24 0 0x0433 +u0434 24 0 0x0434 +u0435 24 0 0x0435 +u0436 24 0 0x0436 +u0437 24 0 0x0437 +u0438 24 0 0x0438 +u0438_0306 24 0 0x0439 +u043A 24 0 0x043A +u043B 24 0 0x043B +u043C 24 0 0x043C +u043D 24 0 0x043D +u043E 24 0 0x043E +u043F 24 0 0x043F +u0440 24 0 0x0440 +u0441 24 0 0x0441 +u0442 24 0 0x0442 +u0443 24 0 0x0443 +u0444 24 0 0x0444 +u0445 24 0 0x0445 +u0446 24 0 0x0446 +u0447 24 0 0x0447 +u0448 24 0 0x0448 +u0449 24 0 0x0449 +u044A 24 0 0x044A +u044B 24 0 0x044B +u044C 24 0 0x044C +u044D 24 0 0x044D +u044E 24 0 0x044E +u044F 24 0 0x044F +u0435_0300 24 0 0x0450 +u0435_0308 24 0 0x0451 +u0452 24 0 0x0452 +u0433_0301 24 0 0x0453 +u0454 24 0 0x0454 +u0455 24 0 0x0455 +u0456 24 0 0x0456 +u0456_0308 24 0 0x0457 +u0458 24 0 0x0458 +u0459 24 0 0x0459 +u045A 24 0 0x045A +u045B 24 0 0x045B +u043A_0301 24 0 0x045C +u0438_0300 24 0 0x045D +u0443_0306 24 0 0x045E +u045F 24 0 0x045F +u0460 24 0 0x0460 +u0461 24 0 0x0461 +u0462 24 0 0x0462 +u0463 24 0 0x0463 +u0464 24 0 0x0464 +u0465 24 0 0x0465 +u0466 24 0 0x0466 +u0467 24 0 0x0467 +u0468 24 0 0x0468 +u0469 24 0 0x0469 +u046A 24 0 0x046A +u046B 24 0 0x046B +u046C 24 0 0x046C +u046D 24 0 0x046D +u046E 24 0 0x046E +u046F 24 0 0x046F +u0470 24 0 0x0470 +u0471 24 0 0x0471 +u0472 24 0 0x0472 +u0473 24 0 0x0473 +u0474 24 0 0x0474 +u0475 24 0 0x0475 +u0474_030F 24 0 0x0476 +u0475_030F 24 0 0x0477 +u0478 24 0 0x0478 +u0479 24 0 0x0479 +u047A 24 0 0x047A +u047B 24 0 0x047B +u047C 24 0 0x047C +u047D 24 0 0x047D +u047E 24 0 0x047E +u047F 24 0 0x047F +u0480 24 0 0x0480 +u0481 24 0 0x0481 +u0482 24 0 0x0482 +u0483 24 0 0x0483 -- non-spacing +u0484 24 0 0x0484 -- non-spacing +u0485 24 0 0x0485 -- non-spacing +u0486 24 0 0x0486 -- non-spacing +u0488 24 0 0x0488 -- non-spacing +u0489 24 0 0x0489 -- non-spacing +u048A 24 0 0x048A +u048B 24 0 0x048B +u048C 24 0 0x048C +u048D 24 0 0x048D +u048E 24 0 0x048E +u048F 24 0 0x048F +u0490 24 0 0x0490 +u0491 24 0 0x0491 +u0492 24 0 0x0492 +u0493 24 0 0x0493 +u0494 24 0 0x0494 +u0495 24 0 0x0495 +u0496 24 0 0x0496 +u0497 24 0 0x0497 +u0498 24 0 0x0498 +u0499 24 0 0x0499 +u049A 24 0 0x049A +u049B 24 0 0x049B +u049C 24 0 0x049C +u049D 24 0 0x049D +u049E 24 0 0x049E +u049F 24 0 0x049F +u04A0 24 0 0x04A0 +u04A1 24 0 0x04A1 +u04A2 24 0 0x04A2 +u04A3 24 0 0x04A3 +u04A4 24 0 0x04A4 +u04A5 24 0 0x04A5 +u04A6 24 0 0x04A6 +u04A7 24 0 0x04A7 +u04A8 24 0 0x04A8 +u04A9 24 0 0x04A9 +u04AA 24 0 0x04AA +u04AB 24 0 0x04AB +u04AC 24 0 0x04AC +u04AD 24 0 0x04AD +u04AE 24 0 0x04AE +u04AF 24 0 0x04AF +u04B0 24 0 0x04B0 +u04B1 24 0 0x04B1 +u04B2 24 0 0x04B2 +u04B3 24 0 0x04B3 +u04B4 24 0 0x04B4 +u04B5 24 0 0x04B5 +u04B6 24 0 0x04B6 +u04B7 24 0 0x04B7 +u04B8 24 0 0x04B8 +u04B9 24 0 0x04B9 +u04BA 24 0 0x04BA +u04BB 24 0 0x04BB +u04BC 24 0 0x04BC +u04BD 24 0 0x04BD +u04BE 24 0 0x04BE +u04BF 24 0 0x04BF +u04C0 24 0 0x04C0 +u0416_0306 24 0 0x04C1 +u0436_0306 24 0 0x04C2 +u04C3 24 0 0x04C3 +u04C4 24 0 0x04C4 +u04C5 24 0 0x04C5 +u04C6 24 0 0x04C6 +u04C7 24 0 0x04C7 +u04C8 24 0 0x04C8 +u04C9 24 0 0x04C9 +u04CA 24 0 0x04CA +u04CB 24 0 0x04CB +u04CC 24 0 0x04CC +u04CD 24 0 0x04CD +u04CE 24 0 0x04CE +u0410_0306 24 0 0x04D0 +u0430_0306 24 0 0x04D1 +u0410_0308 24 0 0x04D2 +u0430_0308 24 0 0x04D3 +u04D4 24 0 0x04D4 +u04D5 24 0 0x04D5 +u0415_0306 24 0 0x04D6 +u0435_0306 24 0 0x04D7 +u04D8 24 0 0x04D8 +u04D9 24 0 0x04D9 +u04D8_0308 24 0 0x04DA +u04D9_0308 24 0 0x04DB +u0416_0308 24 0 0x04DC +u0436_0308 24 0 0x04DD +u0417_0308 24 0 0x04DE +u0437_0308 24 0 0x04DF +u04E0 24 0 0x04E0 +u04E1 24 0 0x04E1 +u0418_0304 24 0 0x04E2 +u0438_0304 24 0 0x04E3 +u0418_0308 24 0 0x04E4 +u0438_0308 24 0 0x04E5 +u041E_0308 24 0 0x04E6 +u043E_0308 24 0 0x04E7 +u04E8 24 0 0x04E8 +u04E9 24 0 0x04E9 +u04E8_0308 24 0 0x04EA +u04E9_0308 24 0 0x04EB +u042D_0308 24 0 0x04EC +u044D_0308 24 0 0x04ED +u0423_0304 24 0 0x04EE +u0443_0304 24 0 0x04EF +u0423_0308 24 0 0x04F0 +u0443_0308 24 0 0x04F1 +u0423_030B 24 0 0x04F2 +u0443_030B 24 0 0x04F3 +u0427_0308 24 0 0x04F4 +u0447_0308 24 0 0x04F5 +u042B_0308 24 0 0x04F8 +u044B_0308 24 0 0x04F9 +u0500 24 0 0x0500 +u0501 24 0 0x0501 +u0502 24 0 0x0502 +u0503 24 0 0x0503 +u0504 24 0 0x0504 +u0505 24 0 0x0505 +u0506 24 0 0x0506 +u0507 24 0 0x0507 +u0508 24 0 0x0508 +u0509 24 0 0x0509 +u050A 24 0 0x050A +u050B 24 0 0x050B +u050C 24 0 0x050C +u050D 24 0 0x050D +u050E 24 0 0x050E +u050F 24 0 0x050F - 24 0 0x2010 hy " en 24 0 0x2013 diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub index 047f14ce..05ff66cb 100644 --- a/tmac/Makefile.sub +++ b/tmac/Makefile.sub @@ -19,6 +19,7 @@ NORMALFILES=\ dvi.tmac \ tty.tmac tty-char.tmac \ latin1.tmac latin2.tmac latin9.tmac cp1047.tmac \ + unicode.tmac \ X.tmac Xps.tmac \ lj4.tmac \ lbp.tmac \ diff --git a/tmac/tty.tmac b/tmac/tty.tmac index 4b337fd3..8d69253b 100644 --- a/tmac/tty.tmac +++ b/tmac/tty.tmac @@ -65,6 +65,9 @@ .fchar \[.i] i .fchar \[bq] , . +.if '\*[.T]'utf8' \ +. mso unicode.tmac +. .\" color definitions .defcolor black rgb #000000 .defcolor red rgb #ff0000 diff --git a/tmac/unicode.tmac b/tmac/unicode.tmac new file mode 100644 index 00000000..c7ef39dc --- /dev/null +++ b/tmac/unicode.tmac @@ -0,0 +1,12 @@ +.\" unicode.tmac +.\" +.\" All glyphs for devutf8 are spacing glyphs. We use `\z' to make them +.\" non-spacing again. +.\" +.char \[u0483] \z\[u0483] +.char \[u0484] \z\[u0484] +.char \[u0485] \z\[u0485] +.char \[u0486] \z\[u0486] +.char \[u0488] \z\[u0488] +.char \[u0489] \z\[u0489] +.\" EOF -- 2.11.4.GIT