* fonts/devcp1047/R.proto, fonts/devlatin1/R.proto,

fonts/devhtml/R.proto: Remove `charXXX'entries.
* tmac/tty.tmac, tmac/html.tmac: Load latin1.tmac or cp1047.tmac
where appropriate.

* fonts/devlj4/generate/text.map: Remove `charXXX' entries.
* fonts/devlj4/*: Regenerated all font definition files.
* tmac/lj4.tmac: Load latin1.tmac.

* src/utils/hpftodit/hpftodit.cc (do_file): Partially undo change
from 2000-06-17: LJ4 metric files are *not* text files.

* tmac/troffrc, tmac/dvi.tmac, tmac/ps.tmac: Don't use .T string
register to test for EBCDIC.

1 files changed, 24 insertions, 4 deletions

diff --git a/tmac/tty.tmac b/tmac/tty.tmac
index 1c3f14fa..2fde64e0 100644
--- a/tmac/tty.tmac
+++ b/tmac/tty.tmac
@@ -2,16 +2,27 @@
 .\"
 .nr _C \n(.C
 .cp 0
+.
 .nroff
+.
 .\" Don't warn about non-existent fonts.
 .warn \n[.warn]-(\n[.warn]/131072%2*131072)
+.
 .po 0
-.if c\[shc] .shc \[shc]
+.
+.if c\[shc] \
+.  shc \[shc]
+.
 .de tty-char
-.if !c\\$1 .char \\$1 "\\$2
+.  if !c\\$1 \
+.    char \\$1 "\\$2
 ..
-.ie c\(pc .tr \(bu\(pc
-.el .if c\(md .tr \(bu\(md
+.
+.ie c\(pc \
+.  tr \(bu\(pc
+.el
+.  if c\(md \
+.    tr \(bu\(md
 .tty-char \(bu \z+o
 .tty-char \(14 1/4
 .tty-char \(12 1/2
@@ -46,6 +57,7 @@
 .tty-char \(an -
 .tty-char \(eu EUR
 .tty-char \(Eu EUR
+.
 .\" color definitions
 .defcolor black rgb #000000
 .defcolor red rgb #ff0000
@@ -55,7 +67,15 @@
 .defcolor magenta rgb #ff00ff
 .defcolor cyan rgb #00ffff
 .defcolor white rgb #ffffff
+.
 .cp \n(_C
+.
+.ie '\*(.T'cp1047' \
+.  do mso cp1047.tmac
+.el \
+.  if '\*(.T'latin1' \
+.    do mso latin1.tmac
+.
 .\" If you want the character definitions in tty-char.tmac to be loaded
 .\" automatically, remove the `\"' from the next line.
 .\"do mso tty-char.tmac