Upgrade to termcap version 9.13.8

1 files changed, 3652 insertions, 3009 deletions

diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index ff72e4346a4..94da4fcfd4e 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -1,7 +1,7 @@
-#	$OpenBSD: termcap.src,v 1.4 1996/04/24 23:45:07 mickey Exp $
+#	$OpenBSD: termcap.src,v 1.5 1996/07/14 08:33:27 tholo Exp $
 ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
 #
-#	Version 9.12.3
+#	Version 9.13.8
 #	termcap syntax
 #
 #	Eric S. Raymond		(current maintainer)
@@ -24,14 +24,18 @@
 # and carefully tested than those in historical termcap/terminfo versions.
 #
 # Pointers to related resources (including the ncurses distribution) may
-# be found at <http://www.ccil.org/~esr/ncurses.html>.
+# be found at <http://www.ccil.org/terminfo>.
 #
 # INTERNATIONALIZATION:
 #
 # This file assumes a US-ASCII character set. If you need to fix this, start
 # by global-replacing \E(B and \E)B with the appropriate ISO 6429 enablers
 # for your character set.  \E(A and \E)A enables the British character set
-# with the pound sign at position 2/3.
+# with the pound sign at position 2/3.  
+#
+# In a Japanese-processing environment using EUC/Japanese or Shift-JIS,
+# C1 characters are considered the first-byte set of the Japanese encodings,
+# so \E)0 should be avoided in <enacs> and initialization strings.
 #
 # FILE FORMAT:
 #
@@ -44,13 +48,16 @@
 # in that it admits a group of capabilities (prefixed `OT') equivalent to
 # various obsolete termcap capabilities.  You can, thus, convert from master
 # to stock terminfo simply by filtering with `sed "/OT[^,]*,/s///"'; but if
-# you have ncurses `tic -I' is nicer.
+# you have ncurses `tic -I' is nicer (among other things, it automatically
+# outputs entries in a canonical form).
 #
 # The termcap version is generated automatically from the master version
 # using tic -C.  This filtering leaves in the OT capabilities under their
-# original termcap names.  All translated entries fit within the
-# 1023-byte string-table limit of archaic termcap libraries except where
-# explicitly noted below.
+# original termcap names.  All translated entries fit within the 1023-byte
+# string-table limit of archaic termcap libraries except where explicitly
+# noted below.  Note that the termcap translation assumes that your termcap
+# library can handle multiple tc capabilities in an entry. 4.4BSD has this
+# capability.  Older versions of GNU termcap, through 1.3, do not. 
 #
 # For details on these formats, see terminfo(5) in the ncurses distribution,
 # and termcap(5) in the 4.4BSD Unix Programmer's Manual.  Be aware that 4.4BSD
@@ -93,11 +100,6 @@
 # standard terminal classes.  Parenthesized words following manufacturer
 # names are type prefixes or product line names used by that manufacturers.
 #
-# Finally, because this file is released in both terminfo and termcap formats,
-# most references to termcap names in comments are bracketed with colons (the
-# termcap separator) so they can be distinguished from terminfo capability
-# names.
-#
 # HOW TO READ THE ENTRIES:
 #
 # The first name in an entry is the canonical name for the model or
@@ -123,12 +125,12 @@
 #	-na	No arrow keys - termcap ignores arrow keys which are
 #		actually there on the terminal, so the user can use
 #		the arrow keys locally.
-#	-nam	No auto-margin - suppress <am> capability
+#	-nam	No auto-margin - suppress :am: capability
 #	-nl	No labels - suppress soft labels
 #	-ns	No status line - suppress status line
 #	-rv	Terminal in reverse video mode (black on white)
 #	-s	Enable status line.
-#	-vb	Use visible bell (<flash>) rather than <bel>.
+#	-vb	Use visible bell (:vb:) rather than :bl:.
 #	-w	Wide - in 132 column mode.
 # If a name has multiple suffixes and one is a line height, that one should 
 # go first.  Thus `aaa-30-s-rv' is recommended over `aaa-s-rv'.  
@@ -205,8 +207,10 @@
 # of heaviest use, popularity, and interesting features.
 #
 # I'm especially interested in identifying the obscure entries listed under
-# `Manufacturer unknown' and `Utter unknowns', before the tribal wisdom 
-# about them gets lost.
+# `Miscellaneous obsolete terminals, manufacturers unknown' before the tribal
+# wisdom about them gets lost.  If you know a lot about obscure old terminals,
+# please go to the terminfo resource page, grab the file ufo.ti, and eyeball
+# it for things you can identify. 
 #
 # If you have been around long enough to contribute, please read the file
 # with this in mind and send me your annotations.
@@ -254,6 +258,11 @@ lpr|printer|line printer:\
 	:hc:os:\
 	:co#132:li#66:\
 	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
+glasstty|classic glass tty interpreting ASCII control characters:\
+	:am:\
+	:co#80:\
+	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
+	:ta=^I:
 
 #### ANSI.SYS/ISO 6429/ECMA-48 Capabilities
 #
@@ -272,23 +281,25 @@ klone+acs|alternate character set for ansi.sys displays:\
 
 # Highlight controls corresponding to the ANSI.SYS standard.  Most 
 # console drivers for Intel boxes obey these.  Makes the same assumption
-# about \E[11m as klone+acs.  True ANSI/ECMA-48 would have rmso=\E[27m,
-# rmul=\E[24m, but this isn't a documented feature of ANSI.SYS.
+# about \E[11m as klone+acs.  True ANSI/ECMA-48 would have :se=\E[27m:,
+# :ue=\E[24m:, but this isn't a documented feature of ANSI.SYS.
 klone+sgr|attribute control for ansi.sys displays:\
-	:S2=\E[11m:S3=\E[10m:ae=\E[10m:as=\E[11m:mb=\E[5m:\
-	:md=\E[1m:me=\E[0;10m:mk=\E[8m:mr=\E[7m:\
+	:S2=\E[11m:S3=\E[10m:mb=\E[5m:md=\E[1m:me=\E[0;10m:\
+	:mk=\E[8m:mr=\E[7m:\
 	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m:\
-	:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:
+	:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:\
+	:tc=klone+acs:
 
 # Highlight controls corresponding to the ANSI.SYS standard.  *All*
 # console drivers for Intel boxes obey these.  Does not assume \E[11m will
 # work; uses \E[12m instead, which is pretty bulletproof but loses you the ACS
 # diamond and arrow characters under curses.
 klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m):\
-	:ae=\E[10m:as=\E[12m:mb=\E[5m:md=\E[1m:me=\E[0;10m:\
-	:mk=\E[8m:mr=\E[7m:\
+	:as=\E[12m:mb=\E[5m:md=\E[1m:me=\E[0;10m:mk=\E[8m:\
+	:mr=\E[7m:\
 	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m:\
-	:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:
+	:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:\
+	:tc=klone+acs:
 
 # ANSI.SYS color control.  The setb/setf caps depend on the coincidence
 # between SVr4/XPG4's color numbers and ANSI.SYS attributes.  Here are longer
@@ -296,10 +307,21 @@ klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m):\
 # setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
 # setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
 # The DOS 5 manual asserts that these sequences meet the ISO 6429 standard.
+# They match a subset of ECMA-48.
 klone+color|color control for ansi.sys and ISO6429-compatible displays:\
 	:Co#8:NC#3:pa#64:\
-	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:Sb=\E[%+(m:Sf=\E[%+^^m:\
-	:op=\E[37;40m:
+	:Sb=\E[4%dm:Sf=\E[3%dm:op=\E[37;40m:
+
+# This is better than klone+color, it doesn't assume white-on-black as the
+# default color pair,  but many `ANSI' terminals don't grok the <op> cap.
+ecma+color|color control for ECMA-48-compatible terminals:\
+	:Co#8:NC#3:pa#64:\
+	:Sb=\E[4%dm:Sf=\E[3%dm:op=\E[39;49m:
+
+# Attribute control for ECMA-48-compatible terminals
+ecma+sgr|attribute capabilities for true ECMA-48 terminals:\
+	:se=\E[27m:ue=\E[24m:\
+	:tc=klone+sgr:
 
 # For comparison, here are all the capabilities implied by the Intel
 # Binary Compatibility Standard (level 2) that fit within terminfo.
@@ -307,10 +329,10 @@ klone+color|color control for ansi.sys and ISO6429-compatible displays:\
 # near the end of this file.
 ibcs2|Intel Binary Compatibility Standard prescriptions:\
 	:AL=\E[%dL:DC=\E[%dP:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
-	:RA=\E[?7l:RI=\E[%dC:S1=\E=%p1%dg:SA=\E[?7h:\
-	:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:bt=\E[Z:ch=\E[%i%dG:\
-	:cl=\Ec:cm=\E[%i%d;%dH:ct=\E[g:cv=\E[%i%dd:ec=\E[%dX:\
-	:ei=:im=:rc=\E7:sc=\E7:st=\EH:
+	:RA=\E[?7l:RI=\E[%dC:S1=\E=%p1%dg:SA=\E[?7h:SF=\E[%dS:\
+	:SR=\E[%dT:UP=\E[%dA:bt=\E[Z:ch=\E[%i%dG:cl=\Ec:\
+	:cm=\E[%i%d;%dH:ct=\E[g:cv=\E[%i%dd:ec=\E[%dX:ei=:im=:\
+	:rc=\E7:sc=\E7:st=\EH:
 
 #### ANSI/ECMA-48 terminals and terminal emulators
 #
@@ -328,23 +350,23 @@ ansi-mini|any ansi terminal with pessimistic assumptions:\
 	:le=\E[D:nd=\E[C:ta=^I:up=\E[A:
 
 # Procomm and some other ANSI emulations don't recognize all of the ANSI-
-# standard capabilities.  This entry deletes <cuu>, <cuf>, <cud>, <cub>, and 
-# <vpa>/<hpa> capabilities, forcing curses to use repetitions of <cuu1>, 
-# <cuf1>, cud1 and cub1.  Also deleted <ich> and <ich1>, as QModem up to 5.03
-# doesn't recognize these.  Finally, we delete <rep> and <ri>, which seem to
-# confuse many emulators.  On the other hand, we can count on these programs
-# doing <rmacs>/<smacs>/<sgr>.  # Older versions of this entry featured 
-# <invis>=\E[9m, but <invis>=\E[8m now seems to be more common under
+# standard capabilities.  This entry deletes :UP:, :RI:, :DO:, :LE:, and 
+# <vpa>/<hpa> capabilities, forcing curses to use repetitions of :up:, 
+# :nd:, :do: and :le:.  Also deleted :IC: and :ic:, as QModem up to 
+# 5.03 doesn't recognize these.  Finally, we delete :rp: and :sr:, which seem
+# to confuse many emulators.  On the other hand, we can count on these programs
+# doing :ae:/:as:/:sa:.  # Older versions of this entry featured 
+# <invis=\E[9m>, but <invis=\E[8m> now seems to be more common under
 # ANSI.SYS influence.
 # From: Eric S. Raymond <esr@snark.thyrsus.com> Oct 30 1995
 pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ansi (mono mode):\
 	:am:bs:mi:ms:\
 	:co#80:it#8:li#24:\
 	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:dc=\E[P:dl=\E[M:\
-	:do=\E[B:ho=\E[H:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=\E[D:nd=\E[C:sf=^J:st=\EH:ta=^I:\
-	:up=\E[A:tc=klone+sgr-dumb:
+	:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ho=\E[H:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=\E[D:nd=\E[C:sf=^J:st=\EH:ta=^I:up=\E[A:\
+	:tc=klone+sgr-dumb:
 pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode):\
 	:li#25:tc=pcansi-m:
 pcansi-33-m|pcansi33m|ibm-pc terminal programs with 33 lines (mono mode):\
@@ -369,18 +391,19 @@ ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes:\
 	:5i:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
-	:cb=\E[1K:ch=\E[%i%dG:ct=\E[2g:cv=\E[%i%dd:ec=\E[%dX:\
-	:ei=:im=:kB=\E[Z:kI=\E[L:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:nw=\r\E[S:pf=\E[4i:po=\E[5i:\
-	:..rp=%p1%c\E[%p2%{1}%-%db:s0=\E(B:s1=\E)B:s2=\E*B:\
-	:s3=\E+B:ta=\E[I:tc=pcansi-m:
+	:cb=\E[1K:ch=\E[%i%dG:ct=\E[2g:cv=\E[%i%dd:ec=\E[%dX:ei=:\
+	:im=:kB=\E[Z:kI=\E[L:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:nw=\r\E[S:pf=\E[4i:po=\E[5i:..rp=%p1%c\E[%p2%{1}%-%db:\
+	:s0=\E(B:s1=\E)B:s2=\E*B:s3=\E+B:ta=\E[I:\
+	:tc=pcansi-m:
 
 # ansi -- this terminfo expresses the largest subset of X3.64 that will fit in
-# standard terminfo.  Assumes ANSI.SYS-compatible attributes and color
+# standard terminfo.  Assumes ANSI.SYS-compatible attributes and color.
 # From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 6 1995
 ansi|ansi/pc-term compatible with color:\
 	:u6=\E[%i%d;%dR:u7=\E[6n:..u8=\E[?%[;0123456789]c:\
-	:u9=\E[c:tc=klone+color:tc=klone+acs:tc=klone+sgr:tc=ansi-m:
+	:u9=\E[c:\
+	:tc=ecma+color:tc=klone+sgr:tc=ansi-m:
 
 #
 # ANSI.SYS entries
@@ -395,9 +418,10 @@ ansi.sys-old|ANSI.SYS under PC-DOS 2.1:\
 	:am:mi:ms:xo:\
 	:co#80:li#25:\
 	:RA=\E[?7l:SA=\E[?7h:ce=\E[k:cl=\E[2J:cm=\E[%i%d;%dH:\
-	:do=\E[B:ho=\E[H:is=\E[m\E[?7h:kd=^J:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=\E[C:pk=\E[0;%+:;"%s":rc=\E[u:\
-	:sc=\E[s:u6=\E[%i%d;%dR:u7=\E[6n:up=\E[A:tc=klone+color:tc=klone+acs:tc=klone+sgr:
+	:do=\E[B:ho=\E[H:is=\E[m\E[?7h:kd=^J:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:nd=\E[C:pk=\E[0;%+:;"%s":rc=\E[u:sc=\E[s:\
+	:u6=\E[%i%d;%dR:u7=\E[6n:up=\E[A:\
+	:tc=klone+color:tc=klone+sgr:
 ansi.sys|ANSI.SYS 3.1 and later versions:\
 	:ce=\E[K:tc=ansi.sys-old:
 
@@ -406,18 +430,19 @@ ansi.sys|ANSI.SYS 3.1 and later versions:\
 # This should only be used when the terminal emulator cannot redefine the keys.
 # Since redefining keys with ansi.sys also affects PC-DOS programs, the key
 # definitions must be restored.  If the terminal emulator is quit while in vi
-# or others using <smkx>/<rmkx>, the keypad will not be defined as per PC-DOS.
+# or others using :ks:/:ke:, the keypad will not be defined as per PC-DOS.
 # The PgUp and PgDn are prefixed with ESC so that tn3270 can be used on Unix
 # (^U and ^D are already defined for tn3270).  The ESC is safe for vi but it
 # does "beep".  ESC ESC i is used for Ins to avoid tn3270 ESC i for coltab.
-# Note that <kcub1> is always BS, because PC-dos can tolerate this change.
+# Note that :kl: is always BS, because PC-dos can tolerate this change.
 # Caution: vi is limited to 256 string bytes, longer crashes or weirds out vi.
 # Consequently the End keypad key could not be set (it is relatively safe and
 # actually useful because it sends ^@ O, which beeps and opens a line above).
 ansi.sysk|ansisysk|PC-DOS 3.1 ANSI.SYS with keypad redefined for vi:\
 	:is=U2 PC-DOS 3.1 ANSI.SYS with keypad redefined for vi 9-29-86\n\E[;75;8p:\
 	:ke=\E[;71;0;71p\E[;72;0;72p\E[;73;0;73p\E[;77;0;77p\E[;80;0;80p\E[;81;0;81p\E[;82;0;82p\E[;83;0;83p:\
-	:ks=\E[;71;30p\E[;72;11p\E[;73;27;21p\E[;77;12p\E[;80;10p\E[;81;27;4p\E[;82;27;27;105p\E[;83;127p:tc=ansi.sys:
+	:ks=\E[;71;30p\E[;72;11p\E[;73;27;21p\E[;77;12p\E[;80;10p\E[;81;27;4p\E[;82;27;27;105p\E[;83;127p:\
+	:tc=ansi.sys:
 #
 # Adds ins/del line/character, hence vi reverse scrolls/inserts/deletes nicer.
 nansi.sys|nansisys|PC-DOS Public Domain NANSI.SYS:\
@@ -432,7 +457,7 @@ nansi.sysk|nansisysk|PC-DOS Public Domain NANSI.SYS with keypad redefined for vi
 #### ANSI console types
 #
 
-# This entry is good for the 1.1.47 version of the Linux console driver.
+# This entry is good for the 1.2.13 version of the Linux console driver.
 #
 # Note: there are numerous broken linux entries out there, which didn't screw
 # up BSD termcap but hose ncurses's smarter cursor-movement optimization.
@@ -456,32 +481,54 @@ nansi.sysk|nansisysk|PC-DOS Public Domain NANSI.SYS with keypad redefined for vi
 # *                                                                         *
 # ***************************************************************************
 #
-# From: Eric S. Raymond <esr@snark.thyrsus.com> 9 Nov 1995
+# The 1.3.x kernels add color-change capabilities; if yours doesn't have this
+# and it matters, turn off <ccc>.  The %02x escape used to implement this is
+# not back-portable to SV curses and not supported in ncurses versions before
+# 1.9.9. All linux kernels since 1.2.13 (at least) set the screen size
+# themselves; this entry assumes that capability.
+#
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 15 Dec 1995
 linux|linux console:\
 	:am:eo:mi:ms:ut:xn:xo:\
-	:co#80:it#8:li#25:\
-	:&7=^Z:@7=\E[4~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
-	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
-	:IC=\E[%d@:K2=\E[G:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
+	:it#8:\
+	:&7=^Z:@7=\E[4~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:F1=\E[23~:\
+	:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:\
+	:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:IC=\E[%d@:\
+	:K2=\E[G:al=\E[L:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
 	:ch=\E[%i%dG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
 	:cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:\
-	:do=^J:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:k1=\E[[A:\
-	:k2=\E[[B:k3=\E[[C:k4=\E[[D:k5=\E[[E:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kB=\E[Z:\
-	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\E[B:\
-	:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mr=\E[7m:\
-	:nd=\E[C:nw=^M^J:r1=\Ec:rc=\E8:sc=\E7:sf=^J:sr=\EM:\
-	:st=\EH:ta=^I:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?6c:\
-	:u9=\E[c:up=\E[A:vb=200\E[?5h\E[?5l:ve=\E[?25h:\
-	:vi=\E[?25l:tc=klone+sgr:tc=klone+color:tc=klone+acs:
+	:do=^J:ec=\E[%dX:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:\
+	:k1=\E[[A:k2=\E[[B:k3=\E[[C:k4=\E[[D:k5=\E[[E:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kB=\E[Z:kD=\E[3~:\
+	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\E[B:kh=\E[1~:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:nw=^M^J:r1=\Ec:rc=\E8:\
+	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m:\
+	:sc=\E7:sf=^J:sr=\EM:st=\EH:ta=^I:u6=\E[%i%d;%dR:u7=\E[6n:\
+	:u8=\E[?6c:u9=\E[c:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=200\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\
+	:tc=klone+sgr:tc=ecma+color:
 linux-m|Linux console no color:\
 	:Co@:pa@:\
 	:AB@:AF@:Sb@:Sf@:tc=linux:
+linux-c-nc|linux console 1.3.x hack for ncurses only:\
+	:cc:\
+	:..Ic=\E]P%p1%x%p2%02x%p3%02x%p4%02x:oc=\E]R:tc=linux:
+# From: Dennis Henriksen <opus@osrl.dk>, 9 July 1996
+linux-c|linux console 1.3.6+, with private palette for each virtual console:\
+	:cc:\
+	:Co#8:pa#64:\
+	:..Ic=\E]P%?%p1%{9}%>%t%p1%{10}%-%p'a'%+%c%e%p1%d%p2%{255}%&%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%p3%{255}%&%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%p4%{255}%&%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;:\
+	:oc=\E]R:\
+	:tc=linux:
 
 # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
 linux-nic|linux with ich/ich1 suppressed for non-curses programs:\
-	:IC@:ei=:ic@:im=:tc=linux:
+	:IC@:ei=:ic@:im=:\
+	:tc=linux:
+
+linux-old|linux console with hardwired screen size:\
+	:co#80:li#25:tc=linux:
 
 # SCO console and SOS-Syscons console for 386bsd
 # (scoansi: had unknown capabilities
@@ -490,55 +537,54 @@ linux-nic|linux with ich/ich1 suppressed for non-curses programs:\
 #	:G1=?:G2=Z:G3=@:G4=Y:G5=;:G6=I:G7=H:G8=<:\
 #	:CW=\E[M:NU=\E[N:RF=\E[O:RC=\E[P:\
 #	:WL=\E[S:WR=\E[T:CL=\E[U:CR=\E[V:\
-# I renamed GS/GE/HM/EN/PU/PD/RT -- esr)
+# I renamed GS/GE/HM/EN/PU/PD/RT and added klone+sgr-dumb, based
+# on the :as:=\E[12m  -- esr)
 scoansi|SCO Extended ANSI standard crt:\
 	:am:bs:eo:xo:\
 	:co#80:it#8:li#25:\
-	:@7=\E[F:ae=\E[10m:al=\E[L:as=\E[12m:bt=\E[Z:cd=\E[J:\
-	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:\
-	:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k1=\E[M:k2=\E[N:\
-	:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:\
-	:k9=\E[U:k;=\E[V:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:\
-	:md=\E[1m:me=\E[m:nd=\E[C:se=\E[m:sf=\E[S:so=\E[7m:\
-	:sr=\E[T:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+	:@7=\E[F:al=\E[L:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:ic=\E[@:im=:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:\
+	:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:kN=\E[G:kP=\E[I:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:\
+	:mb=\E[5m:md=\E[1m:nd=\E[C:sf=\E[S:sr=\E[T:ta=^I:up=\E[A:\
+	:tc=klone+sgr-dumb:
 
 # This actually describes the generic SVr4 display driver for Intel boxes.
-# The <dim>=\E[2m isn't documented and therefore may not be reliable.
+# The :mh=\E[2m: isn't documented and therefore may not be reliable.
 # From: Eric Raymond <esr@snark.thyrsus.com> Mon Nov 27 19:00:53 EST 1995
 att6386|at386|386at|AT&T WGS 6386 console:\
 	:am:bw:eo:xo:\
 	:co#80:it#8:li#25:\
-	:@7=\E[Y:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
-	:F1=\EOZ:F2=\EOA:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:\
-	:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:@7=\E[Y:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\EOZ:\
+	:F2=\EOA:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:\
+	:SR=\E[%dT:UP=\E[%dA:\
 	:ac=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~:\
 	:ae=\E[10m:al=\E[1L:as=\E[12m:bl=^G:bt=\E[Z:cd=\E[J:\
-	:ce=\E[K:ch=\E[%i%dG:cl=\E[2J\E[H:cm=\E[%i%d;%dH:\
-	:cr=^M:ct=\E[2g:cv=\E[%i%dd:dc=\E[P:dl=\E[1M:do=\E[B:\
-	:ec=\E[%dX:ei=:ho=\E[H:ic=\E[1@:im=:is=\E[0;10;39m:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:\
-	:k7=\EOV:k8=\EOW:k9=\EOX:k;=\EOY:kB=^]:kD=\E[P:\
-	:kI=\E[@:kM=\E0:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:\
-	:md=\E[1m:me=\E[0;10m:mh=\E[2m:mk=\E[9m:mr=\E[7m:\
-	:nd=\E[C:nw=\r\E[S:rc=\E8:\
+	:ce=\E[K:ch=\E[%i%dG:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
+	:ct=\E[2g:cv=\E[%i%dd:dc=\E[P:dl=\E[1M:do=\E[B:ec=\E[%dX:\
+	:ei=:ho=\E[H:ic=\E[1@:im=:is=\E[0;10;39m:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:k9=\EOX:\
+	:k;=\EOY:kB=^]:kD=\E[P:kI=\E[@:kM=\E0:kN=\E[U:kP=\E[V:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:\
+	:md=\E[1m:me=\E[0;10m:mh=\E[2m:mk=\E[9m:mr=\E[7m:nd=\E[C:\
+	:nw=\r\E[S:rc=\E8:\
 	:..sa=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m:\
-	:sc=\E7:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:st=\EH:\
-	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[=1C:vi=\E[=C:tc=klone+color:
+	:sc=\E7:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[=1C:vi=\E[=C:\
+	:tc=klone+color:
 # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
 pc6300plus|AT&T 6300 plus:\
 	:am:xo:\
 	:co#80:li#24:\
 	:al=\E[1L:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[H:\
-	:cm=\E[%i%2;%2H:cr=^M:ct=\E[3g:dc=\E[1P:dl=\E[1M:\
-	:do=\E[B:ei=:ho=\E[H:ic=\E[1@:im=:k1=\EOc:k2=\EOd:\
-	:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
-	:k9=\EOk:k;=\EOu:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mh=\E[2m:\
-	:mk=\E[9m:mr=\E[7m:nd=\E[C:nw=^M^J:se=\E[m:sf=^J:\
-	:so=\E[7m:st=\EH:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[=1C:\
-	:vi=\E[=C:
+	:cm=\E[%i%2;%2H:cr=^M:ct=\E[3g:dc=\E[1P:dl=\E[1M:do=\E[B:\
+	:ei=:ho=\E[H:ic=\E[1@:im=:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:\
+	:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\EOk:k;=\EOu:kb=^H:\
+	:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mh=\E[2m:mk=\E[9m:mr=\E[7m:nd=\E[C:nw=^M^J:\
+	:se=\E[m:sf=^J:so=\E[7m:st=\EH:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[=1C:vi=\E[=C:
 
 #
 #	Terminfo entry for the AT&T Unix PC 7300
@@ -587,7 +633,7 @@ pc6300plus|AT&T 6300 plus:\
 #	        }
 #	}
 #
-# (att7300: added <civis>/<cnorm>/<ich1>/<invis> from the BSDI entry,
+# (att7300: added :vi:/:ve:/:ic:/<invis> from the BSDI entry,
 # they're confirmed by the man page for the System V display---esr)
 #
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
@@ -599,35 +645,32 @@ att7300|unixpc|pc7300|3b1|s4|AT&T UNIX PC Model 7300:\
 	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
 	:UP=\E[%dA:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:bt=\E^I:\
 	:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:i1=^O:ic=\E[@:\
-	:im=:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E5:k6=\E6:\
-	:k7=\E7:k8=\E8:kD=\Edc:kI=\Eim:kN=\Epg:kP=\EPG:kb=^H:\
-	:kd=\E[B:kh=\Ehm:kl=\E[D:kr=\E[C:ku=\E[A:md=\E[7m:\
-	:me=\E[0;10m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
-	:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:\
-	:us=\E[4m:ve=\E[=1C:vi=\E[=C:
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:i1=^O:ic=\E[@:im=:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E5:k6=\E6:k7=\E7:\
+	:k8=\E8:kD=\Edc:kI=\Eim:kN=\Epg:kP=\EPG:kb=^H:kd=\E[B:\
+	:kh=\Ehm:kl=\E[D:kr=\E[C:ku=\E[A:md=\E[7m:me=\E[0;10m:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:se=\E[m:sf=^J:so=\E[7m:\
+	:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[=1C:vi=\E[=C:
 
 # From: davis@unidata.ucar.edu
 # (iris-ansi: added rmam/smam based on init string -- esr)
 iris-ansi|iris-ansi-net|IRIS emulating ANSI terminal:\
 	:am:\
 	:co#80:it#8:li#40:\
-	:!2=\E[218q:#2=\E[143q:#4=\E[158q:%9=\E[209q:\
-	:%f=\E[210q:%i=\E[167q:&7=\E[217q:*4=\E[P:*7=\E[147q:\
-	:@7=\E[146q:@8=^M:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:\
-	:F1=\EOR:F2=\EOS:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:\
-	:SA=\E[?7h:UP=\E[%dA:al=\E[L:bl=^G:cb=\E[1K:cd=\E[J:\
-	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
-	:dl=\E[M:do=^J:ho=\E[H:\
+	:!2=\E[218q:#2=\E[143q:#4=\E[158q:%9=\E[209q:%f=\E[210q:\
+	:%i=\E[167q:&7=\E[217q:*4=\E[P:*7=\E[147q:@7=\E[146q:\
+	:@8=^M:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:F1=\EOR:F2=\EOS:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:al=\E[L:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dl=\E[M:do=^J:ho=\E[H:\
 	:is=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8:k1=\E[001q:\
-	:k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:\
-	:k6=\E[006q:k7=\E[007q:k8=\E[008q:k9=\EOP:k;=\EOQ:\
-	:kB=\E[Z:kD=\177:kI=\E[139q:kM=\E[146q:kN=\E[154q:\
-	:kP=\E[150q:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=\E[D:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:nw=\EE:pk=\EP101;%d.y%s\E\\:rc=\E8:sc=\E7:se=\E[m:\
-	:sf=\ED:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
-	:up=\E[A:us=\E[4m:ve=\E[9/y\E[12/y\E[=6l:\
+	:k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:k6=\E[006q:\
+	:k7=\E[007q:k8=\E[008q:k9=\EOP:k;=\EOQ:kB=\E[Z:kD=\177:\
+	:kI=\E[139q:kM=\E[146q:kN=\E[154q:kP=\E[150q:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:pk=\EP101;%d.y%s\E\\:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[1;7m:sr=\EM:st=\EH:\
+	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[9/y\E[12/y\E[=6l:\
 	:vs=\E[10/y\E[=1h\E[=2l\E[=6h:
 
 # The following is a version of the ibm-pc entry distributed with PC/IX,
@@ -640,9 +683,9 @@ iris-ansi|iris-ansi-net|IRIS emulating ANSI terminal:\
 pcix|PC/IX console:\
 	:am:bw:eo:\
 	:co#80:li#24:\
-	:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:\
-	:ho=\E[H:le=^H:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
+	:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:ho=\E[H:\
+	:le=^H:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 
 # (ibmpcx: this entry used to be known as ibmx.
 # It formerly included the following extension capabilities:
@@ -659,17 +702,18 @@ ibmpcx|xenix|ibmx|IBM PC xenix console display:\
 	:am:ms:\
 	:co#80:li#25:\
 	:@7=\E[d:al=\E[L:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%d;%dH:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:\
-	:k1=\E[K:k2=\E[L:k3=\E[M:k4=\E[N:kN=\E[e:kP=\E[Z:\
-	:kb=^H:kd=\E[B:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:nd=\E[C:up=\E[A:tc=klone+acs:tc=klone+sgr:
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k1=\E[K:\
+	:k2=\E[L:k3=\E[M:k4=\E[N:kN=\E[e:kP=\E[Z:kb=^H:kd=\E[B:\
+	:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:up=\E[A:\
+	:tc=klone+acs:tc=klone+sgr:
 
 
 # QNX 4.0 Console
-# Michael's original version of this entry had <am>@, <smcup>=\Ei,
-# <rmcup>=\Eh\ER; this was so terminfo applications could write the lower
+# Michael's original version of this entry had <am@>, :ti=\Ei:,
+# :te=\Eh\ER:; this was so terminfo applications could write the lower
 # right corner without triggering a scroll.  The ncurses terminfo library can
-# handle this case with the <ich1> capability, and prefers am for optimization.
+# handle this case with the :ic: capability, and prefers :am: for better
+# optimization.  Bug: The <op> capability resets attributes.
 # From: Michael Hunter <mphunter@qnx.com> 25 Aug 1995
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
@@ -677,307 +721,179 @@ ibmpcx|xenix|ibmx|IBM PC xenix console display:\
 qnx|qnx4|qnx console:\
 	:am:km:mi:ms:xt:\
 	:co#80:it#4:li#25:\
-	:al=\EE:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:dc=\Ef:dl=\EF:do=^J:ei=:ho=\EH:ic=\Ee:im=:\
-	:k1=\377\201:k2=\377\202:k3=\377\203:k4=\377\204:\
-	:k5=\377\205:k6=\377\206:k7=\377\207:k8=\377\210:\
-	:k9=\377\211:kD=\377\254:kI=\377\253:kN=\377\252:\
-	:kP=\377\242:kd=\377\251:kh=\377\240:kl=\377\244:\
-	:kr=\377\246:ku=\377\241:le=^H:mb=\E{:md=\E<:\
-	:me=\E}\E]\E>\E):mr=\E(:nd=\EC:rp=\Eg%r%+ %.:se=\E):\
-	:sf=^J:so=\E(:sr=\EI:ta=^I:te=\ER:ue=\E]:up=\EA:\
-	:us=\E[:ve=\Ey1:vi=\Ey0:vs=\Ey2:
-
-#### FreeBSD and NetBSD consoles
+	:al=\EE:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
+	:dc=\Ef:dl=\EF:do=^J:ei=:ho=\EH:ic=\Ee:im=:k1=\377\201:\
+	:k2=\377\202:k3=\377\203:k4=\377\204:k5=\377\205:\
+	:k6=\377\206:k7=\377\207:k8=\377\210:k9=\377\211:\
+	:kD=\377\254:kI=\377\253:kN=\377\252:kP=\377\242:\
+	:kd=\377\251:kh=\377\240:kl=\377\244:kr=\377\246:\
+	:ku=\377\241:le=^H:mb=\E{:md=\E<:me=\E}\E]\E>\E):mr=\E(:\
+	:nd=\EC:rp=\Eg%r%+ %.:se=\E):sf=^J:so=\E(:sr=\EI:ta=^I:\
+	:te=\ER:ti=:ue=\E]:up=\EA:us=\E[:ve=\Ey1:vi=\Ey0:vs=\Ey2:
+
+#### NetBSD consoles
 #
 # pcvt termcap database entries (corresponding to release 3.31)
 # Author's last edit-date: [Fri Sep 15 20:29:10 1995]
 #
 # (For the terminfo master file, I translated these into terminfo syntax.
 # Then I dropped all the pseudo-HP entries. we don't want and can't use
-# the :Xs: flag. Then I split :is: into a size-independent <is1> and a
-# size-dependent <is2>.  Finally, I added <rmam>/<smam> -- esr)
+# the :Xs: flag. Then I split :is: into a size-independent :i1: and a
+# size-dependent :is:.  Finally, I added <rmam>/<smam> -- esr)
 
 # NOTE: because the 386BSD "vi"/"elvis" seems to have a bug if
-# both <ich1> and <smir> are specified (an original VT220 
-# shows the same buggy behaviour!), <ich1> has been taken
-# out of this entry. for reference, it should be <ich1>=\E[@.
+# both :ic: and :im: are specified (an original VT220 
+# shows the same buggy behaviour!), :ic: has been taken
+# out of this entry. for reference, it should be <ich1=\E[@>.
+pcvtXX|pcvt vt200 emulator (DEC VT220):\
+	:am:km:mi:ms:xn:\
+	:it#8:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:SF=\E[%dS:\
+	:SR=\E[%dT:UP=\E[%dA:\
+	:ac=llmmkkjjuuttvvwwqqxxnnoosspprr``aaffgg~~..--++\054\054hhII00yyzz:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:i1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:im=\E[4h:\
+	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
+	:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=\177:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:r1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:rf=/usr/share/tabset/vt100:sc=\E7:se=\E[27m:sf=\ED:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:
 
-#---------------------------------------------------------------------------
 #	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
 #	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
-#	50 lines entries
-#	80 columns
-#---------------------------------------------------------------------------
-pcvt25|dec vt220 with 25 lines:\
-	:li#25:\
-	:co#80:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;25r\E[25;1H:\
-	:tc=pcvtXX:
-
-pcvt28|dec vt220 with 28 lines:\
-	:li#28:\
-	:co#80:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;28r\E[28;1H:\
-	:tc=pcvtXX:
-
-pcvt35|dec vt220 with 35 lines:\
-	:li#35:\
-	:co#80:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;35r\E[35;1H:\
-	:tc=pcvtXX:
-
-pcvt40|dec vt220 with 40 lines:\
-	:li#40:\
-	:co#80:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;40r\E[40;1H:\
-	:tc=pcvtXX:
-
-pcvt43|dec vt220 with 43 lines:\
-	:li#43:\
-	:co#80:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;43r\E[43;1H:\
-	:tc=pcvtXX:
-
-pcvt50|dec vt220 with 50 lines:\
-	:li#50:\
-	:co#80:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;50r\E[50;1H:\
-	:tc=pcvtXX:
+#	50 lines entries; 80 columns
+pcvt25|dec vt220 emulation with 25 lines:\
+	:co#80:li#25:\
+	:is=\E[1;25r\E[25;1H:tc=pcvtXX:
+pcvt28|dec vt220 emulation with 28 lines:\
+	:co#80:li#28:\
+	:is=\E[1;28r\E[28;1H:tc=pcvtXX:
+pcvt35|dec vt220 emulation with 35 lines:\
+	:co#80:li#35:\
+	:is=\E[1;35r\E[35;1H:tc=pcvtXX:
+pcvt40|dec vt220 emulation with 40 lines:\
+	:co#80:li#40:\
+	:is=\E[1;40r\E[40;1H:tc=pcvtXX:
+pcvt43|dec vt220 emulation with 43 lines:\
+	:co#80:li#43:\
+	:is=\E[1;43r\E[43;1H:tc=pcvtXX:
+pcvt50|dec vt220 emulation with 50 lines:\
+	:co#80:li#50:\
+	:is=\E[1;50r\E[50;1H:tc=pcvtXX:
 
-#---------------------------------------------------------------------------
 #	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
 #	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
-#	50 lines entries
-#	132 columns
-#---------------------------------------------------------------------------
-pcvt25w|dec vt220 with 25 lines and 132 cols:\
-	:li#25:\
-	:co#132:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;25r\E[25;1H:\
-	:tc=pcvtXX:
-
-pcvt28w|dec vt220 with 28 lines and 132 cols:\
-	:li#28:\
-	:co#132:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;28r\E[28;1H:\
-	:tc=pcvtXX:
-
-pcvt35w|dec vt220 with 35 lines and 132 cols:\
-	:li#35:\
-	:co#132:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;35r\E[35;1H:\
-	:tc=pcvtXX:
-
-pcvt40w|dec vt220 with 40 lines and 132 cols:\
-	:li#40:\
-	:co#132:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;40r\E[40;1H:\
-	:tc=pcvtXX:
-
-pcvt43w|dec vt220 with 43 lines and 132 cols:\
-	:li#43:\
-	:co#132:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;43r\E[43;1H:\
-	:tc=pcvtXX:
-
-pcvt50w|dec vt220 with 50 lines and 132 cols:\
-	:li#50:\
-	:co#132:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;50r\E[50;1H:\
-	:tc=pcvtXX:
-
-#---------------------------------------------------------------------------
-#	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
-#	termcap entries for HP-Emulation and 25, 28, 35, 40, 43 and 50
-#	lines entries. note that the HP-Emulation uses the bottom 3 lines
-#	for status and function key labels, so we get always 3 lines less.
-#	"Xs" is a nonstandard, private flag indicating HP-like fkey labels
-#	80 column entries
-#---------------------------------------------------------------------------
-pcvt22h|dec vt220 with HP-fkey labels and 22 lines:\
-	:li#22:\
-	:co#80:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;22r\E[22;1H:\
-	:tc=pcvtXX:
-
-pcvt25h|dec vt220 with HP-fkey labels and 25 lines:\
-	:li#25:\
-	:co#80:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;25r\E[25;1H:\
-	:tc=pcvtXX:
-
-pcvt32h|dec vt220 with HP-fkey labels and 32 lines:\
-	:li#32:\
-	:co#80:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;32r\E[32;1H:\
-	:tc=pcvtXX:
-
-pcvt37h|dec vt220 with HP-fkey labels and 37 lines:\
-	:li#37:\
-	:co#80:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;37r\E[37;1H:\
-	:tc=pcvtXX:
-
-pcvt40h|dec vt220 with HP-fkey labels and 40 lines:\
-	:li#40:\
-	:co#80:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;40r\E[40;1H:\
-	:tc=pcvtXX:
-
-pcvt47h|dec vt220 with HP-fkey labels and 47 lines:\
-	:li#47:\
-	:co#80:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;47r\E[47;1H:\
-	:tc=pcvtXX:
-
-#---------------------------------------------------------------------------
-#	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
-#	termcap entries for HP-Emulation and 25, 28, 35, 40, 43 and 50
-#	lines entries. note that the HP-Emulation uses the bottom 3 lines
-#	for status and function key labels, so we get always 3 lines less.
-#	"Xs" is a nonstandard, private flag indicating HP-like fkey labels
-#	132 column entries
-#---------------------------------------------------------------------------
-pcvt22hw|dec vt220 with HP-fkey labels, 22 lines and 132 cols:\
-	:li#22:\
-	:co#132:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;22r\E[22;1H:\
-	:tc=pcvtXX:
-
-pcvt25hw|dec vt220 with HP-fkey labels, 25 lines and 132 cols:\
-	:li#25:\
-	:co#132:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;25r\E[25;1H:\
-	:tc=pcvtXX:
-
-pcvt32hw|dec vt220 with HP-fkey labels, 32 lines and 132 cols:\
-	:li#32:\
-	:co#132:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;32r\E[32;1H:\
-	:tc=pcvtXX:
-
-pcvt37hw|dec vt220 with HP-fkey labels, 37 lines and 132 cols:\
-	:li#37:\
-	:co#132:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;37r\E[37;1H:\
-	:tc=pcvtXX:
-
-pcvt40hw|dec vt220 with HP-fkey labels, 40 lines and 132 cols:\
-	:li#40:\
-	:co#132:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;40r\E[40;1H:\
-	:tc=pcvtXX:
-
-pcvt47hw|dec vt220 with HP-fkey labels, 47 lines and 132 cols:\
-	:li#47:\
-	:co#132:\
-	:Xs:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;47r\E[47;1H:\
-	:tc=pcvtXX:
-
-#---------------------------------------------------------------------------
-#	main entry, without "is" and "li" capabilities
-#
-#	NOTE: because the 386BSD "vi"/"elvis" seems to have a bug if
-#		both "ic" and "im" are specified (an original VT220 
-#		shows the same buggy behaviour!), "ic" has been taken
-#		out of this entry. for reference, it should be "ic=\E[@".
-#
-#---------------------------------------------------------------------------
-pcvtXX|pcvt vt200 emulator (DEC VT220):\
-	:AL=\E[%dL:\
-	:DC=\E[%dP:\
-	:DL=\E[%dM:\
-	:DO=\E[%dB:\
-	:IC=\E[%d@:\
-	:LE=\E[%dD:\
-	:RI=\E[%dC:\
-	:SF=\E[%dS:\
-	:SR=\E[%dT:\
-	:UP=\E[%dA:\
-	:ac=llmmkkjjuuttvvwwqqxxnnoosspprr\140\140aaffgg~~..--++\054\054hhII00yyzz:\
-	:ae=\E(B:\
-	:al=\E[L:\
-	:am:\
-	:as=\E(0:\
-	:bl=^G:\
-	:bs:\
-	:cb=\E[1K:\
-	:cd=\E[J:\
-	:ce=\E[K:\
-	:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:\
-	:cr=^M:\
-	:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:\
-	:dc=\E[P:\
-	:dl=\E[M:\
-	:do=\E[B:\
-	:ei=\E[4l:\
-	:ho=\E[H:\
-	:im=\E[4h:\
-	:it#8:\
-	:k1=\E[17~:\
-	:k2=\E[18~:\
-	:k3=\E[19~:\
-	:k4=\E[20~:\
-	:k5=\E[21~:\
-	:k6=\E[23~:\
-	:k7=\E[24~:\
-	:k8=\E[25~:\
-	:kD=\E[3~:\
-	:kH=\E[4~:\
-	:kI=\E[2~:\
-	:kN=\E[6~:\
-	:kP=\E[5~:\
-	:kb=\177:\
-	:kd=\EOB:\
-	:ke=\E[?1l\E>:\
-	:kh=\E[1~:\
-	:kl=\EOD:\
-	:km:\
-	:kr=\EOC:\
-	:ks=\E[?1h\E=:\
-	:ku=\EOA:\
-	:le=^H:\
-	:mb=\E[5m:\
-	:md=\E[1m:\
-	:me=\E[m:\
-	:mi:\
-	:mr=\E[7m:\
-	:ms:\
-	:nd=\E[C:\
-	:nw=\EE:\
-	:pt:\
-	:rc=\E8:\
-	:rf=/usr/share/tabset/vt100:\
-	:rs=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
-	:sc=\E7:\
-	:se=\E[27m:\
-	:sf=\ED:\
-	:so=\E[7m:\
-	:sr=\EM:\
-	:st=\EH:\
-	:ta=^I:\
-	:ue=\E[24m:\
-	:up=\E[A:\
-	:us=\E[4m:\
-	:vt#3:\
-	:xn:
-
-#---------------------------- E O F -------------------------------------------
+#	50 lines entries; 132 columns
+pcvt25w|dec vt220 emulation with 25 lines and 132 cols:\
+	:co#132:li#25:\
+	:is=\E[1;25r\E[25;1H:tc=pcvtXX:
+pcvt28w|dec vt220 emulation with 28 lines and 132 cols:\
+	:co#132:li#28:\
+	:is=\E[1;28r\E[28;1H:tc=pcvtXX:
+pcvt35w|dec vt220 emulation with 35 lines and 132 cols:\
+	:co#132:li#35:\
+	:is=\E[1;35r\E[35;1H:tc=pcvtXX:
+pcvt40w|dec vt220 emulation with 40 lines and 132 cols:\
+	:co#132:li#40:\
+	:is=\E[1;40r\E[40;1H:tc=pcvtXX:
+pcvt43w|dec vt220 emulation with 43 lines and 132 cols:\
+	:co#132:li#43:\
+	:is=\E[1;43r\E[43;1H:tc=pcvtXX:
+pcvt50w|dec vt220 emulation with 50 lines and 132 cols:\
+	:co#132:li#50:\
+	:is=\E[1;50r\E[50;1H:tc=pcvtXX:
+
+# NetBSD/x68k console vt200 emulator. This port runs on a 68K machine
+# manufactured by Sharp for the Japenese market.
+# From Minoura Makoto <minoura@netlaputa.or.jp>, 12 May 1996
+x68k|x68k-ite|NetBSD/x68k ITE:\
+	:co#96:li#32:\
+	:%1=\E[28~:kC=\E[9~:tc=vt220:
+
+#### FreeBSD console entries
+#
+# From: Andrew Chernov <ache@astral.msk.su> 29 Mar 1996
+# Andew Chernov maintains the FreeBSD termcap distributions.
+#
+# Note: Users of FreeBSD 2.1.0 and older versions must either upgrade
+# or comment out the <el1> capability in the console entry.
+#
+
+# for syscons
+# common entry without semigraphics
+# Bug: The <op> capability resets attributes.
+cons25w|ansiw|ansi80x25-raw|freebsd console (25-line raw mode):\
+	:NP:am:bw:eo:ms:ut:\
+	:Co#8:co#80:it#8:li#25:pa#64:\
+	:@7=\E[F:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[W:\
+	:F2=\E[X:IC=\E[%d@:K2=\E[E:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:\
+	:SR=\E[%dT:Sb=\E[4%dm:Sf=\E[3%dm:UP=\E[%dA:al=\E[L:bl=^G:\
+	:bt=\E[Z:cb=\E[1K:cd=\E[J:ce=\E[K:ch=\E[%i%d`:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cv=\E[%i%dd:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ec=\E[%dX:ei=:ho=\E[H:ic=\E[@:im=:k1=\E[M:k2=\E[N:k3=\E[O:\
+	:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:\
+	:kB=\E[Z:kD=\177:kI=\E[L:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mh=\E[30;1m:mr=\E[7m:nd=\E[C:nw=\E[E:op=\E[x:\
+	:r1=\E[x\E[m\Ec:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:\
+	:up=\E[A:
+cons25|ansis|ansi80x25|freebsd console (25-line ansi mode):\
+	:ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`\004a\260f\370g\361~\371.\031-\030h\261I^U0\333y\363z\362:\
+	:tc=cons25w:
+cons25-m|ansis-mono|ansi80x25-mono|freebsd console (25-line mono ansi mode):\
+	:Co@:pa@:\
+	:Sb@:Sf@:md@:mh@:op@:ue=\E[m:us=\E[4m:tc=cons25:
+cons30|ansi80x30|freebsd console (30-line ansi mode):\
+	:li#30:tc=cons25:
+cons30-m|ansi80x30-mono|freebsd console (30-line mono ansi mode):\
+	:li#30:tc=cons25-m:
+cons43|ansi80x43|freebsd console (43-line ansi mode):\
+	:li#43:tc=cons25:
+cons43-m|ansi80x43-mono|freebsd console (43-line mono ansi mode):\
+	:li#43:tc=cons25-m:
+cons50|ansil|ansi80x50|freebsd console (50-line ansi mode):\
+	:li#50:tc=cons25:
+cons50-m|ansil-mono|ansi80x50-mono|freebsd console (50-line mono ansi mode):\
+	:li#50:tc=cons25-m:
+cons60|ansi80x60|freebsd console (60-line ansi mode):\
+	:li#60:tc=cons25:
+cons60-m|ansi80x60-mono|freebsd console (60-line mono ansi mode):\
+	:li#60:tc=cons25-m:
+cons25r|pc3r|ibmpc3r|cons25-koi8-r|freebsd console w/koi8-r cyrillic:\
+	:ac=q\200x\201m\204v\211j\205t\206n\212u\207l\202w\210k\203y\230z\231f\234~\225a\220h\221`\004.\031-\030I^U0\215:\
+	:tc=cons25w:
+cons25r-m|pc3r-m|ibmpc3r-mono|cons25-koi8r-m|freebsd console w/koi8-r cyrillic (mono):\
+	:Co@:pa@:\
+	:Sb@:Sf@:op@:ue=\E[m:us=\E[4m:tc=cons25r:
+cons50r|cons50-koi8r|freebsd console w/koi8-r cyrillic (50 lines):\
+	:li#50:tc=cons25r:
+cons50r-m|cons50-koi8r-m|freebsd console w/koi8-r cyrillic (50-line mono):\
+	:li#50:tc=cons25r-m:
+cons60r|cons60-koi8r|freebsd console w/koi8-r cyrillic (60 lines):\
+	:li#60:tc=cons25r:
+cons60r-m|cons60-koi8r-m|freebsd console w/koi8-r cyrillic (60-line mono):\
+	:li#60:tc=cons25r-m:
+# ISO 8859-1 FreeBSD console
+cons25l1|cons25-iso8859|freebsd console w/iso 8859-1 chars:\
+	:ac=l\215m\216k\214j\213u\226t\225v\227w\230q\222x\231n\217o\220s\224p\221r\223`\201a\202f\207g\210~\237.\031-\030+\253\054\273I\247y\232z\233:\
+	:tc=cons25w:
+cons25l1-m|cons25-iso-m|freebsd console w/iso 8859-1 chars (mono):\
+	:Co@:pa@:\
+	:Sb@:Sf@:md@:mh@:op@:ue=\E[m:us=\E[4m:tc=cons25l1:
+cons50l1|cons50-iso8859|freebsd console w/iso 8859-1 chars (50 lines):\
+	:li#50:tc=cons25l1:
+cons50l1-m|cons50-iso-m|freebsd console w/iso 8859-1 chars (50-line mono):\
+	:li#50:tc=cons25l1-m:
+cons60l1|cons60-iso|freebsd console w/iso 8859-1 chars (60 lines):\
+	:li#60:tc=cons25l1:
+cons60l1-m|cons60-iso-m|freebsd console w/iso 8859-1 chars (60-line mono):\
+	:li#60:tc=cons25l1-m:
 
 #### 386BSD and BSD/OS Consoles
 #
@@ -989,46 +905,49 @@ origpc3|origibmpc3|IBM PC 386BSD Console:\
 	:am:bw:eo:xo:\
 	:co#80:li#25:\
 	:ac=l\332q\304k\277x\263j\331m\300w\302u\264v\301t\303n\305:\
-	:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:\
-	:ho=\E[H:kd=\E[B:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:le=^H:md=\E[7m:me=\E[m\E[1;0x\E[2;7x:nd=\E[C:\
-	:se=\E[1;0x\E[2;7x:sf=\E[S:so=\E[1;7x\E[2;0x:sr=\E[T:\
-	:ue=\E[1;0x\E[2;7x:up=\E[A:us=\E[1;7x\E[2;0x:
+	:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:ho=\E[H:\
+	:kd=\E[B:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md=\E[7m:\
+	:me=\E[m\E[1;0x\E[2;7x:nd=\E[C:se=\E[1;0x\E[2;7x:\
+	:sf=\E[S:so=\E[1;7x\E[2;0x:sr=\E[T:ue=\E[1;0x\E[2;7x:\
+	:up=\E[A:us=\E[1;7x\E[2;0x:
 
 # description of BSD/386 console emulator in version 1.0 (supplied by BSDI)
 oldpc3|oldibmpc3|old IBM PC BSD/386 Console:\
 	:km:\
 	:li#25:\
-	:al=\E[L:bl=^G:cr=^M:dl=\E[M:do=^J:kH=\E[F:kI=\E[L:\
-	:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:md=\E[=15F:me=\E[=R:mh=\E[=8F:\
-	:nw=^M^J:sf=^J:ta=^I:
+	:al=\E[L:bl=^G:cr=^M:dl=\E[M:do=^J:kH=\E[F:kI=\E[L:kN=\E[G:\
+	:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:md=\E[=15F:me=\E[=R:mh=\E[=8F:nw=^M^J:sf=^J:ta=^I:
 
 # Description of BSD/OS console emulator in version 1.1, 2.0, 2.1
 # Note, the emulator supports many of the additional console features
-# listed in the iBCS2 (e.g. color and character-set selection) though
-# not all are described here.  This entry really ought to be upgraded.
+# listed in the iBCS2 (e.g. character-set selection) though not all
+# are described here.  This entry really ought to be upgraded.
 # Also note, the console will also work with fewer lines after doing
 # "stty rows NN", e.g. to use 24 lines.
+# (Color support from Kevin Rosenberg <kevin@cyberport.com>, 2 May 1996) 
+# Bug: The <op> capability resets attributes.
 bsdos|BSD/OS console:\
 	:am:bw:eo:km:xo:\
-	:co#80:it#8:li#25:\
+	:Co#8:co#80:it#8:li#25:pa#64:\
 	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
-	:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\Ec:\
-	:cm=\E[%i%d;%dH:cr=^M:dl=\E[M:do=^J:ho=\E[H:kH=\E[F:\
-	:kI=\E[L:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[0m:mh=\E[=8F:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:\
-	:sc=\E7:se=\E[0m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
+	:Sb=\E[4%dm:Sf=\E[3%dm:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\Ec:cm=\E[%i%d;%dH:cr=^M:dl=\E[M:do=^J:ho=\E[H:\
+	:kH=\E[F:kI=\E[L:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[0m:\
+	:mh=\E[=8F:mr=\E[7m:nd=\E[C:nw=^M^J:op=\E[x:rc=\E8:sc=\E7:\
+	:se=\E[0m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
 bsdos-bold|IBM PC BSD/386 Console with bold instead of underline:\
-	:ue=\E[0m:us=\E[1m:tc=bsdos:
+	:ue=\E[0m:us=\E[1m:\
+	:tc=bsdos:
 
 # If you are BSDI, you want the following entries, for the moment.  
 # In release 2.0 they will probably phase out the pc3 and ibmpc3 names
 pc3|IBM PC BSD/386 Console:\
 	:tc=bsdos:
 ibmpc3|pc3-bold|IBM PC BSD/386 Console with bold instead of underline:\
-	:us=\E[1m:tc=bsdos-bold:
+	:us=\E[1m:\
+	:tc=bsdos-bold:
 
 #### DEC VT100 and compatibles
 #
@@ -1043,25 +962,28 @@ ibmpc3|pc3-bold|IBM PC BSD/386 Console with bold instead of underline:\
 # Engineering for more information.  Updated terminfos and termcaps 
 # are kept available at ftp://gatekeeper.dec.com/pub/DEC/termcaps.
 #
+# In October 1995 DEC sold its terminals business, including the VT and Dorio
+# line and trademark, to SunRiver Data Systems.
+#
 
 vt52|dec vt52:\
 	:co#80:it#8:li#24:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
-	:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:do=\EB:\
+	:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:nd=\EC:\
+	:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
 
 # NOTE:  Any VT100 emulation, whether in hardware or software, almost
 # certainly includes what DEC called the `Level 1 editing extension' codes;
 # only the very oldest VT100s lacked these and there probably aren't any of
 # those left alive.  To capture these, use one of the VT102 entries.
 #
-# Note that the <xenl> glitch in vt100 is not quite the same as on the Concept,
+# Note that the :xn: glitch in vt100 is not quite the same as on the Concept,
 # since the cursor is left in a different position while in the
 # weird state (concept at beginning of next line, vt100 at end
 # of this line) so all versions of vi before 3.7 don't handle
-# <xenl> right on vt100. The correct way to handle <xenl> is when
+# :xn: right on vt100. The correct way to handle :xn: is when
 # you output the char in column 80, immediately output CR LF
-# and then assume you are in column 1 of the next line. If <xenl>
+# and then assume you are in column 1 of the next line. If :xn:
 # is on, am should be on too.
 # 
 # I assume you have smooth scroll off or are at a slow enough baud
@@ -1072,7 +994,7 @@ vt52|dec vt52:\
 # The padding requirements listed here are guesses. It is strongly
 # recommended that xon/xoff be enabled, as this is assumed here.
 # 
-# The vt100 uses <rs2> and <rf> rather than <is2>/<tbc>/<hts> because the 
+# The vt100 uses <rs2> and <rf> rather than :is:/:ct:/:st: because the 
 # tab settings are in non-volatile memory and don't need to be 
 # reset upon login. Also setting the number of columns glitches 
 # the screen annoyingly. You can type "reset" to get them set.
@@ -1117,25 +1039,23 @@ vt52|dec vt52:\
 # (and even then, whenever it can be arranged!) you should set
 #	INTERLACE_OFF
 #
-# (I added <rmam>/<smam> based on the init string -- esr)
+# (I added <rmam>/<smam> based on the init string, also :bs: -- esr)
 vt100|vt100-am|dec vt100 (w/advanced video):\
-	:am:ms:xn:xo:\
+	:am:bs:ms:xn:xo:\
 	:co#80:it#8:li#24:vt#3:\
-	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:\
-	:K5=\EOn:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
-	:UP=\E[%dA:\
+	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=^O:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:do=^J:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:\
-	:k8=\EOl:k9=\EOw:k;=\EOx:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:\
-	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:ae=^O:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:\
+	:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\
+	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
 	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
 vt100nam|vt100-nam|vt100 no automargins:\
 	:am@:xn@:tc=vt100-am:
 
@@ -1150,7 +1070,7 @@ vt100-w-nam|vt100-nam-w|dec vt100 132 cols (w/advanced video no automargin):\
 # vt100 with no advanced video.
 vt100-nav|vt100 without advanced video option:\
 	:sg#1:\
-	:mb@:md@:me@:mr@:sa@:se=\E[m:so=\E[7m:ue@:us@:tc=vt100:
+	:mb@:md@:me=:mr@:sa@:se=\E[m:so=\E[7m:ue@:us@:tc=vt100:
 vt100-nav-w|vt100-w-nav|dec vt100 132 cols 14 lines (no advanced video option):\
 	:co#132:li#14:tc=vt100-nav:
 
@@ -1160,8 +1080,9 @@ vt100-s|vt100-s-top|vt100-top-s|vt100 for use with top sysline:\
 	:es:hs:\
 	:li#23:\
 	:cl=\E[2;1H\E[J:cm=\E[%i%+^A;%dH:cs=\E[%i%i%d;%dr:\
-	:ds=\E7\E[1;24r\E8:fs=\E8:ho=\E[2;1H:\
-	:is=\E7\E[2;24r\E8:ts=\E7\E[1;%p1%dH\E[1K:tc=vt100-am:
+	:ds=\E7\E[1;24r\E8:fs=\E8:ho=\E[2;1H:is=\E7\E[2;24r\E8:\
+	:ts=\E7\E[1;%p1%dH\E[1K:\
+	:tc=vt100-am:
 
 # Status line at bottom. 
 # Clearing the screen will clobber status line.
@@ -1169,7 +1090,8 @@ vt100-s-bot|vt100-bot-s|vt100 for use with bottom sysline:\
 	:es:hs:\
 	:li#23:\
 	:ds=\E7\E[1;24r\E8:fs=\E8:is=\E[1;23r\E[23;1H:\
-	:ts=\E7\E[24;%p1%dH\E[1K:tc=vt100-am:
+	:ts=\E7\E[24;%p1%dH\E[1K:\
+	:tc=vt100-am:
 
 # Most of the `vt100' emulators out there actually emulate a vt102
 # This entry (or vt102-nsgr) is probably the right thing to use for
@@ -1182,7 +1104,7 @@ vt102-w|dec vt102 in wide mode:\
 	:r3=\E[?3h:tc=vt102:
 
 # Many brain-dead PC comm programs that pretend to be `vt100-compatible'
-# fail to interpret the ^O and ^N escapes properly.  Symptom: the <sgr0>
+# fail to interpret the ^O and ^N escapes properly.  Symptom: the :me:
 # string in the canonical vt100 entry above leaves the screen littered
 # with little  snowflake or star characters (IBM PC ROM character \017 = ^O)
 # after highlight turnoffs.  This entry should fix that, and even leave
@@ -1190,29 +1112,29 @@ vt102-w|dec vt102 in wide mode:\
 # slightly more expensive.
 # From: Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995
 vt102-nsgr|vt102 no sgr (use if you see snowflakes after highlight changes):\
-	:me=\E[m:sa@:tc=vt102:
+	:me=\E[m:sa@:\
+	:tc=vt102:
 
 # VT125 Graphics CRT.  Clear screen also erases graphics
 vt125|vt125 graphics terminal:\
 	:cl=\E[H\E[2J\EPpS(E)\E\\:tc=vt100:
 
 # This isn't a DEC entry, it came from University of Wisconsin.
-# (vt131: I added <rmam>/<smam> based on the init string -- esr)
+# (vt131: I added <rmam>/<smam> based on the init string, also :bs: -- esr)
 vt131|dec vt131:\
-	:am:xn:\
+	:am:bs:xn:\
 	:co#80:it#8:li#24:vt#3:\
 	:RA=\E[?7h:bl=^G:cd=50\E[J:ce=3\E[K:cl=50\E[;H\E[2J:\
 	:cm=5\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:do=^J:ho=\E[H:\
 	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
-	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:\
-	:me=2\E[m:mr=2\E[7m:nd=2\E[C:nw=^M^J:\
-	:r1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:sc=\E7:\
-	:se=2\E[m:so=2\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:\
-	:us=2\E[4m:
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:me=2\E[m:mr=2\E[7m:\
+	:nd=2\E[C:nw=^M^J:r1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:rc=\E8:sc=\E7:se=2\E[m:so=2\E[7m:sr=5\EM:ta=^I:ue=2\E[m:\
+	:up=2\E[A:us=2\E[4m:
 
 # vt132 - like vt100 but slower and has ins/del line and such.
-# I'm told that <smir>/<rmir> are backwards in the terminal from the
+# I'm told that :im:/:ei: are backwards in the terminal from the
 # manual and from the ANSI standard, this describes the actual 
 # terminal. I've never actually used a vt132 myself, so this 
 # is untested.
@@ -1230,18 +1152,18 @@ vt132|DEC vt132:\
 vt220|vt200|DEC VT220 in vt100 emulation mode:\
 	:am:mi:xn:xo:\
 	:co#80:li#24:vt#3:\
-	:@7=\E[4~:RA=\E[?7l:SA=\E[?7h:\
-	:ac=kkllmmjjnnwwqquuttvvxx:ae=\E(B:al=\E[L:as=\E(0:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=\E[B:\
-	:ei=\E[4l:ho=\E[H:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:@7=\E[4~:RA=\E[?7l:SA=\E[?7h:ac=kkllmmjjnnwwqquuttvvxx:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:if=/usr/share/tabset/vt100:im=\E[4h:\
 	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
 	:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:k9=\E[21~:\
 	:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:\
-	:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
 	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
-	:rf=/usr/lib/tabset/vt100:\
+	:rf=/usr/share/tabset/vt100:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
 	:sc=\E7:se=\E[27m:sf=20\ED:so=\E[7m:sr=14\EM:ta=^I:\
 	:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
@@ -1259,9 +1181,9 @@ vt220-w|vt200-w|DEC vt220 in wide mode:\
 #
 vt220d|DEC VT220 in vt100 mode with DEC function key labeling:\
 	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
-	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
-	:k5@:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
-	:k;=\E[21~:tc=vt220:
+	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:k5@:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
+	:tc=vt220:
 
 vt220-nam|v200-nam|VT220 in vt100 mode with no auto margins:\
 	:am@:\
@@ -1271,21 +1193,19 @@ vt220-nam|v200-nam|VT220 in vt100 mode with no auto margins:\
 # (sgr removed to fit entry within 1023 bytes)
 # (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
 vt220-8|dec vt220 8 bit terminal:\
-	:am:mi:ms:xn:xo:\
+	:am:bs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
-	:ec=\E[%dX:ei=\E[4l:ho=\E[H:if=/usr/share/tabset/vt100:\
-	:im=\E[4h:is=\E[?7h\E[>\E[?1h\E F\E[?4l:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
-	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:\
-	:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
-	:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:\
-	:vb=\E[?5h\E[?5l:
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
+	:ei=\E[4l:ho=\E[H:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:is=\E[?7h\E[>\E[?1h\E F\E[?4l:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
+	:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:
 
 # This was DEC's vt320.  Use the purpose-built one below instead 
 #vt320|DEC VT320 in vt100 emulation mode,
@@ -1306,10 +1226,11 @@ vt320nam|v320n|DEC VT320 in vt100 emul. mode with NO AUTO WRAP mode:\
 # Things that use <knxt> usually use tab anyways... and things that don't use
 # tab usually use <knxt> instead...
 # kprv is same as tab - Backtab is useless...
-# I left out <sgr> because of its RIDICULOUS complexity,
+# I left out :sa: because of its RIDICULOUS complexity,
 # and the resulting fact that it causes the termcap translation of the entry
 # to SMASH the 1k-barrier...
 # From: Adam Thompson <thompson@xanth.magic.mb.ca> Sept 10 1995
+# (vt320: uncommented :fs: --esr) 
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
 # (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
@@ -1318,32 +1239,34 @@ vt320|vt300|dec vt320 7 bit terminal:\
 	:co#80:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:as=\E(0:bl=^G:\
-	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
-	:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
+	:ei=\E[4l:fs=\E[0$}:ho=\E[H:im=\E[4h:\
 	:is=\E>\E[?3l\E[?4l\E[5?l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=\177:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ts=\E[1$}\E[H\E[K:ue=\E[m:up=\E[A:us=\E[4m:\
-	:ve=\E[?25h:vi=\E[?25l:
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=\177:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=\ED:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ts=\E[1$}\E[H\E[K:ue=\E[m:\
+	:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
 vt320-nam|vt300-nam|dec vt320 7 bit terminal with no am to make SAS happy:\
 	:am@:\
 	:is=\E>\E[?3l\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
-	:r2=\E>\E[?3l\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:tc=vt320:
+	:r2=\E>\E[?3l\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
+	:tc=vt320:
 # We have to init 132-col mode, not 80-col mode.
 vt320-w|vt300-w|dec vt320 wide 7 bit terminal:\
 	:co#132:ws#132:\
 	:is=\E>\E[?3h\E[?4l\E[5?l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
-	:r2=\E>\E[?3h\E[?4l\E[5?l\E[?7h\E[?8h\E[1;24r\E[24;1H:tc=vt320:
+	:r2=\E>\E[?3h\E[?4l\E[5?l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:tc=vt320:
 vt320-w-nam|vt300-w-nam|dec vt320 wide 7 bit terminal with no am:\
 	:am@:\
 	:is=\E>\E[?3h\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
-	:r2=\E>\E[?3h\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:tc=vt320-w:
+	:r2=\E>\E[?3h\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
+	:tc=vt320-w:
 
 # VT330 and VT340 -- These are ReGIS and SIXEL graphics terminals
 #   which are pretty much a superset of the VT320.  They have the
@@ -1370,18 +1293,18 @@ vt340|dec-vt340|vt330|dec-vt330|dec vt340 graphics terminal with 24 line page:\
 	:co#80:it#8:li#24:vt#3:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
 	:ae=^O:al=\E[L:as=^N:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:do=^J:ds=\E[2$~\r\E[1$}\E[K\E[$}:\
-	:ei=\E[4l:fs=\E[$}:ho=\E[H:im=\E[4h:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:\
+	:fs=\E[$}:ho=\E[H:im=\E[4h:\
 	:is=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l1=pf1:l2=pf2:\
-	:l3=pf3:l4=pf4:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:nw=^M\ED:r1=\E[?3l:rc=\E8:\
-	:rf=/usr/lib/tabset/vt100:sc=\E7:se=\E[27m:sf=\ED:\
-	:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l1=pf1:l2=pf2:l3=pf3:l4=pf4:\
+	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:\
+	:r1=\E[?3l:rc=\E8:rf=/usr/share/tabset/vt300:sc=\E7:\
+	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:us=\E[4m:\
 	:vb=200\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
 
@@ -1411,24 +1334,23 @@ vt400|vt400-24|dec-vt400|dec vt400 24x80 column autowrap:\
 	:co#80:it#8:li#24:vt#3:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
-	:ae=^O:al=\E[L:as=^N:cd=10\E[J:ce=4\E[K:\
-	:cl=10\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
-	:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:fs=\E[$}:\
-	:ho=\E[H:ic=\E[@:im=\E[4h:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[L:as=^N:cd=10\E[J:ce=4\E[K:cl=10\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:\
+	:fs=\E[$}:ho=\E[H:ic=\E[@:im=\E[4h:\
 	:is=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l1=pf1:l2=pf2:\
-	:l3=pf3:l4=pf4:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:nw=^M\ED:r1=\E<\E[?3l\E[!p\E[?7h:\
-	:rc=\E8:rf=/usr/lib/tabset/vt100:sc=\E7:se=\E[27m:\
-	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:us=\E[4m:\
-	:vb=200\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
-
-# (I removed <kf0>, it collided with <kf10>;
-# I also added <rmam>/<smam> based on the init string -- esr)
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l1=pf1:l2=pf2:l3=pf3:l4=pf4:\
+	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:\
+	:r1=\E<\E[?3l\E[!p\E[?7h:rc=\E8:\
+	:rf=/usr/share/tabset/vt300:sc=\E7:se=\E[27m:sf=\ED:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ts=\E[2$~\E[1$}\E[1;%dH:\
+	:ue=\E[24m:up=\E[A:us=\E[4m:vb=200\E[?5h\E[?5l:\
+	:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
+
+# (vt420: I removed :k0:, it collided with <kf10> -- esr)
 vt420|DEC VT420:\
 	:am:mi:xn:xo:\
 	:co#80:li#24:vt#3:\
@@ -1439,17 +1361,16 @@ vt420|DEC VT420:\
 	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
-	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt100:\
-	:im=\E[4h:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:\
-	:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:\
-	:k8=\E[20~:k9=\E[21~:k;=\E[29~:kD=\E[3~:kI=\E[2~:\
-	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:kl=\E[D:\
-	:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m:mr=\E[7m:nd=\E[C:r3=\E[?67h\E[64;1"p:rc=\E8:\
-	:rf=/usr/lib/tabset/vt100:\
+	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt300:\
+	:im=\E[4h:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:\
+	:k9=\E[21~:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:ke=\E>:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r3=\E[?67h\E[64;1"p:rc=\E8:rf=/usr/share/tabset/vt300:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
-	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
+	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 
 #
 #  DECUDK   
@@ -1461,19 +1382,18 @@ vt420|DEC VT420:\
 #               else value = key + 5;
 #
 vt420pc|DEC VT420 w/PC keyboard:\
-	:@7=\E[4~:F1=\E[23~:F2=\E[24~:F3=\E[11;2~:\
-	:F4=\E[12;2~:F5=\E[13;2~:F6=\E[14;2~:F7=\E[15;2~:\
-	:F8=\E[17;2~:F9=\E[18;2~:FA=\E[19;2~:FB=\E[20;2~:\
-	:FC=\E[21;2~:FD=\E[23;2~:FE=\E[24;2~:FF=\E[23~:\
-	:FG=\E[24~:FH=\E[25~:FI=\E[26~:FJ=\E[28~:FK=\E[29~:\
-	:FL=\E[31~:FM=\E[32~:FN=\E[33~:FO=\E[34~:FP=\E[35~:\
-	:FQ=\E[36~:FR=\E[23;2~:FS=\E[24;2~:FT=\E[25;2~:\
-	:FU=\E[26;2~:FV=\E[28;2~:FW=\E[29;2~:FX=\E[31;2~:\
-	:FY=\E[32;2~:FZ=\E[33;2~:Fa=\E[34;2~:Fb=\E[35;2~:\
-	:Fc=\E[36;2~:S6=USR_TERM\072vt420pcdos\072:k1=\E[11~:\
-	:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kD=\177:\
-	:kh=\E[H:\
+	:@7=\E[4~:F1=\E[23~:F2=\E[24~:F3=\E[11;2~:F4=\E[12;2~:\
+	:F5=\E[13;2~:F6=\E[14;2~:F7=\E[15;2~:F8=\E[17;2~:\
+	:F9=\E[18;2~:FA=\E[19;2~:FB=\E[20;2~:FC=\E[21;2~:\
+	:FD=\E[23;2~:FE=\E[24;2~:FF=\E[23~:FG=\E[24~:FH=\E[25~:\
+	:FI=\E[26~:FJ=\E[28~:FK=\E[29~:FL=\E[31~:FM=\E[32~:\
+	:FN=\E[33~:FO=\E[34~:FP=\E[35~:FQ=\E[36~:FR=\E[23;2~:\
+	:FS=\E[24;2~:FT=\E[25;2~:FU=\E[26;2~:FV=\E[28;2~:\
+	:FW=\E[29;2~:FX=\E[31;2~:FY=\E[32;2~:FZ=\E[33;2~:\
+	:Fa=\E[34;2~:Fb=\E[35;2~:Fc=\E[36;2~:\
+	:S6=USR_TERM\072vt420pcdos\072:k1=\E[11~:k2=\E[12~:\
+	:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:k;=\E[21~:kD=\177:kh=\E[H:\
 	:..px=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\:tc=vt420:
 
 vt420pcdos|DEC VT420 w/PC for DOS Merge:\
@@ -1481,14 +1401,16 @@ vt420pcdos|DEC VT420 w/PC for DOS Merge:\
 	:S1=%?%p2%{19}%=%t\E\023\021%e%p2%{32}%<%t\E%p2%c%e%p2%{127}%=%t\E\177%e%p2%c%;:\
 	:S4=\E[?1;2r\E[34h:\
 	:S5=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:S6@:\
-	:me=\E[m:sa@:tc=vt420pc:
+	:me=\E[m:sa@:\
+	:tc=vt420pc:
 
 vt420f|DEC VT420 with VT kbd; VT400 mode; F1-F5 used as Fkeys:\
 	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
 	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
 	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
 	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
-	:kD=\177:kh=\E[H:l1=\EOP:l2=\EOQ:l3=\EOR:l4=\EOS:tc=vt420:
+	:kD=\177:kh=\E[H:l1=\EOP:l2=\EOQ:l3=\EOR:l4=\EOS:\
+	:tc=vt420:
 
 vt510|DEC VT510:\
 	:tc=vt420:
@@ -1510,7 +1432,7 @@ vt510pcdos|DEC VT510 w/PC for DOS Merge:\
 # terminal mode is being used.  If Set-Up has been disabled or
 # assigned to an unknown key, Set-Up may be entered by pressing
 # [F3] as the first key after power up, regardless of keyboard type.
-# (I added <rmam>/<smam> based on the init string -- esr)
+# (vt520: I added <rmam>/<smam> based on the init string -- esr)
 vt520|DEC VT520:\
 	:am:mi:xn:xo:\
 	:co#80:li#24:vt#3:\
@@ -1521,20 +1443,20 @@ vt520|DEC VT520:\
 	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
-	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt100:\
-	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:\
-	:k7=\E[19~:k8=\E[20~:k9=\E[21~:k;=\E[29~:kD=\E[3~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:\
+	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt300:\
+	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:\
+	:k9=\E[21~:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
 	:..px=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\:\
-	:r3=\E[?67h\E[64;1"p:rc=\E8:rf=/usr/lib/tabset/vt100:\
+	:r3=\E[?67h\E[64;1"p:rc=\E8:rf=/usr/share/tabset/vt300:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
-	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
+	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 
-# (I added <rmam>/<smam> based on the init string -- esr)
+# (vt525: I added <rmam>/<smam> based on the init string;
+# removed :se:=\E[m, :ue:=\E[m, -- esr)
 vt525|DEC VT525:\
 	:am:mi:xn:xo:\
 	:co#80:li#24:vt#3:\
@@ -1545,18 +1467,17 @@ vt525|DEC VT525:\
 	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
-	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt100:\
-	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:\
-	:k7=\E[19~:k8=\E[20~:k9=\E[21~:k;=\E[29~:kD=\E[3~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:\
+	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt300:\
+	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:\
+	:k9=\E[21~:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
 	:..px=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\:\
-	:r3=\E[?67h\E[64;1"p:rc=\E8:rf=/usr/lib/tabset/vt100:\
+	:r3=\E[?67h\E[64;1"p:rc=\E8:rf=/usr/share/tabset/vt300:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
-	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
+	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 
 #### VT100 emulations
 #
@@ -1577,14 +1498,26 @@ dec-vt100|EWAN telnet's vt100 emulation:\
 z340|zstem vt340 terminal emulator 132col 42line:\
 	:li#42:\
 	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H:\
-	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H:tc=vt320-w:
+	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H:\
+	:tc=vt320-w:
 z340-nam|zstem vt340 terminal emulator 132col 42line:\
 	:am@:\
 	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H:\
-	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H:tc=z340:
+	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H:\
+	:tc=z340:
 
 #### X terminal emulators
 #
+# You can add the following line to your .Xdefaults to change the terminal type
+# set by the xterms you start up to my-xterm:
+#
+# *termName:  my-xterm
+#
+# System administrators can change the default entry for xterm instances
+# by adding a similar line to /usr/X11/lib/X11/app-defaults/XTerm.  In either
+# case, xterm will detect and reject an invalid terminal type, falling back
+# to the default of xterm.
+#
 
 # X10/6.6	11/7/86, minus alternate screen, plus (csr)
 # (xterm: ":MT:" changed to ":km:"; added <smam>/<rmam> based on init string;
@@ -1595,58 +1528,100 @@ x10term|vs100-x10|xterm terminal emulator (X10 window system):\
 	:co#80:it#8:li#65:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:RA=\E[?7l:SA=\E[?7h:\
 	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
-	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
-	:ho=\E[H:im=\E[4h:is=\E\E[m\E[?7h\E[?1;4l:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:\
-	:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
+	:im=\E[4h:is=\E\E[m\E[?7h\E[?1;4l:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:\
 	:rs=\E[r\E<\E[m\E[H\E[2J\E[?7h\E[?1;3;4;6l:se=\E[m:\
-	:sf=^J:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-# X11R6 xterm.  This is known good for the XFree86 version under Linux.
-# It is *way* more featureful than the stock X consortium entry.
-# The kmous key is actually the \E[M prefix returned by xterm's internal
-# mouse-tracking facility.  ncurses will interpret the following three bytes
-# of mouse status information.
-# From: Eric S. Raymond <esr@snark.thyrsus.com> 9 Nov 1995
+	:sf=^J:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+# This entry is designed for XFree86 version 3.1.2E.
+# It is *way* more featureful than the stock X consortium entry (has <acsc>,
+# for starters -- note that this only works for some fonts, including the
+# `fixed' series).  The <kmous> key is actually the \E[M prefix returned by
+# xterm's internal mouse-tracking facility; ncurses will interpret the
+# following three bytes of mouse status information.
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 14 Dec 1995
+# Updated: T.Dickey <dickey@clark.net> 12 May 1996, for XFree86 3.1.2E
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
 # (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
-xterm|vs100|xterm terminal emulator (X11R6 Window System):\
+xterm-color|xterm terminal emulator (XFree86 3.1.2E and above):\
 	:am:km:mi:ms:xn:xo:\
 	:co#80:it#8:li#65:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3k:dc=\E[P:dl=\E[M:do=^J:\
-	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:\
-	:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3k:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
+	:ho=\E[H:ic=\E[@:im=\E[4h:\
+	:is=\E[r\E[m\E[H\E[2J\E[?7h\E[?1;3;4;6l\E[4l:\
 	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kI=\E[2~:\
-	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kh=\E[@:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
-	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
-	:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\177:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\EOH:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:ta=^I:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+# Use this version if you have stock X consortium xterm, 
+# or an XFree86 xterm at version 3.1.2D or older.
+# Note that due to an array indexing error in the xterm code, even these
+# correct versions of <kend>/:kh: will probably fail in versions 
+# earlier than XFree86's 3.1.2C.
+xterm-x11r6|vs100-x11r6|xterm for XFree86 versions previous to 3.1.2E:\
+	:ut@:\
+	:Co@:pa@:\
+	:@7=\EOe:ch@:cv@:kh=\EO\200:op@:tc=xterm:
+
+# Here's another way to choose the xterm version for your stock xterm.
+# The xterm-color choice is unabashedly biased towards up-to-date free-UNIX
+# systems (Linux, netBSD, freeBSD) running XFree86 3.1.2E or later. If you
+# have an older version of xterm, you probably want to use use xterm-x11r6
+# instead.  If you need to use x10term you'll be all too painfully aware of it.
+xterm|vs100|xterm terminal emulator (X11R6 Window System):\
+	:tc=xterm-color:
+
+# These entries allow access to the X titlebar and icon name as a status line. 
+# Note that twm (and possibly window managers descended from it such as tvtwm, 
+# ctwm, and vtwm) track windows by icon-name; thus, you don't want to mess
+# with it.
+xterm-sl|access X title line and icon name:\
+	:hs:\
+	:ws#40:\
+	:ds=\E]0;\007:fs=^G:ts=\E]0;:
+xterm-sl-twm|access X title line (pacify twm-descended window managers):\
+	:hs:\
+	:ws#40:\
+	:ds=\E]2;\007:fs=^G:ts=\E]2;:
+
+#
+# The following xterm varients don't depend on your base version
+#
 xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold:\
-	:so=\E[1m:tc=xterm:
+	:so=\E[1m:\
+	:tc=xterm:
 xterms|vs100s|xterm terminal emulator (small screen 24x80):\
 	:co#80:li#24:tc=xterm:
 # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
+# (kterm should not invoke DEC Graphics as the alternate character set
+#  -- Kenji Rikitake)
 kterm|kterm kanji terminal emulator (X window system):\
 	:es:hs:\
-	:cs=\E[%i%d;%dr:ds=\E[?H:fs=\E[?F:rc=\E8:sc=\E7:\
-	:ts=\E[?E\E[?%i%dT:tc=xterm:
-
+	:cs=\E[%i%d;%dr:ds=\E[?H:eA=\E(B:fs=\E[?F:rc=\E8:sc=\E7:\
+	:ts=\E[?E\E[?%i%dT:\
+	:tc=xterm:
 # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
 xterm-nic|xterm with ich/ich1 suppressed for non-curses programs:\
-	:IC@:ei=:ic@:im=:tc=xterm:
-
-# From: Eric S. Raymond <esr@snark.thyrsus.com> May 4 1995
-# Should work with the color xterm on the X11R6 contrib tape.
-xterm-color|xterm with color support:\
-	:tc=xterm:tc=klone+color:
+	:IC@:ei=:ic@:im=:\
+	:tc=xterm:
+# From: Mark Sheppard <kimble@mistral.co.uk>, 4 May 1996 
+xterm1|xterm terminal emulator ignoring the alternate screen buffer:\
+	:te@:ti@:\
+	:tc=xterm:
+
+# Sigh...this ought to grok ecma+color, but it doesn't.
+# From: Thomas Dickey <dickey@clark.net> 13 Dec 1995
+rxvt|rxvt terminal emulator:\
+	:@7=\EOw:Km@:kh=\E[H:tc=xterm-x11r6:tc=klone+color:
 
 # From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
 # Here's a termcap entry I've been using for xterm_color, which comes
@@ -1654,55 +1629,73 @@ xterm-color|xterm with color support:\
 # color stuff, I also have a status line defined as the window manager
 # title bar. [I have translated it to terminfo -- ESR]
 xterm-pcolor|xterm with color used for highlights and status line:\
-	:hs:\
-	:ws#40:\
-	:ds=\E]0;\007:fs=^G:md=\E[1m\E[43m:mr=\E[7m\E[34m:\
-	:so=\E[7m\E[31m:ts=\E]0;:us=\E[4m\E[42m:tc=xterm:
+	:md=\E[1m\E[43m:mr=\E[7m\E[34m:so=\E[7m\E[31m:\
+	:us=\E[4m\E[42m:\
+	:tc=xterm-sl:tc=xterm:
 
 # HP ships this, except for the pb#9600 which was merged in from BSD termcap.
+# (hpterm: added empty <acsc>, we have no idea what ACS chars look like --esr)
 hpterm|X-hpterm|hp X11 terminal emulator:\
 	:am:da:db:mi:xs:\
 	:Nl#8:co#80:lh#2:li#24:lm#0:lw#8:pb#9600:sg#0:\
-	:LF=\E&j@:LO=\E&jB:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:\
-	:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\E&a0y0C\EJ:\
-	:cm=\E&a%dy%dC:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:\
-	:do=\EB:ei=\ER:im=\EQ:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:\
-	:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kA=\EL:kC=\EJ:kD=\EP:\
-	:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:kM=\ER:kN=\EU:\
-	:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:kd=\EB:\
-	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:\
-	:ku=\EA:le=^H:md=\E&dB:me=\E&d@:mh=\E&dH:ml=\El:\
-	:mr=\E&dB:mu=\Em:nd=\EC:..pk=\E&f%p1%dk%p2%l%dL%p2%s:\
+	:LF=\E&j@:LO=\E&jB:ac=:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:\
+	:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:\
+	:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:do=\EB:ei=\ER:im=\EQ:\
+	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\
+	:kA=\EL:kC=\EJ:kD=\EP:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:\
+	:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:\
+	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:\
+	:ku=\EA:le=^H:md=\E&dB:me=\E&d@:mh=\E&dH:ml=\El:mr=\E&dB:\
+	:mu=\Em:nd=\EC:..pk=\E&f%p1%dk%p2%l%dL%p2%s:\
 	:..pl=\E&f1a%p1%dk%p2%l%dL%p2%s:\
 	:..pn=\E&f%p1%dk%p2%l%dd0L%p2%s:\
 	:..px=\E&f2a%p1%dk%p2%l%dL%p2%s:\
 	:..sa=\E&d%?%p7%t%'s'%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+%p5%{8}%*%+%'@'%+%c%?%p9%t%'\016'%c%e%'\017'%c%;:\
-	:se=\E&d@:sf=^J:so=\E&dJ:sr=\ET:st=\E1:ta=^I:\
-	:ue=\E&d@:up=\EA:us=\E&dD:
+	:se=\E&d@:sf=^J:so=\E&dJ:sr=\ET:st=\E1:ta=^I:ue=\E&d@:\
+	:up=\EA:us=\E&dD:
+
+# This entry describes an xterm with Sun-style function keys enabled
+# via the X resource setting "xterm*sunFunctionKeys:true"
+# To understand <kf11>/<kf12> note that L1,L2 and F11,F12 are the same.
+# The <kf13>...<kf20> keys are L3-L10.  We don't set <kf16=\E[197z>
+# because we want it to be seen as <kcpy>. 
+# The <kf31>...<kf45> keys are R1-R15.  We treat some of these in accordance
+# with their Sun keyboard labels instead.
+# From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996
+xterm-sun|xterm with sunFunctionKeys true:\
+	:%1=\E[196z:&8=\E[195z:@0=\E[200z:@5=\E[197z:@7=\E[220z:\
+	:F1=\E[192z:F2=\E[193z:F3=\E[194z:F4=\E[195z:F5=\E[196z:\
+	:F7=\E[198z:F8=\E[199z:F9=\E[200z:FA=\E[201z:FL=\E[208z:\
+	:FM=\E[209z:FN=\E[210z:FO=\E[211z:FP=\E[212z:FQ=\E[213z:\
+	:FS=\E[215z:FU=\E[217z:FW=\E[219z:FY=\E[221z:K2=\E[218z:\
+	:k1=\E[224z:k2=\E[225z:k3=\E[226z:k4=\E[227z:k5=\E[228z:\
+	:k6=\E[229z:k7=\E[230z:k8=\E[231z:k9=\E[232z:k;=\E[233z:\
+	:kI=\E[2z:kN=\E[222z:kP=\E[216z:kh=\E[214z:\
+	:tc=xterm:
+xterms-sun|small (80x24) xterm with sunFunctionKeys true:\
+	:co#80:li#24:tc=xterm-sun:
 
 # This is for the extensible terminal emulator on the X11R6 contrib tape.
+# (emu: I changed <setab>/<setaf> to <setb>/<setf> -- esr)
 emu|emu native mode:\
 	:mi:ms:xo:\
 	:Co#15:co#80:it#8:li#24:pa#64:vt#200:\
-	:*6=\Esel:@0=\Efind:@8=^M:\
-	:AB=\Es%i%p1%d; setaf=\Er%i%p1%d;:AL=\EQ%d;:\
-	:DC=\EI%d;:DL=\ER%d;:DO=\Ep%d;:F1=\EF11:F2=\EF12:\
-	:F3=\EF13:F4=\EF14:F5=\EF15:F6=\EF16:F7=\EF17:\
-	:F8=\EF18:F9=\EF19:FA=\EF20:LE=\Eq-%d;:RI=\Eq%d;:\
-	:UP=\Ep-%d;:\
+	:*6=\Esel:@0=\Efind:@8=^M:AL=\EQ%d;:DC=\EI%d;:DL=\ER%d;:\
+	:DO=\Ep%d;:F1=\EF11:F2=\EF12:F3=\EF13:F4=\EF14:F5=\EF15:\
+	:F6=\EF16:F7=\EF17:F8=\EF18:F9=\EF19:FA=\EF20:LE=\Eq-%d;:\
+	:RI=\Eq%d;:Sb=\Es%i%d; setf=\Er%i%d;:UP=\Ep-%d;:\
 	:ac=a\202f\260g261j\213k\214l\215m\216n\217o\220q\222s\224t\225u\226v\227w\230x\231~\244:\
-	:ae=\200:al=\EQ1;:as=\200:bl=^G:cb=\EL:ce=\EK:\
-	:cl=\EP\EE0;0;:cm=\EE%d;%d;:cr=^M:cs=\Ek%d;%d;:\
-	:ct=\Ej:dc=\EI1;:dl=\ER1;:do=\EB:eA=\200:\
-	:ec=\Ej%d;\ned=\EN:ei=\EX:ho=\EE0;0;:if=\200:im=\EY:\
-	:is=\ES\Er0;\Es0;:k0=\EF00:k1=\EF01:k2=\EF02:\
-	:k3=\EF03:k4=\EF04:k5=\EF05:k6=\EF06:k7=\EF07:\
-	:k8=\EF08:k9=\EF09:k;=\EF10:kD=\177:kI=\Eins:\
-	:kN=\Enext:kP=\Eprior:kb=^H:kd=\EB:kl=\EC:kr=\ED:\
-	:ku=\EA:le=^H:mb=\ES\EW:md=\ES\EU:me=\ES:mr=\ES\ET:\
-	:nd=\ED:oc=\Es0;\Er0;:r2=\ES\Es0;\Er0;:se=\ES:sf=\EG:\
-	:so=\ES\ET:sr=\EF:st=\Eh:ta=^I:ue=\ES:up=\EA:\
-	:us=\ES\EV:ve=\Ea:vi=\EZ:vs=\Ea:
+	:ae=\200:al=\EQ1;:as=\200:bl=^G:cb=\EL:cd=\EN:ce=\EK:\
+	:cl=\EP\EE0;0;:cm=\EE%d;%d;:cr=^M:cs=\Ek%d;%d;:ct=\Ej:\
+	:dc=\EI1;:dl=\ER1;:do=\EB:eA=\200:ec=\Ej%d;:ei=\EX:\
+	:ho=\EE0;0;:im=\EY:is=\ES\Er0;\Es0;:k0=\EF00:k1=\EF01:\
+	:k2=\EF02:k3=\EF03:k4=\EF04:k5=\EF05:k6=\EF06:k7=\EF07:\
+	:k8=\EF08:k9=\EF09:k;=\EF10:kD=\177:kI=\Eins:kN=\Enext:\
+	:kP=\Eprior:kb=^H:kd=\EB:kl=\EC:kr=\ED:ku=\EA:le=^H:\
+	:mb=\ES\EW:md=\ES\EU:me=\ES:mr=\ES\ET:nd=\ED:\
+	:oc=\Es0;\Er0;:r2=\ES\Es0;\Er0;:se=\ES:sf=\EG:so=\ES\ET:\
+	:sr=\EF:st=\Eh:ta=^I:ue=\ES:up=\EA:us=\ES\EV:ve=\Ea:vi=\EZ:\
+	:vs=\Ea:
 
 ######## UNIX VIRTUAL TERMINALS AND VIRTUAL CONSOLES
 #
@@ -1713,10 +1706,10 @@ emu|emu native mode:\
 cbunix|cb unix virtual terminal:\
 	:am:da:db:\
 	:co#80:li#24:lm#0:\
-	:al=\EP:bl=^G:cd=\EL:ce=\EK:cl=\EL:cm=\EG%r%.%.:\
-	:cr=^M:dc=\EM:dl=\EN:do=^J:ei=:ic=\EO:im=:kd=\EB:\
-	:kh=\EE:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\Eb^D:\
-	:sf=^J:so=\Ea^D:ue=\Eb^A:up=\EA:us=\Ea^A:
+	:al=\EP:bl=^G:cd=\EL:ce=\EK:cl=\EL:cm=\EG%r%.%.:cr=^M:\
+	:dc=\EM:dl=\EN:do=^J:ei=:ic=\EO:im=:kd=\EB:kh=\EE:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\Eb^D:sf=^J:so=\Ea^D:\
+	:ue=\Eb^A:up=\EA:us=\Ea^A:
 # (vremote: removed obsolete ":nl@:" -- esr)
 vremote|virtual remote terminal:\
 	:am@:\
@@ -1724,41 +1717,55 @@ vremote|virtual remote terminal:\
 pty|4bsd pseudo teletype:\
 	:cm=\EG%+ %+ :se=\Eb$:so=\Ea$:ue=\Eb!:us=\Ea!:tc=cbunix:
 
+# The codes supported by the term.el terminal emulation in GNU Emacs 19.30 
+eterm|gnu emacs term.el terminal emulation:\
+	:am:mi:xn:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:cb=\E[1K:\
+	:cd=\\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
+	:im=\E[4h:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:se=\E[m:\
+	:sf=^J:so=\E[7m:ta=^I:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+
 # Entries for use by the FSF's `screen' program.  The screen and
-# screen-w came with version 3.6.2.  The screen2 and screen3 entries
+# screen-w entries came with version 3.7.1.  The screen2 and screen3 entries
 # come from University of Wisconsin and may be older.
 
 screen|VT 100/ANSI X3.64 virtual terminal:\
 	:am:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
+	:Co#8:co#80:it#8:li#24:pa#64:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[23~:\
 	:F2=\E[24~:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\054\054hhII00:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
-	:im=\E[4h:is=\E)0:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:eA=\E(B\E)0:ei=\E[4l:\
+	:ho=\E[H:im=\E[4h:is=\E)0:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
 	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
-	:k;=\E[21~:kD=\E[3~:kH=\E[4~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:r2=\Ec:\
-	:rc=\E8:sc=\E7:se=\E[23m:sf=^J:so=\E[3m:sr=\EM:\
-	:st=\EH:ta=^I:ue=\E[24m:up=\EM:us=\E[4m:
+	:k;=\E[21~:kD=\E[3~:kH=\E[4~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:r2=\Ec:rc=\E8:sc=\E7:se=\E[23m:\
+	:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\EM:\
+	:us=\E[4m:vb=\Eg:vi=\E[?25l:vs=\E[34l:\
+	:tc=ecma+color:
+
 screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\
 	:co#132:tc=screen:
 
 screen2|VT 100/ANSI X3.64 virtual terminal:\
 	:co#80:it#8:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bt=\E[Z:\
-	:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ic=:\
-	:im=\E[4h:k0=\E~:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:\
-	:k6=\EP:k7=\EQ:k8=\ER:k9=\E0I:kb=^H:kd=\EB:kh=\EH:\
-	:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\E[C:nw=^M^J:r1=\Ec:\
-	:rc=\E8:sc=\E7:se=\E[23m:sf=^J:so=\E[3m:sr=\EM:\
-	:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bt=\E[Z:cd=\E[J:\
+	:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ic=:im=\E[4h:k0=\E~:\
+	:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:\
+	:k9=\E0I:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:\
+	:me=\E[m:nd=\E[C:nw=^M^J:r1=\Ec:rc=\E8:sc=\E7:se=\E[23m:\
+	:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:
 # (screen3: removed unknown ":xv:LP:G0:" -- esr)
 screen3|VT 100/ANSI X3.64 virtual terminal:\
 	:km:mi:ms:\
@@ -1766,12 +1773,11 @@ screen3|VT 100/ANSI X3.64 virtual terminal:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:bt=\E[Z:\
 	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
-	:ei=\E[4l:ho=\E[H:im=\E[4h:is=\E)0:k1=\EOP:k2=\EOQ:\
-	:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:ke=\E>:kl=\EOD:\
-	:kr=\EOC:ks=\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:r1=\Ec:rc=\E8:\
-	:sc=\E7:se=\E[23m:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
+	:ho=\E[H:im=\E[4h:is=\E)0:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kb=^H:kd=\EOB:ke=\E>:kl=\EOD:kr=\EOC:ks=\E=:ku=\EOA:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:r1=\Ec:\
+	:rc=\E8:sc=\E7:se=\E[23m:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[24m:up=\EM:us=\E[4m:
 
 ######## WORKSTATION CONSOLES
@@ -1784,29 +1790,27 @@ screen3|VT 100/ANSI X3.64 virtual terminal:\
 oldsun|Sun Microsystems Workstation console:\
 	:am:km:mi:ms:\
 	:co#80:it#8:li#34:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:al=\E[L:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:cr=^M:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=:i1=\E[1r:ic=\E[@:im=:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[m:sf=^J:\
-	:so=\E[7m:ta=^I:up=\E[A:
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:al=\E[L:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:i1=\E[1r:ic=\E[@:im=:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
 # From: Alexander Lukyanov <lav@video.yars.free.net>, 14 Nov 1995
+# lines capability later corrected by J.T. Conklin <jtc@cygnus.com>
 sun|sun1|sun2|Sun Microsystems Inc. workstation console:\
 	:am:km:ms:\
-	:co#80:li#35:\
-	:%7=\E[194z:&5=\E[193z:&8=\E[195z:@7=\E[220z:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:F1=\E[234z:F2=\E[235z:\
-	:IC=\E[%d@:K2=\E[218z:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=^L:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:\
-	:ei=:ic=\E[@:im=:k1=\E[224z:k2=\E[225z:k3=\E[226z:\
-	:k4=\E[227z:k5=\E[228z:k6=\E[229z:k7=\E[230z:\
-	:k8=\E[231z:k9=\E[232z:k;=\E[233z:kD=\177:kN=\E[222z:\
-	:kP=\E[216z:kb=^H:kd=\E[B:kh=\E[214z:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:r2=\E[s:\
+	:co#80:li#34:\
+	:%7=\E[194z:&5=\E[193z:&8=\E[195z:@7=\E[220z:AL=\E[%dL:\
+	:DC=\E[%dP:DL=\E[%dM:F1=\E[234z:F2=\E[235z:IC=\E[%d@:\
+	:K2=\E[218z:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=^L:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:ic=\E[@:im=:\
+	:k1=\E[224z:k2=\E[225z:k3=\E[226z:k4=\E[227z:k5=\E[228z:\
+	:k6=\E[229z:k7=\E[230z:k8=\E[231z:k9=\E[232z:k;=\E[233z:\
+	:kD=\177:kN=\E[222z:kP=\E[216z:kb=^H:kd=\E[B:kh=\E[214z:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:r2=\E[s:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m:\
-	:se=\E[m:sf=^J:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
+	:se=\E[m:sf=^J:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 # From: <john@ucbrenoir>  Tue Sep 24 13:14:44 1985
 # (sun-s: I added lines#34 because the Lukyanov entry for sun has 35 -- esr)
 sun-s|Sun Microsystems Workstation window with status line:\
@@ -1831,9 +1835,11 @@ sun-1|Sun 1-line window for sysline:\
 	:co#80:li#1:\
 	:ds=^L:fs=\E[K:ts=^M:tc=sun:
 sun-e|sun-nic|sune|Sun Microsystems Workstation without insert character:\
-	:ei@:ic@:im@:tc=sun:
+	:ei@:ic@:im@:\
+	:tc=sun:
 sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history:\
-	:te=\E[>4h:ti=\E[>4l:tc=sun:
+	:te=\E[>4h:ti=\E[>4l:\
+	:tc=sun:
 
 #### Iris consoles
 #
@@ -1841,16 +1847,18 @@ sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history:\
 # (wsiris: this had extension capabilities
 #	:HS=\E7F2:HE=\E7F7:\
 #	:CT#2:CZ=*Bblack,red,green,yellow,blue,magenta,cyan,*Fwhite:
-# (wsiris: removed suboptimal <clear>=\EH\EJ:" -- esr)
+# See the note on Iris extensions near the end of this file.
+# Finally, removed suboptimal :cl:=\EH\EJ and added :do: & 
+# :vb: from BRL -- esr)
 wsiris|iris40|iris emulating a 40 line visual 50 (approximately):\
 	:am:\
 	:co#80:it#8:li#40:\
-	:al=\EL:cd=\EJ:ce=\EK:cl=\Ev:cm=\EY%+ %+ :dl=\EM:\
+	:al=\EL:cd=\EJ:ce=\EK:cl=\Ev:cm=\EY%+ %+ :dl=\EM:do=\EB:\
 	:ho=\EH:is=\E7B0\E7F7\E7C2\E7R3:k0=\E0:k1=\E1:k2=\E2:\
-	:k3=\E3:k4=\E4:k5=\E5:k6=\E6:k7=\E7:k8=\E8:k9=\E9:\
-	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E0@:\
-	:so=\E9P:sr=\EI:ta=^I:ue=\E7R3\E0@:up=\EA:\
-	:us=\E7R2\E9P:ve=\E>:vs=\E;:
+	:k3=\E3:k4=\E4:k5=\E5:k6=\E6:k7=\E7:k8=\E8:k9=\E9:kd=\EB:\
+	:kl=\ED:kr=\EC:ku=\EA:le=^H:mh=\E7F2:nd=\EC:se=\E0@:so=\E9P:\
+	:sr=\EI:ta=^I:ue=\E7R3\E0@:up=\EA:us=\E7R2\E9P:\
+	:vb=\E7F4\E7B1\013\E7F7\E7B0:ve=\E>:vs=\E;:
 
 #### NeWS consoles
 #
@@ -1866,10 +1874,10 @@ psterm|psterm-basic|NeWS psterm-80x34:\
 	:co#80:it#8:li#34:\
 	:al=\EA:cd=\EB:ce=\EC:cl=^L:cm=\E%d;%d;:cs=\EE%d;%d;:\
 	:dc=\EF:dl=\EK:do=\EP:ei=\ENi:fs=\ENl:ho=\ER:i1=\EN*:\
-	:im=\EOi:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\ET:\
-	:ll=\EU:mb=\EOb:md=\EOd:me=\EN*:mr=\EOr:nd=\EV:rc=^\:\
-	:sc=^]:se=\ENo:sf=\EW:so=\EOo:sr=\EX:ta=^I:te=\ENt:\
-	:ti=\EOt:ts=\EOl:ue=\ENu:up=\EY:us=\EOu:vb=\EZ:
+	:im=\EOi:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\ET:ll=\EU:\
+	:mb=\EOb:md=\EOd:me=\EN*:mr=\EOr:nd=\EV:rc=^\:sc=^]:se=\ENo:\
+	:sf=\EW:so=\EOo:sr=\EX:ta=^I:te=\ENt:ti=\EOt:ts=\EOl:\
+	:ue=\ENu:up=\EY:us=\EOu:vb=\EZ:
 psterm-96x48|NeWS psterm 96x48:\
 	:co#96:li#48:tc=psterm:
 psterm-90x28|NeWS psterm 90x28:\
@@ -1882,68 +1890,28 @@ psterm-80x24|NeWS psterm 80x24:\
 psterm-fast|NeWS psterm fast version (flaky ctrl chars):\
 	:am:bs:hs:km:ul:\
 	:co#80:it#8:li#34:\
-	:al=^A:cd=^B:ce=^C:cl=^L:cm=\004%d;%d;:cs=\005%d;%d;:\
-	:dc=^F:dl=^K:do=^P:ei=^Ni:fs=^Nl:ho=^R:i1=^N*:im=^Oi:\
-	:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^T:ll=^U:mb=^Ob:\
-	:md=^Od:me=^N*:mr=^Or:nd=^V:rc=^\:sc=^]:se=^No:sf=^W:\
-	:so=^Oo:sr=^X:ta=^I:te=^Nt:ti=^Ot:ts=^Ol:ue=^Nu:\
-	:up=^Y:us=^Ou:vb=^Z:
+	:al=^A:cd=^B:ce=^C:cl=^L:cm=\004%d;%d;:cs=\005%d;%d;:dc=^F:\
+	:dl=^K:do=^P:ei=^Ni:fs=^Nl:ho=^R:i1=^N*:im=^Oi:kd=\E[B:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^T:ll=^U:mb=^Ob:md=^Od:me=^N*:\
+	:mr=^Or:nd=^V:rc=^\:sc=^]:se=^No:sf=^W:so=^Oo:sr=^X:ta=^I:\
+	:te=^Nt:ti=^Ot:ts=^Ol:ue=^Nu:up=^Y:us=^Ou:vb=^Z:
 
-#### Apollo consoles
+#### NeXT Consoles
 #
-# Apollo got bought by Hewlett-Packard.  The Apollo workstations are 
-# labeled HP700s now.
-#
-
-# From: Gary Darland <goodmanc@garnet.berkeley.edu>
-apollo|apollo console:\
-	:am:mi:\
-	:co#88:li#53:\
-	:al=\EI:cd=\EJ:ce=\EK:ch=\EN%d:cl=^L:cm=\EM%+ %d):\
-	:cv=\EO+ :dc=\EP:dl=\EL:do=\EB:ei=\ER:im=\EQ:le=^H:\
-	:nd=\EC:se=\ET:sf=\EE:so=\ES:sr=\ED:te=\EX:ti=\EW:\
-	:ue=\EV:up=\EA:us=\EU:
-
-# We don't know whether or not the apollo guys replicated DEC's firmware bug
-# in the VT132 that reversed <rmir>/<smir>.  To be on the safe side, disable
-# both these capabilities.
-apollo_15P|apollo 15 inch display:\
-	:ei@:im@:tc=vt132:
-apollo_19L|apollo 19 inch display:\
-	:ei@:im@:tc=vt132:
-apollo_color|apollo color display:\
-	:ei@:im@:tc=vt132:
-
-#### Fortune Systems consoles
+# Use `glasstty' for the Workspace application
 #
 
-# From: Robert Nathanson <c160-3bp@Coral> via tut   Wed Oct 5, 1983
-# (This had extension capabilities
-#	:rv=\EH:re=\EI:rg=0:GG=0:\
-#	:CO=\E\\:WL=^Aa\r:WR=^Ab\r:CL=^Ac\r:CR=^Ad\r:DL=^Ae\r:RF=^Af\r:\
-#	:RC=^Ag\r:CW=^Ah\r:NU=^Aj\r:EN=^Ak\r:HM=^Al:PL=^Am\r:\
-#	:PU=^An\r:PD=^Ao\r:PR=^Ap\r:HP=^A@\r:RT=^Aq\r:TB=\r:CN=\177:MP=\E+F:
-# It had both ":bs:" and ":bs=^H:"; I removed the latter.  Also, it had
-# ":sg=0:" and ":ug=0:"; evidently the composer was trying (unnecessarily)
-# to force both magic cookie glitches off.  Once upon a time, I
-# used a Fortune myself, so I know the capabilities of the form ^A[a-z]\r are
-# function keys; thus the "Al" value for HM was certainly an error.  I renamed
-# EN/PD/PU/CO/CF/RT according to the XENIX/TC mappings, but not HM/DL/RF/RC.  
-# I think :rv: and :re: are start/end reverse video and :rg: is a nonexistent
-# "reverse-video-glitch" capability; I have put :rv: and :re: in with standard
-# names below.  I've removed obsolete ":nl=5^J:" as there is a :do: -- esr)
-fos|fortune|Fortune system:\
-	:am:bw:\
-	:co#80:li#25:\
-	:@7=^Ak\r:@8=^Aq:ac=l m"k(j*v%w#q&x-:ae=^O:al=\034E:\
-	:as=\Eo:bl=^G:cd=\034Y:ce=^\Z:cl=\014:cm=\034C%+ %+ :\
-	:cr=^M:dc=\034W:dl=\034R:do=\n:ei=:ho=\036:ic=\034Q:\
-	:im=:is=^_..:k1=^Aa\r:k2=^Ab\r:k3=^Ac\r:k4=^Ad\r:\
-	:k5=^Ae\r:k6=^Af\r:k7=^Ag\r:k8=^Ah\r:kN=^Ao\r:\
-	:kP=^An\r:kb=^H:kd=^Ay\r:kh=^A?\r:kl=^Aw\r:kr=^Az\r:\
-	:ku=^Ax\r:le=^H:mb=\EN:me=\EI:mr=\EH:nw=^M^J:se=^\I`:\
-	:sf=^J:so=^\H`:ta=^Z:ue=^\IP:up=\013:us=^\HP:ve=\E\\:\
-	:vi=\E]:vs=\E\072:
+# From: Dave Wetzel <dave@turbocat.snafu.de> 22 Dec 1995
+next|NeXT console:\
+	:am:xt:\
+	:co#80:it#8:li#24:\
+	:bl=^G:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:cr=^M:do=^J:ho=\E[H:\
+	:kb=^H:kd=^J:kl=^H:le=^H:me=\E[m:nd=\E[C:nw=^M^J:se=\E[4;1m:\
+	:sf=^J:so=\E[4;2m:ta=^I:up=\E[A:
+nextshell|NeXT Shell application:\
+	:am:\
+	:co#80:\
+	:bl=^G:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:ta=^I:
 
 ######## COMMON TERMINAL TYPES
 #
@@ -1952,6 +1920,10 @@ fos|fortune|Fortune system:\
 
 #### Altos
 #
+# Altos made a moderately successful line of UNIX boxes.  In 1990 they were
+# bought out by Acer, a major Taiwanese manufacturer of PC-clones.
+# Acer has a web site at http://www.acer.com.
+#
 # Altos descriptions from Ted Mittelstaedt <tedm@agora.rain.com> 4 Sep 1993
 # His comments suggest they were shipped with the system.
 #
@@ -1971,19 +1943,18 @@ fos|fortune|Fortune system:\
 # :sr: was given as a boolean-- esr)
 altos2|alt2|altos-2|altos II:\
 	:co#80:it#8:li#24:sg#0:\
-	:*5=^Am\r:*8=^An\r:DL=\E[M:FM=^A`\r:FN=^Aa\r:\
-	:FO=^Ab\r:FP=^Ac\r:FQ=^Ad\r:FR=^Ae\r:FS=^Af\r:\
-	:FT=^Ag\r:FU=^Ah\r:FV=^Ai\r:FW=^Aj\r:FX=^Ak\r:\
-	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:do=\E[1B:\
-	:ei=:ho=\E[H:ic=\E[@:if=/usr/share/tabset/vt100:\
-	:im=:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k0=^AI\r:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=^AJ\r:\
-	:kB=^AK\r:kC=^AL\r:kD=^AM\r:kE=^AN\r:kF=^AO\r:kb=^H:\
-	:kd=\E[B:kh=\E[f:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:nd=\E[1C:nw=^M^J:se=\E[m:sf=^J:so=\E[7m:ta=^I:\
-	:ue=\E[m:up=\E[1A:us=\E[4m:
+	:*5=^Am\r:*8=^An\r:DL=\E[M:FM=^A`\r:FN=^Aa\r:FO=^Ab\r:\
+	:FP=^Ac\r:FQ=^Ad\r:FR=^Ae\r:FS=^Af\r:FT=^Ag\r:FU=^Ah\r:\
+	:FV=^Ai\r:FW=^Aj\r:FX=^Ak\r:RA=\E[?7l:SA=\E[?7h:al=\E[L:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:dc=\E[P:do=\E[1B:ei=:ho=\E[H:ic=\E[@:\
+	:if=/usr/share/tabset/vt100:im=:\
+	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k0=^AI\r:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=^AJ\r:kB=^AK\r:kC=^AL\r:\
+	:kD=^AM\r:kE=^AN\r:kF=^AO\r:kb=^H:kd=\E[B:kh=\E[f:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[1C:nw=^M^J:se=\E[m:\
+	:sf=^J:so=\E[7m:ta=^I:ue=\E[m:up=\E[1A:us=\E[4m:
 # (altos3: had extension capabilities
 #	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
 #	:c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\
@@ -1993,7 +1964,8 @@ altos2|alt2|altos-2|altos II:\
 #	:HL=^AP\r:SP=\E[i:\
 #	:IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:\
 altos3|altos5|alt3|alt5|altos-3|altos-5|altos III or V:\
-	:mb=\E[5p:me=\E[p:sr=\EM:tc=altos2:
+	:mb=\E[5p:me=\E[p:sr=\EM:\
+	:tc=altos2:
 altos4|alt4|altos-4|altos IV:\
 	:tc=wy50:
 # (altos7: had extension capabilities:
@@ -2003,24 +1975,25 @@ altos4|alt4|altos-4|altos IV:\
 #	:c8=^Ah\r:c9=^Ai\r:cA=^Aj\r:cB=^Ak\r:\
 #	:cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r:
 # Comparison with the k* capabilities makes it obvious that the c* things are
-# shift keys.  I have renamed them to keys 32 and up accordingly -- esr)
+# shift keys.  I have renamed them to keys 32 and up accordingly.  I have
+# also masde this entry relative to adm12 in order to give it an :sa:. The
+# <invis> imported by use=adm+sgr may work, let me know. -- esr)
 altos7|alt7|altos VII:\
 	:am:mi:\
 	:co#80:li#24:sg#0:\
 	:*5=^Am\r:*8=^An\r:DL=\ER:FM=^A`\r:FN=^Aa\r:FO=^Ab\r:\
-	:FP=^Ac\r:FQ=^Ad\r:FR=^Ae\r:FS=^Af\r:FT=^Ag\r:\
-	:FU=^Ah\r:FV=^Ai\r:FW=^Aj\r:FX=^Ak\r:\
-	:ac=l2m1k3j5t4u9v=w0q\072x6n8\nblink=\EG2:al=\EE:\
-	:cd=\EY:ce=\ET:cl=\E+^^:cm=\E=%+ %+ :cr=^M:dc=\EW:\
-	:do=^J:ei=\Er:ho=^^:im=\Eq:\
-	:is=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Eu\E~2:k0=^AI\r:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=^AJ\r:\
-	:kB=^AK\r:kC=^AL\r:kD=^AM\r:kE=^AN\r:kF=^AO\r:kN=\EK:\
-	:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
-	:md=\EGt:me=\EG0:mh=\EGp:mk=\EG1:mr=\EG4:nd=^L:\
-	:nw=^M^J:pf=\EJ:po=\Ed#:se=\EG0:sf=^J:so=\EG4:sr=\Ej:\
-	:ta=^I:ue=\EG0:up=^K:us=\EG8:
+	:FP=^Ac\r:FQ=^Ad\r:FR=^Ae\r:FS=^Af\r:FT=^Ag\r:FU=^Ah\r:\
+	:FV=^Ai\r:FW=^Aj\r:FX=^Ak\r:\
+	:ac=l2m1k3j5t4u9v=w0q\072x6n8:al=\EE:cd=\EY:ce=\ET:\
+	:cl=\E+^^:cm=\E=%+ %+ :cr=^M:dc=\EW:do=^J:ei=\Er:ho=^^:\
+	:im=\Eq:is=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Eu\E~2:\
+	:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=^AJ\r:kB=^AK\r:\
+	:kC=^AL\r:kD=^AM\r:kE=^AN\r:kF=^AO\r:kN=\EK:kP=\EJ:kb=^H:\
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mb=\EG2:md=\EGt:mh=\EGp:\
+	:mk=\EG1:nd=^L:nw=^M^J:pf=\EJ:po=\Ed#:sf=^J:sr=\Ej:ta=^I:\
+	:up=^K:\
+	:tc=adm+sgr:
 altos7pc|alt7pc|altos PC VII:\
 	:@7=\ET:tc=altos7:
 
@@ -2038,50 +2011,47 @@ hpgeneric|hp|hewlett-packard generic terminal:\
 	:am:da:db:mi:xs:\
 	:co#80:li#24:lm#0:vt#6:\
 	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:\
-	:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:\
-	:dl=\EM:do=^J:ei=\ER:im=\EQ:kB=\Ei:kb=^H:le=^H:\
-	:nd=\EC:se=\E&d@:sf=^J:so=\E&dJ:st=\E1:ta=^I:\
-	:ue=\E&d@:up=\EA:us=\E&dD:
+	:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:\
+	:do=^J:ei=\ER:im=\EQ:kB=\Ei:kb=^H:le=^H:me=\E&d@:nd=\EC:\
+	:se=\E&d@:sf=^J:so=\E&dJ:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
+	:us=\E&dD:
 
 hp110|hewlett-packard model 110 portable:\
 	:li#16:tc=hpgeneric:
 
 hp+pfk+cr|hp function keys with CR:\
-	:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:\
-	:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:
+	:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:\
+	:k7=\Ev\r:k8=\Ew\r:
 
 hp+pfk-cr|hp function keys w/o CR:\
-	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:\
-	:k8=\Ew:
+	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:
 
 # The 2621s use the same keys for the arrows and function keys, 
 # but not separate escape sequences. These definitions allow the 
 # user to use those keys as arrow keys rather than as function 
 # keys.
 hp+pfk+arrows|hp alternate arrow definitions:\
-	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:kF=\Er\r:kH=\Eq\r:\
-	:kR=\Es\r:kd=\Ew\r:kh=\Ep\r:kl=\Eu\r:kr=\Ev\r:\
-	:ku=\Et\r:
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:kF=\Er\r:kH=\Eq\r:kR=\Es\r:\
+	:kd=\Ew\r:kh=\Ep\r:kl=\Eu\r:kr=\Ev\r:ku=\Et\r:
 
 hp+arrows|hp arrow definitions:\
-	:kF=\ES:kH=\EF:kR=\ET:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:\
-	:ku=\EA:
+	:kF=\ES:kH=\EF:kR=\ET:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:ku=\EA:
 
 # Generic stuff from the HP 262x series
 #
 hp262x|HP 262x terminals:\
 	:xs:\
-	:cd=\EJ:dc=\EP:ip=:kA=\EL:kD=\EP:kE=\EK:kF=\ES:\
-	:kI=\EQ:kL=\EM:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:\
-	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:\
-	:ku=\EA:mb=\E&dA:me=\E&d@:mk=\E&dS:mr=\E&dB:\
+	:cd=\EJ:dc=\EP:ip=:kA=\EL:kD=\EP:kE=\EK:kF=\ES:kI=\EQ:kL=\EM:\
+	:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:mb=\E&dA:me=\E&d@:mk=\E&dS:\
+	:mr=\E&dB:\
 	:..sa=\E&d%'@'%?%p1%t%'B'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%c:\
 	:se=\E&d@:sf=\ES:so=\E&dB:ta=\011:ue=\E&d@:us=\E&dD:
 
-# Note: no <home> on HP's since that homes to top of memory, not screen.
+# Note: no :ho: on HP's since that homes to top of memory, not screen.
 # Due to severe 2621 braindamage, the only way to get the arrow keys to
 # transmit anything at all is to turn on the function key labels
-# with <smkx>, and even then the user has to hold down shift!
+# with :ks:, and even then the user has to hold down shift!
 # The default 2621 turns off the labels except when it has to to 
 # enable the function keys. If your installation prefers labels 
 # on all the time, or off all the time (at the "expense" of the 
@@ -2095,19 +2065,22 @@ hp262x|HP 262x terminals:\
 # sequence, we don't use it in the default.
 # If you like, you can use 2621-ba (brain-damaged arrow keys).
 hp2621-ba|2621-ba|2621 w/new rom and strap A set:\
-	:ke@:ks@:tc=hp+arrows:tc=hp2621:
+	:ke@:ks@:\
+	:tc=hp+arrows:tc=hp2621:
 
 # hp2621 with function labels. Most of the time they are off,
 # but inside vi, the function key labels appear. You have to
 # hold down shift to get them to xmit.
 hp2621|hp2621a|hp2621A|2621|2621a|2621A|hp2621-wl|2621-wl|hp 2621 w/labels:\
-	:is=\E&jA\r:ke=\E&jA:tc=hp2621-fl:
+	:is=\E&jA\r:ke=\E&jA:\
+	:tc=hp2621-fl:
 hp2621-fl|2621-fl|hp 2621:\
 	:xo:xs@:\
 	:pb#19200:\
-	:bt=\Ei:cm=\E&a%r%dc%dY:dc=\EP:ip=:is=\E&j@\r:\
-	:ke=\E&j@:ks=\E&jB:me=\E&d@:se=\E&d@:so=\E&dD:\
-	:ta=\011:ue=\E&d@:us=\E&dD:tc=hp+pfk+cr:tc=hpgeneric:
+	:bt=\Ei:cm=\E&a%r%dc%dY:dc=\EP:ip=:is=\E&j@\r:ke=\E&j@:\
+	:ks=\E&jB:me=\E&d@:se=\E&d@:so=\E&dD:ta=\011:ue=\E&d@:\
+	:us=\E&dD:\
+	:tc=hp+pfk+cr:tc=hpgeneric:
 
 # To use 2621p printer, setenv TERM=2621p, PRINTER=2612p
 hp2621p|2621p|2621P|hp 2621 with printer:\
@@ -2118,8 +2091,9 @@ hp2621p-a|2621p-a|hp2621p with fn as arrows:\
 
 # hp2621 with k45 keyboard
 hp2621-k45|hp2621k45|2621k45|k45|hp 2621 with 45 keyboard:\
-	:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
-	:ks=\E&s1A:ku=\EA:tc=hp2621:
+	:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:\
+	:ku=\EA:\
+	:tc=hp2621:
 
 # 2621 using all 48 lines of memory, only 24 visible at any time.  
 hp2621-48|48 line 2621:\
@@ -2152,17 +2126,17 @@ hp2621-nt|hp 2621 w/no tabs:\
 # 	XmitFnctn(A)=No
 # 	InhEolWrp=No
 # 
-# Note: the 2624 DOES have a true <home>, believe it or not!
+# Note: the 2624 DOES have a true :ho:, believe it or not!
 # 
 # The 2624 has an "error line" to which messages can be sent. 
 # This is CLOSE to what is expected for a "status line". However,
 # after a message is sent to the "error line", the next carriage 
 # return is EATEN and the "error line" is turned back off again! 
-# So I guess we can't define <hs>, <eslok>, <wsl>, <dsl>, <fsl>, <tsl>.
+# So I guess we can't define :hs:, :es:, :ws:, :ds:, :fs:, :ts:.
 # 
 # This entry supports emacs (and any other program that uses raw 
 # mode) at 4800 baud and less. I couldn't get the padding right 
-# for 9.6.
+# for 9600.
 #
 # (hp2624: replaced NUL sequences in flash with mandatory pauses -- esr)
 hp2624|hp2624a|hp2624b|hp2624b-4p|2624-4p|2624|2624a|2624b|Hewlett Packard 2624 B:\
@@ -2207,11 +2181,12 @@ hp2626-s|2626-s|hp 2626 using only 23 lines:\
 	:es:hs:\
 	:li#23:\
 	:fs=\E&d@\E&w7f2p1I\E&w4f1I:\
-	:i1=\E&q3t0{0H \E&w0f115n1I \E&w0f1n2I\n\E&w2f1i0d0u22l0S \E&w2f2i0d23u23l0S \E&w7f2p1I \r:\
-	:ts=\E&w7f2p2I\E&w4f2I\r\EK\E&a%p1%dC:tc=hp2626:
+	:i1=\E&q3t0{0H \E&w0f115n1I \E&w0f1n2I \E&w2f1i0d0u22l0S \E&w2f2i0d23u23l0S \E&w7f2p1I \r:\
+	:ts=\E&w7f2p2I\E&w4f2I\r\EK\E&a%p1%dC:\
+	:tc=hp2626:
 # Force terminal back to 24 lines after being 23.
 hp2626-ns|2626-ns|hp 2626 using all 24 lines:\
-	:i1=\E&q3t0{0H \E&w0f118n1I \E&w0f1n2I\n\E&w2f1i0d0u23l0S \E&w3f2I \E&w7f2p1I \r:tc=hp2626:
+	:i1=\E&q3t0{0H \E&w0f118n1I \E&w0f1n2I \E&w2f1i0d0u23l0S \E&w3f2I \E&w7f2p1I \r:tc=hp2626:
 # Various entries useful for small windows on 2626.
 hp2626-12|2626-12|hewlett-packard 2626 12 lines:\
 	:li#12:tc=hp2626:
@@ -2228,17 +2203,20 @@ hp2626-12-s|2626-12-s|hewlett-packard 2626 11 lines plus status:\
 hp2627a-rev|hp 2627 with reverse video colors:\
 	:cr=^M:do=^J:\
 	:is=\E&v0m1a0b0c1x1y1z1i0a0b1c1x1y1z0i0S\E&j@\r\E3\r:\
-	:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:\
-	:ue=\E&v0S\E&d@:us=\E&dD\E&v1S:tc=hp2621-nl:
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:ue=\E&v0S\E&d@:\
+	:us=\E&dD\E&v1S:\
+	:tc=hp2621-nl:
 hp2627a|2627|hp 2627 color terminal with no labels:\
 	:cr=^M:do=^J:\
 	:is=\E&v0m1a1b0c1i0a1b1c2i1a0b0c0i0S\E&j@\r\E3\r:\
-	:kb=^H:kd=^J:kl=^H:nw=^M^J:se=\E&v0S:sf=^J:so=\E&v2S:\
-	:ta=^I:ue=\E&v0S\E&d@:us=\E&dD\E&v1S:tc=hp2621-nl:
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:se=\E&v0S:sf=^J:so=\E&v2S:ta=^I:\
+	:ue=\E&v0S\E&d@:us=\E&dD\E&v1S:\
+	:tc=hp2621-nl:
 hp2627c|hp 2627 color (cyan) terminal with no labels:\
 	:cr=^M:do=^J:\
 	:is=\E&v0m1a0b0c2i1a1b0c1i0a1b1c0i0S\E&j@\r\E3\r:\
-	:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=hp2627a:
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:\
+	:tc=hp2627a:
 
 # 2640a doesn't have the Y cursor addressing feature, and C is 
 # memory relative instead of screen relative, as we need.
@@ -2255,15 +2233,17 @@ hp2640b|hp2644a|hp 264x series:\
 # software to support it.
 hp2645|hp45|HP 2645 series:\
 	:pb#9600:\
-	:cr=\r:kA=\EL:kD=\EP:kE=\EK:kF=\ES:kI=\EQ:kL=\EM:\
-	:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:kd=\EB:\
-	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:\
-	:ku=\EA:mb=\E&dA:me=\E&d@:mh=\E&dH:mr=\E&dB:\
+	:cr=\r:kA=\EL:kD=\EP:kE=\EK:kF=\ES:kI=\EQ:kL=\EM:kM=\ER:\
+	:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:ku=\EA:mb=\E&dA:me=\E&d@:\
+	:mh=\E&dH:mr=\E&dB:\
 	:..sa=\E&d%'@'%?%p1%t%'B'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%?%p5%t%'H'%|%;%?%p6%t%'B'%|%;%c:\
-	:us=\E&dD:tc=hpgeneric:
+	:us=\E&dD:\
+	:tc=hpgeneric:
 # You should use this terminal at 4800 baud or less.
 hp2648|hp2648a|2648a|2648A|2648|HP 2648a graphics terminal:\
-	:cl=\EH\EJ:cm=\E&a%r%dc%dY:dc=\EP:ip=:tc=hp2645:
+	:cl=\EH\EJ:cm=\E&a%r%dc%dY:dc=\EP:ip=:\
+	:tc=hp2645:
 
 # The HP 150 terminal is a fairly vanilla HP terminal, with the 
 # clreol standout problem. It also has graphics capabilities and 
@@ -2279,7 +2259,8 @@ hp2382a|hp2382|hewlett packard 2382a:\
 	:lh#1:lm#48:\
 	:ac@:ae@:as@:me=\E&d@:\
 	:..pn=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t %;%p2%s:\
-	:..sa=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga%+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+%Pa%;%?%p7%t%?%ga%ts%ga%'@'%+%e%'S'%;%e%?%ga%t%ga%'@'%+%e%'@'%;%;%c:tc=hp+labels:tc=scrhp:
+	:..sa=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga%+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+%Pa%;%?%p7%t%?%ga%ts%ga%'@'%+%e%'S'%;%e%?%ga%t%ga%'@'%+%e%'@'%;%;%c:\
+	:tc=hp+labels:tc=scrhp:
 
 hp2621-a|hp2621a-a|2621-a|hp2621 with fn as arrows:\
 	:tc=hp+pfk+arrows:tc=hp2621-fl:
@@ -2287,25 +2268,26 @@ hp2621-a|hp2621a-a|2621-a|hp2621 with fn as arrows:\
 # newer hewlett packard terminals
 
 newhpkeyboard|generic entry for HP extended keyboard:\
-	:kA=\EL:kB=\Ei:kC=\EJ:kD=\EP:kE=\EK:kF=\ET:kH=\EF:\
-	:kI=\EQ:kL=\EM:kM=\ER:kN=\EU:kP=\EV:kR=\ES:kS=\EJ:\
-	:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
-	:ks=\E&s1A:ku=\EA:tc=hp+pfk-cr:
+	:kA=\EL:kB=\Ei:kC=\EJ:kD=\EP:kE=\EK:kF=\ET:kH=\EF:kI=\EQ:\
+	:kL=\EM:kM=\ER:kN=\EU:kP=\EV:kR=\ES:kS=\EJ:kb=^H:kd=\EB:\
+	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:\
+	:tc=hp+pfk-cr:
 
 newhp|generic entry for new hewlett packard terminals:\
 	:am:bw:mi:xo:xs:\
 	:co#80:li#24:pb#4800:\
 	:ac=T1R!U2S"W3O#V4P$t5u6w7v8\072'9(LQKWlRkT5I3@2[MAJSmFjGdHQ;Y+Z*X\0724>q\\\054x.n/:\
-	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:cr=^M:\
-	:ct=\E3:dc=\EP:dl=\EM:do=^J:ei=\ER:i1=\E&jB:im=\EQ:\
-	:ip=:le=^H:mb=\E&dA:md=\E&dF:me=\E&d@\017:mh=\E&dH:\
-	:mk=\E&dS:mr=\E&dB:nd=\EC:nw=^M^J:\
+	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:cr=^M:ct=\E3:\
+	:dc=\EP:dl=\EM:do=^J:ei=\ER:i1=\E&jB:im=\EQ:ip=:le=^H:\
+	:mb=\E&dA:md=\E&dF:me=\E&d@\017:mh=\E&dH:mk=\E&dS:\
+	:mr=\E&dB:nd=\EC:nw=^M^J:\
 	:..pk=\E&f0a%p1%dk0d%p2%l%dL%p2%s:\
 	:..pl=\E&f1a%p1%dk0d%p2%l%dL%p2%s:\
 	:..px=\E&f2a%p1%dk0d%p2%l%dL%p2%s:r1=\Eg:\
 	:..sa=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga%+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+%Pa%;%?%p7%t%?%ga%ts%ga%'@'%+%e%'S'%;%e%?%ga%t%ga%'@'%+%e%'@'%;%;%c%?%p9%t\016%e\017%;:\
-	:se=\E&d@:sf=^J:so=\E&dJ:sr=\ET:st=\E1:ta=\011:\
-	:ue=\E&d@:up=\EA:us=\E&dD:tc=newhpkeyboard:
+	:se=\E&d@:sf=^J:so=\E&dJ:sr=\ET:st=\E1:ta=\011:ue=\E&d@:\
+	:up=\EA:us=\E&dD:\
+	:tc=newhpkeyboard:
 
 memhp|memory relative addressing for new HP ttys:\
 	:vt#6:\
@@ -2316,11 +2298,12 @@ memhp|memory relative addressing for new HP ttys:\
 scrhp|screen relative addressing for new HP ttys:\
 	:CM=\E&a%p1%dr%p2%dC:DO=\E&a+%dR:LE=\E&a-%dC:\
 	:RI=\E&a+%dC:UP=\E&a-%dR:ch=\E&a%dC:cl=\E&a0c0Y\EJ:\
-	:cm=\E&a%dy%dC:cv=\E&a%dY:ho=\E&a0y0C:ll=\E&a0y0C\EA:tc=newhp:
+	:cm=\E&a%dy%dC:cv=\E&a%dY:ho=\E&a0y0C:ll=\E&a0y0C\EA:\
+	:tc=newhp:
 
 hp+labels|"standard" label info for new HP ttys:\
 	:Nl#8:lh#2:lw#8:\
-	:LO=\E&jB:\
+	:LF=\E&j@:LO=\E&jB:\
 	:..pn=\E&f2a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t %;%p2%s:
 
 hp+printer|"standard" printer info for HP ttys:\
@@ -2333,8 +2316,8 @@ hp+printer|"standard" printer info for HP ttys:\
 # length label, the following character is eaten!
 hp2621b|2621b|hp 2621b with old style keyboard:\
 	:Nl#8:lh#1:lm#48:lw#8:\
-	:LO=\E&jB:kF=\ET:kH=\EF:kR=\ES:kd=\EB:kh=\Eh:kl=\ED:\
-	:kr=\EC:ku=\EA:\
+	:LO=\E&jB:kF=\ET:kH=\EF:kR=\ES:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:\
+	:ku=\EA:\
 	:..pn=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d3L%?%ga%!%t%{32}%c%;%p2%s\E%'o'%p1%+%c\r:tc=hp2621:
 
 hp2621b-p|2621b-p|hp 2621b with printer:\
@@ -2388,9 +2371,10 @@ hp+color|hp with colors:\
 	:oc=\E&v0m1a1b1c0I\E&v1a1I\E&v1b2I\E&v1a1b3I\E&v1c4I\E&v1a1c5I\E&v1b1c6I\E&v1x1y7I:\
 	:op=\E&v0S:sp=\E&v%dS:
 
-# <is2> sets the screen to be 80 columns wide
+# :is: sets the screen to be 80 columns wide
 hp2397a|2397a|hp2397|2397|hewlett packard 2397A color terminal:\
-	:is=\E&w6f80X:tc=memhp:tc=hp+labels:tc=hp+color:
+	:is=\E&w6f80X:\
+	:tc=memhp:tc=hp+labels:tc=hp+color:
 
 #  HP 700/44 Setup parameters:  
 # Terminal Mode		HP-PCterm
@@ -2402,43 +2386,41 @@ hp2397a|2397a|hp2397|2397|hewlett packard 2397A color terminal:\
 # Keycode Mode 		NO   or YES (sc)
 # Backspace Key		BS or BS/DEL
 #
-# <is2> 	sets pcterm; autowrap; 25 lines; pc char set; prog DEL key; 
+# :is: 	sets pcterm; autowrap; 25 lines; pc char set; prog DEL key; 
 # \E\\? does not turn off keycode mode
 # <smsc>	sets alternate start/stop; keycode on
 hpansi|hp700|hewlett packard 700/44 in HP-PCterm mode:\
 	:am:eo:xn:xo:\
 	:co#80:li#25:\
 	:@7=\E[4~:RA=\E[?7l:S4=\E[>11h\EPO**x0/65;1/67\E\\:\
-	:S5=\E[>11l\EP1**x0/11;1/13\E[m\E\\:SA=\E[?7h:XF=g:\
-	:XN=e:\
+	:S5=\E[>11l\EP1**x0/11;1/13\E[m\E\\:SA=\E[?7h:XF=g:XN=e:\
 	:ac=k\277l\332m\300j\331n\305w\302q\304u\264t\303v\301x\263:\
 	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
-	:ho=\E[H:ic=\E[@:im=:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:ic=\E[@:im=:\
 	:is=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\\:\
 	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
 	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[26~:k;=\E[28~:\
-	:kB=\E[Z:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[1~:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:nd=\E[C:se=\E[m:\
-	:sf=^J:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
-	:ve=\E[?25h:vi=\E[?25l:
+	:kB=\E[Z:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[1~:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:me=\E[m:nd=\E[C:se=\E[m:sf=^J:\
+	:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:vi=\E[?25l:
 #
 hp2392|2392|2393|239x series:\
 	:co#80:\
-	:bt=\Ei:cm=\E&a%dy%dC:cv=\E&a%dY:im=\EQ:k1=\Ep\r:\
-	:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:\
-	:k7=\Ev\r:k8=\Ew\r:kF=\EU:kN=\Eu:kP=\Ev:kR=\EV:\
-	:kh=\Eh:ue=\E&d@:us=\E&dD:tc=hpsub:
+	:bt=\Ei:cm=\E&a%dy%dC:cv=\E&a%dY:im=\EQ:k1=\Ep\r:k2=\Eq\r:\
+	:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:\
+	:kF=\EU:kN=\Eu:kP=\Ev:kR=\EV:kh=\Eh:ue=\E&d@:us=\E&dD:\
+	:tc=hpsub:
 
 hpsub|hp terminals -- capability subset:\
 	:am:da:db:mi:xo:xs:\
 	:li#24:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:\
-	:cr=^M:dc=\EP:dl=\EM:do=\EB:ei=\ER:\
-	:if=/usr/share/tabset/stdcrt:is=\E&s1A\E<\E&k0\\:kb=^H:\
-	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:\
-	:ku=\EA:le=^H:nd=\EC:se=\E&d@:sf=^J:so=\E&dB:ta=^I:\
-	:up=\EA:
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:cr=^M:\
+	:dc=\EP:dl=\EM:do=\EB:ei=\ER:if=/usr/share/tabset/stdcrt:\
+	:is=\E&s1A\E<\E&k0\\:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:\
+	:kr=\EC:ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:se=\E&d@:\
+	:sf=^J:so=\E&dB:ta=^I:up=\EA:
 
 # hpex:
 #	May be used for most 24 x 80 hp terminals,
@@ -2450,17 +2432,17 @@ hpsub|hp terminals -- capability subset:\
 #
 # (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:" -- esr)
 hpex|hp extended capabilites:\
-	:cm=\E&a%dy%dC:cr=^M:cv=\E&a%dY:do=^J:im=\EQ:kb=^H:\
-	:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:ue=\E&d@:us=\E&dD:tc=hpsub:
+	:cm=\E&a%dy%dC:cr=^M:cv=\E&a%dY:do=^J:im=\EQ:kb=^H:kd=^J:\
+	:kl=^H:nw=^M^J:sf=^J:ta=^I:ue=\E&d@:us=\E&dD:\
+	:tc=hpsub:
 
 # HP 236 console
 # From: <ddavis@ic.berkeley.edu>
 hp236|hp236 internal terminal emulator:\
 	:am:\
 	:co#80:li#24:\
-	:al=\EG:ce=\EK:cl=\EF:cm=\EE%+ %+ :dc=\EJ:dl=\EH:ei=:\
-	:ic=\EI:im=:le=^H:se=\ECI:so=\EBI:up=^K:ve=\EDE:\
-	:vs=\EDB:
+	:al=\EG:ce=\EK:cl=\EF:cm=\EE%+ %+ :dc=\EJ:dl=\EH:ei=:ic=\EI:\
+	:im=:le=^H:me=\ECI:se=\ECI:so=\EBI:up=^K:ve=\EDE:vs=\EDB:
 
 # This works on a hp300 console running Utah 4.3 BSD
 # From: Craig Leres <leres@okeeffe.berkeley.edu>
@@ -2468,89 +2450,86 @@ hp300h|HP Catseye console:\
 	:am:da:db:mi:xs:\
 	:co#128:li#51:lm#0:sg#0:\
 	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\
-	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:\
-	:cv=\E&a%dY:dc=\EP:dl=\EM:do=\EB:ei=\ER:\
-	:if=/usr/share/tabset/stdcrt:im=\EQ:kb=^H:kd=\EB:\
-	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:\
-	:le=^H:me=\E&d@:nd=\EC:se=\E&d@:sf=^J:so=\E&dB:ta=^I:\
-	:ue=\E&d@:up=\EA:us=\E&dD:
+	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:cv=\E&a%dY:\
+	:dc=\EP:dl=\EM:do=\EB:ei=\ER:if=/usr/share/tabset/stdcrt:\
+	:im=\EQ:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
+	:ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:se=\E&d@:sf=^J:\
+	:so=\E&dB:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
 # From: Greg Couch <gregc@ernie.berkeley.edu>
 hp9837|hp98720|hp98721|HP 9000/300 workstations:\
 	:am:da:db:mi:xs:\
 	:co#128:it#8:li#46:lm#0:\
 	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\
-	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:ct=\E3:cv=\E&a%dY:\
-	:dc=\EP:dl=\EM:do=\EB:ei=\ER:im=\EQ:is=\E&v0m1b0i&j@:\
-	:kA=\EL:kD=\EP:kE=\EK:kI=\EQ:kL=\EM:kN=\EU:kP=\EV:\
-	:kS=\EJ:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
-	:ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:se=\E&v0S:\
-	:sf=^J:so=\E&v5S:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
-	:us=\E&dD:
+	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:ct=\E3:cv=\E&a%dY:dc=\EP:\
+	:dl=\EM:do=\EB:ei=\ER:im=\EQ:is=\E&v0m1b0i&j@:kA=\EL:\
+	:kD=\EP:kE=\EK:kI=\EQ:kL=\EM:kN=\EU:kP=\EV:kS=\EJ:kb=^H:\
+	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:\
+	:le=^H:me=\E&d@:nd=\EC:se=\E&v0S:sf=^J:so=\E&v5S:st=\E1:\
+	:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
 # From: Charles A. Finnell of MITRE <finnell@mitre.org>, developed 07SEP90
+# (hp98550: replaced /usr/share/tabset/9837 with std because :it#8:,:st=\E1:;
+# added empty <acsc> to avoid warnings re :as:/:ae: --esr)
 hp98550|hp98550a|HP 9000 Series 300 color console:\
 	:am:da:db:mi:xs:\
 	:co#128:it#8:li#49:lm#0:\
-	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:\
+	:ac=:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:\
 	:ch=\E&a%dC:cl=\EH\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:\
 	:cv=\E&a%dY:dc=\EP:dl=\EM:do=^J:ei=\ER:\
-	:if=/usr/share/tabset/9837:im=\EQ:k1=\Ep:k2=\Eq:\
-	:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kA=\EL:\
-	:kC=\EJ:kD=\EP:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:\
-	:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:\
-	:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
-	:ks=\E&s1A:kt=\E2:ku=\EA:le=^H:mb=\E&dA:md=\E&dJ:\
-	:me=\E&d@:mh=\E&dH:mk=\E&ds:mr=\E&dJ:nd=\EC:se=\E&d@:\
-	:sf=^J:so=\E&dJ:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
+	:if=/usr/share/tabset/std:im=\EQ:k1=\Ep:k2=\Eq:k3=\Er:\
+	:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kA=\EL:kC=\EJ:kD=\EP:\
+	:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:kM=\ER:kN=\EU:kP=\EV:\
+	:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:ku=\EA:le=^H:mb=\E&dA:\
+	:md=\E&dJ:me=\E&d@:mh=\E&dH:mk=\E&ds:mr=\E&dJ:nd=\EC:\
+	:se=\E&d@:sf=^J:so=\E&dJ:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
 	:us=\E&dD:ve=\E*dQ:vi=\E*dR:
 # From: Victor Duchovni <vic@fine.princeton.edu>
-# (hp700-wy: removed obsolete ":nl=^J:" -- esr)
+# (hp700-wy: removed obsolete ":nl=^J:";
+# replaced /usr/share/tabset/hp700-wy with std because :it#8:,:st=\E1: -- esr)
 hp700-wy|HP700/41 emulating wyse30:\
 	:am:bw:mi:ms:\
 	:co#80:it#8:li#24:sg#1:ug#1:\
-	:al=0.7*\EE:bt=\EI:cd=\EY:ce=10\ET:cl=^Z:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E0:cv=\E[%+ :dc=\EW:dl=\ER:\
-	:do=^V:ei=\Er:ho=^^:i1=\E~"\EC\Er\E(\EG0\003\E`9\E`1:\
-	:if=/usr/share/tabset/hp700-wy:im=\Eq:kB=\EI:kC=^Z:\
-	:kE=\ET:kI=\Eq:kM=\Er:kS=\EY:kT=\EI:kb=\177:kd=^V:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:nd=^L:\
-	:se=10\EG0:so=10\EG4:sr=\Ej:ta=\011\nhts=\E1:\
-	:ue=10\EG0:up=^K:us=10\EG8:
+	:al=0.7*\EE:bt=\EI:cd=\EY:ce=10\ET:cl=^Z:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E0:cv=\E[%+ :dc=\EW:dl=\ER:do=^V:ei=\Er:ho=^^:\
+	:i1=\E~"\EC\Er\E(\EG0\003\E`9\E`1:\
+	:if=/usr/share/tabset/stdcrt:im=\Eq:kB=\EI:kC=^Z:kE=\ET:\
+	:kI=\Eq:kM=\Er:kS=\EY:kT=\EI:kb=\177:kd=^V:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:ll=^^^K:me=10\EG0:nd=^L:se=10\EG0:so=10\EG4:\
+	:sr=\Ej:st=\E1:ta=^I:ue=10\EG0:up=^K:us=10\EG8:
+# (hp70092: added empty <acsc> to avoid warnings re :as:/:ae: --esr)
 hp70092|70092a|70092A|hp70092a|hp70092A|HP 700/92:\
 	:am:da:db:xs:\
 	:Nl#8:co#80:lh#2:li#24:lm#0:lw#8:\
-	:LF=\E&j@:LO=\E&jB:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:\
-	:ce=\EK:ch=\E&a%dC:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:\
-	:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:do=\EB:ei=\ER:\
-	:im=\EQ:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:\
-	:k7=\Ev:k8=\Ew:kA=\EL:kC=\EJ:kD=\EP:kE=\EK:kF=\ES:\
-	:kH=\EF:kI=\EQ:kL=\EM:kM=\ER:kN=\EU:kP=\EV:kR=\ET:\
-	:kS=\EJ:kT=\E1:ka=\E3:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:\
-	:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:ku=\EA:le=^H:\
-	:mb=\E&dA:md=\E&dB:me=\E&d@:mh=\E&dH:mr=\E&dB:nd=\EC:\
-	:se=\E&d@:so=\E&dJ:sr=\ET:st=\E1:ta=^I:ue=\E&d@:\
+	:LF=\E&j@:LO=\E&jB:ac=:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:\
+	:ce=\EK:ch=\E&a%dC:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:\
+	:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:do=\EB:ei=\ER:im=\EQ:\
+	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\
+	:kA=\EL:kC=\EJ:kD=\EP:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:\
+	:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:\
+	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:\
+	:ku=\EA:le=^H:mb=\E&dA:md=\E&dB:me=\E&d@:mh=\E&dH:mr=\E&dB:\
+	:nd=\EC:se=\E&d@:so=\E&dJ:sr=\ET:st=\E1:ta=^I:ue=\E&d@:\
 	:up=\EA:us=\E&dD:
 
 bobcat|sbobcat|HP 9000 model 300 console:\
 	:am:da:db:mi:xs:\
 	:co#128:it#8:li#47:sg#0:\
-	:al=10*\EL:bt=\Ei:cd=\EJ:ce=\EK:ch=6\E&a%dC:\
-	:cl=\EH\EJ:cm=6\E&a%dy%dC:cr=^M:cv=6\E&a%dY:dc=\EP:\
-	:dl=10*\EM:do=\EB:ei=\ER:im=\EQ:kb=^H:kd=\EB:\
-	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:\
-	:le=^H:nd=\EC:nw=^M^J:se=\E&d@:sf=^J:so=\E&dB:ta=^I:\
-	:ue=\E&d@:up=\EA:us=\E&dD:
+	:al=10*\EL:bt=\Ei:cd=\EJ:ce=\EK:ch=6\E&a%dC:cl=\EH\EJ:\
+	:cm=6\E&a%dy%dC:cr=^M:cv=6\E&a%dY:dc=\EP:dl=10*\EM:do=\EB:\
+	:ei=\ER:im=\EQ:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
+	:ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:nw=^M^J:se=\E&d@:\
+	:sf=^J:so=\E&dB:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
 gator-t|HP 9000 model 237 emulating extra-tall AAA:\
 	:li#94:tc=gator:
 gator|HP 9000 model 237 emulating AAA:\
 	:bw:km:mi:ul:\
 	:co#128:it#8:li#47:\
-	:AL=1*\E[%dL:DC=4\E[%dP:DL=1*\E[%dM:IC=4\E[%d@:\
-	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
-	:do=^J:ei=:ho=\E[H:ic=\E[@:im=:kb=^H:kd=^J:kl=^H:\
-	:le=^H:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:\
-	:rp=1*%.\E[%db:se=\E[m:so=\E[7m:ta=^I:ue=\E[m:up=\EM:\
-	:us=\E[4m:
+	:AL=1*\E[%dL:DC=4\E[%dP:DL=1*\E[%dM:IC=4\E[%d@:al=\E[L:\
+	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:ho=\E[H:\
+	:ic=\E[@:im=:kb=^H:kd=^J:kl=^H:le=^H:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=^M^J:rp=1*%.\E[%db:se=\E[m:so=\E[7m:ta=^I:\
+	:ue=\E[m:up=\EM:us=\E[4m:
 gator-52|HP 9000 model 237 emulating VT52:\
 	:co#128:li#47:tc=vt52:
 gator-52t|HP 9000 model 237 emulating extra-tall VT52:\
@@ -2567,14 +2546,15 @@ gator-52t|HP 9000 model 237 emulating extra-tall VT52:\
 # "keyboard locked" LED.
 dku7003-dumb|Honeywell Bull DKU 7003 dumb mode:\
 	:co#80:li#25:\
-	:cd=^_:ce=\E[K:cl=^]^_:cm=\E[%i%d;%dH:cr=^M:do=^K:\
-	:ho=^]:kb=^H:kd=^K:kh=^]:kl=^Y:kr=^X:ku=^Z:le=^Y:\
-	:nd=^X:nw=^M^J:sf=^J:ta=^I:up=^Z:vb=\E[2h\E[2l:
+	:cd=^_:ce=\E[K:cl=^]^_:cm=\E[%i%d;%dH:cr=^M:do=^K:ho=^]:\
+	:kb=^H:kd=^K:kh=^]:kl=^Y:kr=^X:ku=^Z:le=^Y:nd=^X:nw=^M^J:\
+	:sf=^J:ta=^I:up=^Z:vb=\E[2h\E[2l:
 dku7003|Honeywell Bull DKU 7003 all features described:\
 	:ms:\
 	:sg#1:ug#1:\
 	:mb=\E[5m:md=\E[7m:me=\E[m:mh=\E[2m:mr=\E[7m:se=\E[m:\
-	:so=\E[7m:ue=\E[m:us=\E[4m:tc=dku7003-dumb:
+	:so=\E[7m:ue=\E[m:us=\E[4m:\
+	:tc=dku7003-dumb:
 
 #### Lear-Siegler (adm)
 #
@@ -2595,15 +2575,14 @@ dku7003|Honeywell Bull DKU 7003 all features described:\
 adm1a|adm1|lsi adm1a:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cl=\E;:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:le=^H:\
-	:nd=^L:sf=^J:up=^K:
+	:bl=^G:cl=\E;:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:le=^H:nd=^L:\
+	:sf=^J:up=^K:
 adm2|lsi adm2:\
 	:am:\
 	:co#80:li#24:\
-	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :\
-	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:\
-	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:\
-	:up=^K:
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:kd=^J:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:up=^K:
 # (adm3: removed obsolete ":ma=^K^P:" -- esr)
 adm3|lsi adm3:\
 	:am:\
@@ -2624,63 +2603,77 @@ adm3|lsi adm3:\
 adm3a|lsi adm3a:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cl=\032:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:le=^H:\
-	:nd=^L:sf=^J:up=^K:
+	:bl=^G:cl=\032:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:le=^H:nd=^L:\
+	:sf=^J:up=^K:
 adm3a+|adm3a plus:\
 	:kd=^J:kl=^H:kr=^L:ku=^K:tc=adm3a:
 # (adm5: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" & duplicate ":do=^J:" -- esr)
 adm5|lsi adm5:\
 	:sg#1:\
-	:bl=^G:cd=\EY:ce=\ET:cr=^M:do=^J:kb=^H:kh=^^:se=\EG:\
-	:so=\EG:tc=adm3a+:
-# From: <stephen%comp.lancs.ac.uk@ucl-cs.arpa>
-# (adm11: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" -- esr)
-adm11|lsi adm11:\
+	:bl=^G:cd=\EY:ce=\ET:cr=^M:do=^J:kb=^H:kh=^^:se=\EG:so=\EG:tc=adm3a+:
+# A lot of terminals other than adm12s use these.  Wherever you see
+# use=adm+sgr with some of its capabilities disabled, try the
+# disabled ones.  They may well work but not have been documented or
+# expressed in the using entry.  We'd like to cook up an :sa: but the
+# :ae:/:as: sequences of the using entries vary too much.
+adm+sgr|adm style highlight capabilities:\
+	:me=\EG0:mk=\EG1:mr=\EG4:se=\EG0:so=\EG4:ue=\EG0:us=\EG8:
+# LSI ADM-11 from George William Hartwig, Jr. <geo@BRL-TGR.ARPA> via BRL
+# Status line additions from Stephen J. Muir <stephen%comp.lancs.ac.uk@ucl-cs>
+# :kh: from <stephen%comp.lancs.ac.uk@ucl-cs.arpa>.  :cl: could also
+# be ^Z, according to his entry.
+# (adm11: :us:=\EG4 was obviously erroneous because it also said
+# :mr:=\EG4.  Looking at other ADMs confirms this -- esr)
+adm11|LSI ADM-11:\
 	:am:hs:\
 	:co#80:li#24:\
-	:bl=^G:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:do=^J:\
-	:ds=\Eh:fs=\E(\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:le=^H:nd=^L:se=\E(:so=\E):ts=\EF\E):up=^K:
+	:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:do=^J:ds=\Eh:\
+	:fs=\E(\r:ho=^^:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:kb=^H:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:mb=\EG2:nd=^L:nw=^M^J:ta=^I:\
+	:ts=\EF\E):up=^K:\
+	:tc=adm+sgr:
 # From: Andrew Scott Beals <bandy@lll-crg.ARPA>
 # Corrected by Olaf Siebert <rhialto@polder.ubc.kun.nl>, 11 May 1995
-# (adm12: removed obsolete ":kn:ma=j^Jk^P^K^Pl ^R^L^L :" -- esr)
+# (adm12: removed obsolete ":kn:ma=j^Jk^P^K^Pl ^R^L^L :".  This formerly had
+# :is:=\Eq but that looked wrong; this :is: is from Dave Yost <esquire!yost>
+# -- esr)
 adm12|lsi adm12:\
 	:am:mi:\
 	:co#80:li#24:\
-	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
-	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:is=\Eq:\
-	:k0=^A0\r:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:\
-	:k5=^A5\r:k6=^A6\r:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^J:\
-	:kl=^H:kr=^L:ku=^K:le=^H:mk=\EG1:nd=^L:se=\EG0:\
-	:so=\EG4:ue=\EG0:up=^K:us=\EG8:
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:dc=\EW:\
+	:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:\
+	:is=\E0        \E1        \E1        \E1        \E1        \E1        \E1        \E1        \E1:\
+	:k0=^A0\r:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:k5=^A5\r:\
+	:k6=^A6\r:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^J:kl=^H:kr=^L:\
+	:ku=^K:le=^H:nd=^L:up=^K:\
+	:tc=adm+sgr:
 # (adm20: removed obsolete ":kn#7:" -- esr)
 adm20|lear siegler adm20:\
 	:am:\
 	:co#80:it#8:li#24:\
 	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:\
-	:cm=\E=%i%r%+^_%+^_:cr=^M:dc=\EW:dl=\ER:ei=:ho=^^:\
-	:ic=\EQ:im=:k1=^A:k2=^B:k3=^W:k4=^D:k5=^E:k6=^X:\
-	:k7=^Z:le=^H:nd=^L:se=\E(:so=\E):ta=^I:up=^K:
+	:cm=\E=%i%r%+^_%+^_:cr=^M:dc=\EW:dl=\ER:ei=:ho=^^:ic=\EQ:\
+	:im=:k1=^A:k2=^B:k3=^W:k4=^D:k5=^E:k6=^X:k7=^Z:le=^H:me=\E(:\
+	:nd=^L:se=\E(:so=\E):ta=^I:up=^K:
 adm21|lear siegler adm21:\
-	:sg#1:ug#1:\
-	:al=30*\EE:bl=^G:cd=\EY:ce=\ET:cr=^M:dc=\EW:\
-	:dl=30*\ER:do=^J:ei=:ic=\EQ:im=:kb=^H:kd=^J:kh=^^:\
-	:kl=^H:kr=^L:ku=^K:se=\EG0:sf=^J:so=\EG4:ue=\EG0:\
-	:us=\EG8:tc=adm3a:
+	:sg#1:\
+	:al=30*\EE:bl=^G:cd=\EY:ce=\ET:cr=^M:dc=\EW:dl=30*\ER:do=^J:\
+	:ei=:ic=\EQ:im=:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:mk@:sf=^J:\
+	:tc=adm+sgr:tc=adm3a:
 # (adm22: ":em=:" was an obvious typo for ":ei=:"; also,
 # removed obsolete ":kn#7:ma=j^Jk^P^K^Pl ^R^L^L :";
-# removed bogus-looking \200 from before <cup>. -- esr)
+# removed bogus-looking \200 from before :cm:. -- esr)
 adm22|lsi adm22:\
 	:am:\
 	:co#80:li#24:\
-	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E+:\
-	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:\
-	:ic=\EQ:im=:\
+	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:\
 	:is=\E%\014\014\014\016\003\200\003\002\003\002\200\200\200\200\200\200\200\200\200\200\200:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:\
-	:ku=^K:l1=F1:l2=F2:l3=F3:l4=F4:l5=F5:l6=F6:l7=F7:\
-	:le=^H:nd=^L:se=\E(:so=\E):ta=\Ei:up=^K:
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:l1=F1:l2=F2:\
+	:l3=F3:l4=F4:l5=F5:l6=F6:l7=F7:le=^H:me=\E(:nd=^L:se=\E(:\
+	:so=\E):ta=\Ei:up=^K:
 # ADM 31 DIP Switches
 #
 # This information comes from two versions of the manual for the
@@ -2819,42 +2812,43 @@ adm22|lsi adm22:\
 #
 # On some older ADM 31s, S4 does not exist, and S5-sw6 is not defined.
 #
+# This adm31 entry uses underline as the standout mode.
 # If the adm31 gives you trouble with standout mode, check the DIP switch in
 # position 6, bank @c11, 25% from back end of the circuit board.  Should be
 # OFF.  If there is no such switch, you have an old adm31 and must use oadm31.
 # (adm31: removed obsolete ":ma=j^Jk^P^K^Pl ^R^L^L :" -- esr)
-adm31|lsi adm31:\
+adm31|lsi adm31 with sw6 set for underline mode:\
 	:am:mi:\
 	:co#80:li#24:\
-	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :\
-	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:\
-	:is=\Eu\E0:k0=^A0\r:k1=^A1\r:k2=^A2\r:k3=^A3\r:\
-	:k4=^A4\r:k5=^A5\r:k6=^A6\r:k7=^A7\r:k8=^A8\r:\
-	:k9=^A9\r:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
-	:se=\EG0:sf=^J:so=\EG1:ue=\EG0:up=^K:us=\EG1:
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:is=\Eu\E0:k0=^A0\r:\
+	:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:k5=^A5\r:k6=^A6\r:\
+	:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:\
+	:me=\EG0:nd=^L:se=\EG0:sf=^J:so=\EG1:ue=\EG0:up=^K:us=\EG1:
 adm31-old|o31|old adm31:\
 	:so=\EG4:ue@:us@:tc=adm31:
 # ADM36 in native mode (not VT52 emulation mode)
 # Hmmm...this looks a lot like an incomplete and slightly botched description
 # of a vt100 emulator.  Might be worth trying vt100 on this type and seeing
 # if it flies.  Assuming there are any of these left alive... 
-# (adm36: I added <rmam>/<smam> based on the initialization string -- esr)
+# (adm36: I added <rmam>/<smam> based on the initialization string;
+# also added :me:=\E[m -- esr)
 adm36|lsi adm36:\
 	:am:mi:\
 	:co#80:li#24:\
 	:RA=\E[?7l:SA=\E[?7h:al=\E[1L:cd=\E[0J:ce=\E[0K:\
-	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dl=\E[1M:ei=\E[4l:\
-	:im=\E[4h:is=\E[6;?7h\E[4;20;?1;?3;?6;?4l\E(B\E)B\E>:\
-	:kd=\EB:kl=\ED:kr=\EC:ku=\E[A:le=^H:nd=\E[D:up=\E[A:
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dl=\E[1M:ei=\E[4l:im=\E[4h:\
+	:is=\E[6;?7h\E[4;20;?1;?3;?6;?4l\E(B\E)B\E>:kd=\EB:\
+	:kl=\ED:kr=\EC:ku=\E[A:le=^H:me=\E[m:nd=\E[D:up=\E[A:
 # (adm42: removed obsolete ":ma=^K^P:" -- esr)
 adm42|lsi adm42:\
 	:am:\
 	:co#80:li#24:\
-	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E;:\
-	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:\
-	:im=\Eq:ip=:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
-	:nd=^L:pc=\177:se=\EG0:sf=^J:so=\EG4:ta=^I:up=^K:\
-	:vs=\EC\E3 \E3(:
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:im=\Eq:ip=:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:mk@:nd=^L:pc=\177:sf=^J:ta=^I:ue@:\
+	:up=^K:us@:vs=\EC\E3 \E3(:\
+	:tc=adm+sgr:
 # The following termcap for the Lear Siegler ADM-42 leaves the 
 # "system line" at the bottom of the screen blank (for those who 
 # find it distracting otherwise)
@@ -2863,31 +2857,44 @@ adm42-ns|lsi adm-42 with no system line:\
 	:ce=\ET\EF \011:cl=\E;\EF \011:cm=\E=%+ %+ \EF \011:\
 	:dc=\EW\EF \011:dl=\ER\EF \011:ei=\Er\EF \011:\
 	:im=\Eq\EF \011:tc=adm42:
+# ADM 1178 terminal -- rather like an ADM-42.  Manual is dated March 1 1985.
+# The insert mode of this terminal is commented out because it's broken for our
+# purposes in that it will shift the position of every character on the page,
+# not just the cursor line!
+# From: Michael Driscoll <fenris@lightspeed.net> 10 July 1996
+adm1178|1178|lsi adm1178:\
+	:am:\
+	:co#80:li#24:sg#1:ug#1:\
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^J:ho=^^:ip=6*:kb=^H:kd=^J:kl=^H:\
+	:le=^H:md=\E(:me=\E):mr=\EG4:nd=^L:nw=^M^J:pc=\177:se=\EG0:\
+	:sf=^J:so=\EG4:ta=^I:ue=\EG0:up=^K:us=\EG1:vs=\EC\E3 \E3(:
 
 #### Prime
 #
 # Yes, Prime makes terminals.  These entries were posted by Kevin J. Cummings
 # <cummings@primerd.Prime.COM> on 14 Dec 1992 and lightly edited by esr.
+#
 
+# Standout mode is dim reverse-video.
 pt100|pt200|wren|fenix|prime pt100/pt200:\
 	:am:bw:mi:ms:\
 	:co#80:it#8:li#24:\
 	:DC=\E[%dP:DL=\E[M:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
-	:UP=\E[%dA:al=\E[L\E[t:bt=\E[Z:cd=\E[J\E[r:\
-	:ce=\E[K\E[t:cl=\E?:cm=\E0%+!%+!:cr=^M:dc=\E[P:\
-	:do=\ED:ei=\E[4l:ho=\E$B:im=\E[4h:kb=^H:kd=\E[B:\
-	:ke=\E[>13l:kh=\E$A:kl=\E[D:kr=\E[C:ks=\E[>13h:\
-	:ku=\E[A:le=^H:nd=\E[C:nw=^M^J:se=\E[m:sf=^J:\
-	:so=\E[2;7m:ta=^I:\
+	:UP=\E[%dA:al=\E[L\E[t:bt=\E[Z:cd=\E[J\E[r:ce=\E[K\E[t:\
+	:cl=\E?:cm=\E0%+!%+!:cr=^M:dc=\E[P:do=\ED:ei=\E[4l:ho=\E$B:\
+	:im=\E[4h:kb=^H:kd=\E[B:ke=\E[>13l:kh=\E$A:kl=\E[D:kr=\E[C:\
+	:ks=\E[>13h:ku=\E[A:le=^H:me=\E[m:mh=\E[2m:nd=\E[C:nw=^M^J:\
+	:se=\E[m:sf=^J:so=\E[2;7m:ta=^I:\
 	:ti=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12l\E[1Q:\
 	:ue=\E[m:up=\EM:us=\E[4m:vb=\E$\E$P:
 pt100w|pt200w|wrenw|fenixw|prime pt100/pt200 in 132-column mode:\
 	:co#132:\
 	:cm=\E[%i%d;%dH:tc=pt100:
 pt250|Prime PT250:\
-	:so@:tc=pt100:
+	:se@:so@:tc=pt100:
 pt250w|Prime PT250 in 132-column mode:\
-	:so@:tc=pt100w:
+	:se@:so@:tc=pt100w:
 
 #### Qume (qvt)
 #
@@ -2921,27 +2928,25 @@ pt250w|Prime PT250 in 132-column mode:\
 # There are some ancient printing Qume terminals under `Daisy Wheel Printers'
 
 qvt101|qvt108|qume qvt 101 and QVT 108:\
-	:sg#1:\
-	:se=\EG0:so=\EG4:tc=qvt101+:
+	:sg#1:tc=qvt101+:
 
-# This used to have <cvvis>=\E.2 but no <cnorm> or <civis>.  The BSD termcap
-# file had <cvvis>=\EM4 \200\200\200.  I've done the safe thing and yanked 
-# both. The <rev> is from BSD, which also claimed bold=\E( and dim=\E).
+# This used to have :vs=\E.2: but no :ve: or :vi:.  The BSD termcap
+# file had :vs=\EM4 \200\200\200:.  I've done the safe thing and yanked 
+# both. The :mr: is from BSD, which also claimed bold=\E( and dim=\E).
 # What seems to be going on here is that this entry was designed so that
 # the normal highlight is bold and standout is dim plus something else
-# (reverse-video maybe?  But then, are there two <rev> sequences?)  
+# (reverse-video maybe?  But then, are there two :mr: sequences?)  
 qvt101+|qvt101p|qume qvt 101 PLUS product:\
 	:am:bw:hs:ul:\
 	:co#80:li#24:sg#0:\
-	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:\
-	:ds=\Eg\Ef\r:ei=:fs=^M:ho=^^:ic=\EQ:im=:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:kB=\EI:\
-	:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:mr=\EG4:nd=^L:pf=\EA:po=\E@:\
-	:se=\E(:sf=^J:so=\E0P\E):st=\E1:ta=^I:ts=\Eg\Ef:\
-	:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:ve=\E.4:
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
+	:ct=\E3:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=:fs=^M:ho=^^:\
+	:ic=\EQ:im=:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:\
+	:kB=\EI:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:mk@:nd=^L:pf=\EA:po=\E@:se=\E(:sf=^J:\
+	:so=\E0P\E):st=\E1:ta=^I:ts=\Eg\Ef:up=^K:vb=\Eb\Ed:ve=\E.4:\
+	:tc=adm+sgr:
 qvt102|qume qvt 102:\
 	:ve=\E.:tc=qvt101:
 # (qvt103: added <rmam>/<smam> based on init string -- esr)
@@ -2951,28 +2956,27 @@ qvt103|qume qvt 103:\
 	:DO=\E[%dB:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
 	:UP=\E[%dA:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
 	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:\
-	:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
-	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:\
+	:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
 	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
 qvt103-w|qume qvt103 132 cols:\
 	:co#132:li#24:\
 	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?8h:tc=qvt103:
 qvt119+|qvt119p|qvt119|qume qvt 119 and 119PLUS terminals:\
 	:am:hs:mi:ms:\
 	:co#80:li#24:sg#0:\
-	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*1:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:\
-	:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:im=\Eq:\
-	:is=\EDF\EC\EG0\Er\E(\E%EX:k0=^AI\r:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=^L:pf=\EA:po=\E@:se=\EG0:sf=^J:\
-	:so=\EG4:sr=\EJ:st=\E1:ta=^I:ts=\Eg\Ef:ue=\EG0:up=^K:\
-	:us=\EG8:vb=\En0\En1:ve=\E.4:vs=\E.2:
+	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*1:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:\
+	:ho=^^:im=\Eq:is=\EDF\EC\EG0\Er\E(\E%EX:k0=^AI\r:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:nd=^L:pf=\EA:po=\E@:sf=^J:sr=\EJ:st=\E1:ta=^I:\
+	:ts=\Eg\Ef:up=^K:us=\EG8:vb=\En0\En1:ve=\E.4:vs=\E.2:\
+	:tc=adm+sgr:
 qvt119+-25|qvt119p-25|QVT 119 PLUS with 25 data lines:\
 	:li#25:tc=qvt119+:
 qvt119+-w|qvt119p-w|qvt119-w|QVT 119 and 119 PLUS in 132 column mode:\
@@ -2981,10 +2985,10 @@ qvt119+-w|qvt119p-w|qvt119-w|QVT 119 and 119 PLUS in 132 column mode:\
 qvt119+-25-w|qvt119p-25-w|qvt119-25-w|QVT 119 and 119 PLUS 132 by 25:\
 	:li#25:tc=qvt119+:
 qvt203|qvt203+|qume qvt 203 Plus:\
-	:al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:ip=:\
-	:k0=\E[29~:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[28~:\
-	:sf=\n:tc=qvt103:
+	:al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:ip=:k0=\E[29~:\
+	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
+	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[28~:sf=\n:\
+	:tc=qvt103:
 qvt203-w|qvt203-w-am|qume qvt 203 PLUS in 132 cols (w/advanced video):\
 	:co#132:li#24:\
 	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?8h:tc=qvt203:
@@ -3101,18 +3105,18 @@ tvi803|televideo 803:\
 # S2 10  DTR status (pin 20)
 #     U  disconnected
 #     D  duplex
-# (tvi910: removed obsolete ":ma=^Kk^Ll^R^L:"; added <khome>, <cub1>, <cud1>,
-# <ind>, <hpa>, <vpa>, <am>, <msgr> from SCO entry -- esr)
+# (tvi910: removed obsolete ":ma=^Kk^Ll^R^L:"; added :kh:, :le:, :do:,
+# :sf:, <hpa>, <vpa>, :am:, :ms: from SCO entry -- esr)
 tvi910|televideo model 910:\
 	:am:ms:\
-	:co#80:it#8:li#24:sg#1:ug#1:\
-	:bl=^G:bt=\EI:cd=\EY:ce=\ET:ch=\E]%+ :cl=^Z:\
-	:cm=\E=%+ %+ :cr=^M:cv=\E[%+ :do=^J:ho=\E=\001\001:\
-	:if=/usr/share/tabset/stdcrt:k0=^AI\r:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:sf=^J:so=\EG4:ta=^I:\
-	:ue=\EG0:up=^K:us=\EG8:
+	:co#80:it#8:li#24:sg#1:\
+	:bl=^G:bt=\EI:cd=\EY:ce=\ET:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :\
+	:cr=^M:cv=\E[%+ :do=^J:ho=\E=\001\001:\
+	:if=/usr/share/tabset/stdcrt:k0=^AI\r:k1=^A@\r:k2=^AA\r:\
+	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:\
+	:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mk@:nd=^L:\
+	:sf=^J:ta=^I:up=^K:\
+	:tc=adm+sgr:
 # From: Alan R. Rogers <rogers%albany@csnet-relay>
 # as subsequently hacked over by someone at SCO
 # (tvi910+: removed obsolete ":ma=^K^P^L :" -- esr)
@@ -3144,21 +3148,21 @@ tvi910|televideo model 910:\
 # S2 10  DTR status (pin 20) (U = disconnected, D = connected)
 #
 tvi910+|910+|televideo 910+:\
-	:al=\EE:dc=\EW:dl=\ER:ei=:ho=^^:ic=\EQ:im=:k0=^A@\r:\
-	:k1=^AA\r:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:\
-	:k6=^AF\r:k7=^AG\r:k8=^AH\r:k9=^AI\r:ll=\E=7 :tc=tvi910:
+	:al=\EE:dc=\EW:dl=\ER:ei=:ho=^^:ic=\EQ:im=:k0=^A@\r:k1=^AA\r:\
+	:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:\
+	:k8=^AH\r:k9=^AI\r:ll=\E=7 :\
+	:tc=tvi910:
 
 # (tvi912: removed obsolete ":ma=^K^P^L :" -- esr)
 tvi912|tvi914|tvi920|old televideo 912/914/920:\
 	:am:\
 	:co#80:it#8:li#24:sg#1:ug#1:\
-	:al=\EE:bl=^G:cd=\Ey:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
-	:ct=\E3:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:\
+	:al=\EE:bl=^G:cd=\Ey:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:\
+	:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:\
 	:if=/usr/share/tabset/stdcrt:im=:k0=^AI\r:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kl=^H:kr=^L:\
-	:ku=^K:le=^H:nd=^L:se=\Ek:sf=^J:so=\Ej:st=\E1:ta=^I:\
-	:ue=\Em:up=^K:us=\El:
+	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
+	:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
+	:se=\Ek:sf=^J:so=\Ej:st=\E1:ta=^I:ue=\Em:up=^K:us=\El:
 # the 912 has a <funct> key that's like shift: <funct>8 xmits "^A8\r".
 # The 920 has this plus real function keys that xmit different things.
 # Terminfo makes you use the funct key on the 912 but the real keys on the 920.
@@ -3167,7 +3171,8 @@ tvi912c|tvi912b|912c|912b|tvi|new televideo 912:\
 # set to page 1 when entering curses application (\E-17 )
 # reset to page 0 when exiting curses application (\E-07 )
 tvi912-2p|tvi920-2p|912-2p|920-2p|tvi-2p|televideo w/2 pages:\
-	:te=\E-07 :ti=\E-17 :tc=tvi912:
+	:te=\E-07 :ti=\E-17 :\
+	:tc=tvi912:
 # We got some new tvi912c terminals that act really weird on the regular 
 # termcap, so one of our gurus worked this up. Seems that cursor 
 # addressing is broken.
@@ -3228,64 +3233,64 @@ tvi912cc|tvi912 at cowell college:\
 #
 tvi920b|tvi920c|new televideo 920:\
 	:al=\EE:dl=\ER:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
-	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:\
-	:k9=^AH\r:tc=tvi912:
+	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
+	:tc=tvi912:
 
 # Televideo 921 and variants
 # From: Tim Theisen <tim@cs.wisc.edu> 22 Sept 1995
-# (tvi921: removed :ko=bt: before translation, I see no backtab cap -- esr)
+# (tvi921: removed :ko=bt: before translation, I see no backtab cap;
+# also added empty <acsc> to suppress tic warning -- esr)
 tvi921|televideo model 921 with sysline same as page & real vi function:\
 	:am:hs:xn:xs:\
 	:co#80:li#24:sg#0:\
-	:ae=\E%:al=\EE:as=\E$:cd=\EY:ce=\ET:cl=^Z:\
-	:cm=3\E=%+ %+ :cr=^M:dc=\EW:dl=1*\ER:do=^V:\
-	:ds=\Ef\r\Eg:ei=:fs=\Eg:ho=^^:ic=\EQ:\
-	:if=/usr/share/tabset/stdcrt:im=:\
-	:is=\El\E"\EF1\E.3\017\EA\E<:kA=\EE:kC=^Z:kD=\EW:\
-	:kE=\ET:kI=\EQ:kL=1*\ER:kS=\EY:kb=^H:kd=^V:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=^L:nw=^M^J:se=\EG0:sf=^J:\
-	:so=\EG4:ta=^I:ts=\Ef\EG0:ue=\EG0:up=^K:us=\EG8:\
-	:ve=\E.3:vs=\E.2:
+	:ac=:ae=\E%:al=\EE:as=\E$:cd=\EY:ce=\ET:cl=^Z:cm=3\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=1*\ER:do=^V:ds=\Ef\r\Eg:ei=:fs=\Eg:ho=^^:\
+	:ic=\EQ:if=/usr/share/tabset/stdcrt:im=:\
+	:is=\El\E"\EF1\E.3\017\EA\E<:kA=\EE:kC=^Z:kD=\EW:kE=\ET:\
+	:kI=\EQ:kL=1*\ER:kS=\EY:kb=^H:kd=^V:kl=^H:kr=^L:ku=^K:le=^H:\
+	:mk@:nd=^L:nw=^M^J:sf=^J:ta=^I:ts=\Ef\EG0:up=^K:ve=\E.3:\
+	:vs=\E.2:\
+	:tc=adm+sgr:
 # without the beeper
-# (tvi92B: removed :ko=bt: before translation, I see no backtab cap -- esr)
+# (tvi92B: removed :ko=bt: before translation, I see no backtab cap;
+# also added empty <acsc> to suppress tic warning -- esr)
 tvi92B|televideo model 921 with sysline same as page & real vi function:\
 	:am:hs:xn:xs:\
 	:co#80:li#24:sg#0:\
-	:ae=\E%:al=\EE:as=\E$:cd=\EY:ce=\ET:cl=^Z:\
-	:cm=3\E=%+ %+ :cr=^M:dc=\EW:dl=1*\ER:do=^V:\
-	:ds=\Ef\r\Eg:ei=:fs=\Eg:ho=^^:ic=\EQ:\
-	:if=/usr/share/tabset/stdcrt:im=:\
-	:is=\El\E"\EF1\E.3\017\EA\E<:kA=\EE:kC=^Z:kD=\EW:\
-	:kE=\ET:kI=\EQ:kL=1*\ER:kS=\EY:kb=^H:kd=^V:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=^L:nw=^M^J:se=\EG0:sf=^J:\
-	:so=\EG4:ta=^I:ts=\Ef\EG0:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eb\Ed:ve=\E.3:vs=\E.2:
+	:ac=:ae=\E%:al=\EE:as=\E$:cd=\EY:ce=\ET:cl=^Z:cm=3\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=1*\ER:do=^V:ds=\Ef\r\Eg:ei=:fs=\Eg:ho=^^:\
+	:ic=\EQ:if=/usr/share/tabset/stdcrt:im=:\
+	:is=\El\E"\EF1\E.3\017\EA\E<:kA=\EE:kC=^Z:kD=\EW:kE=\ET:\
+	:kI=\EQ:kL=1*\ER:kS=\EY:kb=^H:kd=^V:kl=^H:kr=^L:ku=^K:le=^H:\
+	:mk@:nd=^L:nw=^M^J:sf=^J:ta=^I:ts=\Ef\EG0:up=^K:vb=\Eb\Ed:\
+	:ve=\E.3:vs=\E.2:\
+	:tc=adm+sgr:
 # (tvi92D: removed :ko=bt: before translation, I see no backtab cap -- esr)
 tvi92D|tvi92B with DTR instead of XON/XOFF & better padding:\
-	:al=2*\EE:dl=2*\ER:is=\El\E"\EF1\E.3\016\EA\E<:\
-	:kA=2*\EE:kL=2*\ER:tc=tvi92B:
+	:al=2*\EE:dl=2*\ER:is=\El\E"\EF1\E.3\016\EA\E<:kA=2*\EE:\
+	:kL=2*\ER:\
+	:tc=tvi92B:
 
-# (tvi924: This used to have <dsl>=\Es0, <fsl>=\031.  I put the new strings
+# (tvi924: This used to have :ds=\Es0:, :fs=\031:.  I put the new strings
 # in from a BSD termcap file because it looks like they do something the
 # old ones skip -- esr)
 tvi924|televideo tvi924:\
 	:am:bw:hs:in:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:sg#0:ws#80:\
-	:F1=^AK\r:F2=^AL\r:F3=^AM\r:F4=^AN\r:F5=^AO\r:al=\EE:\
-	:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*0:cm=\E=%+ %+ :\
-	:cr=^M:cs=\E_%+ %+ :ct=\E3:dc=\EW:dl=\ER:do=^V:\
-	:ds=\Es0\Ef\031:ei=:fs=\031\Es1:ho=^^:\
+	:F1=^AK\r:F2=^AL\r:F3=^AM\r:F4=^AN\r:F5=^AO\r:al=\EE:bl=^G:\
+	:bt=\EI:cd=\Ey:ce=\Et:cl=\E*0:cm=\E=%+ %+ :cr=^M:\
+	:cs=\E_%+ %+ :ct=\E3:dc=\EW:dl=\ER:do=^V:ds=\Es0\Ef\031:\
+	:ei=:fs=\031\Es1:ho=^^:\
 	:i1=\017\E%\E'\E(\EDF\EC\EG0\EN0\Es0\Ev0:ic=\EQ:\
 	:if=/usr/share/tabset/stdcrt:im=:k0=^A@\r:k1=^AA\r:\
-	:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:k6=^AF\r:\
-	:k7=^AG\r:k8=^AH\r:k9=^AI\r:k;=^AJ\r:kA=\EE:kC=\E*0:\
-	:kD=\EW:kE=\Et:kI=\EQ:kL=\ER:kS=\Ey:kb=^H:kd=^V:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:l0=F1:l1=F2:l2=F3:l3=F4:\
-	:l4=F5:l5=F6:l6=F7:l7=F8:l8=F9:l9=F10:la=F11:le=^H:\
-	:mb=\EG2:me=\EG0:mk=\EG1:nd=^L:pk=\E|%+1%s\031:\
-	:se=\EG0:sf=^J:so=\EG4:sr=\Ej:st=\E1:ta=^I:ts=\Ef:\
-	:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:ve=\E.3:vi=\E.0:\
-	:vs=\E.1:
+	:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:\
+	:k8=^AH\r:k9=^AI\r:k;=^AJ\r:kA=\EE:kC=\E*0:kD=\EW:kE=\Et:\
+	:kI=\EQ:kL=\ER:kS=\Ey:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:l0=F1:l1=F2:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:l8=F9:l9=F10:\
+	:la=F11:le=^H:mb=\EG2:mk@:nd=^L:pk=\E|%+1%s\031:sf=^J:\
+	:sr=\Ej:st=\E1:ta=^I:ts=\Ef:up=^K:vb=\Eb\Ed:ve=\E.3:vi=\E.0:\
+	:vs=\E.1:\
+	:tc=adm+sgr:
 
 # TVI925 DIP switches.  In each of these, D = Down and U = Up,
 #
@@ -3419,20 +3424,18 @@ tvi924|televideo tvi924:\
 # 			X	DTR connected
 # --------------------------------------------
 #
-# (tvi925: BSD has <clear>=\E*.  I got <is2> and <ri> from there -- esr)
+# (tvi925: BSD has :cl=\E*:.  I got :is: and :sr: from there -- esr)
 tvi925|925|televideo 925:\
 	:am:bw:hs:ul:\
-	:co#80:li#24:sg#1:ug#1:\
-	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^V:\
-	:ds=\Eh:ei=:fs=^M\Eg:ho=^^:ic=\EQ:im=:\
-	:is=\El\E"\nkclr=\032:k0=^AI\r:k1=^A@\r:k2=^AA\r:\
-	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
-	:k8=^AG\r:k9=^AH\r:kA=\EE:kD=\EW:kE=\ET:kI=\EQ:\
-	:kL=\ER:kS=\EY:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:le=^H:nd=^L:se=\EG0:sf=^J:so=\EG4:sr=\Ej:st=\E1:\
-	:ta=^I:ts=\Eh\Ef:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:\
-	:ve=\E.4:vs=\E.2:
+	:co#80:li#24:sg#1:\
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
+	:ct=\E3:dc=\EW:dl=\ER:do=^V:ds=\Eh:ei=:fs=^M\Eg:ho=^^:ic=\EQ:\
+	:im=:is=\El\E":k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
+	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
+	:kA=\EE:kC=^Z:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^V:\
+	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mk@:nd=^L:sf=^J:sr=\Ej:st=\E1:\
+	:ta=^I:ts=\Eh\Ef:up=^K:vb=\Eb\Ed:ve=\E.4:vs=\E.2:\
+	:tc=adm+sgr:
 
 # From: Todd Litwin <litwin@litwin.jpl.nasa.gov> 28 May 1993
 # Originally Tim Curry, Univ. of Central Fla., <duke!ucf-cs!tim> 5/21/82
@@ -3528,23 +3531,22 @@ tvi925|925|televideo 925:\
 #                         +-----+-----+-----------------+
 # 
 # (tvi950: early versions had obsolete ":ma=^Vj^Kk^Hh^Ll^^H:". 
-# I also inserted <ich1> and <kich1>; the :ko: string indicated that <ich> 
+# I also inserted :ic: and :kI:; the :ko: string indicated that :IC: 
 # should be present and all tvi native modes use the same string for this.
 # Finally, note that BSD has cud1=^V. -- esr) 
 tvi950|950|televideo 950:\
 	:am:hs:mi:ms:xn:xo:\
-	:co#80:it#8:li#24:sg#1:ug#1:\
-	:ac=d\rc\014e\nb\011i\013:ae=^X:al=\EE:as=^U:bl=^G:\
-	:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :cr=^M:\
-	:ct=\E3:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:\
-	:ho=^^:ic=\EQ:im=\Eq:\
+	:co#80:it#8:li#24:sg#1:\
+	:ac=d\rc\014e\nb\011i\013:ae=^X:al=\EE:as=^U:bl=^G:bt=\EI:\
+	:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:\
+	:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:ic=\EQ:im=\Eq:\
 	:is=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\El\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\Ef\r:\
-	:k0=^A0\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
-	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:\
-	:kB=\EI:kC=\E*:kD=\EW:kE=\Et:kI=\EQ:kL=\ER:kS=\Ey:\
-	:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
-	:pf=\Ea:po=\E`:se=\EG0:sf=^J:so=\EG4:sr=\Ej:st=\E1:\
-	:ta=^I:ts=\Eg\Ef:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:
+	:k0=^A0\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:kB=\EI:kC=\E*:\
+	:kD=\EW:kE=\Et:kI=\EQ:kL=\ER:kS=\Ey:kb=^H:kd=^V:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:mk@:nd=^L:pf=\Ea:po=\E`:sf=^J:sr=\Ej:\
+	:st=\E1:ta=^I:ts=\Eg\Ef:up=^K:vb=\Eb\Ed:\
+	:tc=adm+sgr:
 #
 # is for 950 with two pages adds the following:
 #	set 48 line page (\E\\2)
@@ -3560,7 +3562,8 @@ tvi950|950|televideo 950:\
 #
 tvi950-2p|950-2p|televideo950 w/2 pages:\
 	:is=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\2\E-07 \011:\
-	:ke=\Ek:ks=\El:te=\E\\2\E-07 :ti=\E\\1\E-07 :tc=tvi950:
+	:ke=\Ek:ks=\El:te=\E\\2\E-07 :ti=\E\\1\E-07 :\
+	:tc=tvi950:
 #
 # is for 950 with four pages adds the following:
 #	set 96 line page (\E\\3)
@@ -3573,116 +3576,121 @@ tvi950-2p|950-2p|televideo950 w/2 pages:\
 #
 tvi950-4p|950-4p|televideo950 w/4 pages:\
 	:is=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\3\E-07 \011:\
-	:ke=\Ek:ks=\El:te=\E\\3\E-07 :ti=\E\\1\E-07 :tc=tvi950:
+	:ke=\Ek:ks=\El:te=\E\\3\E-07 :ti=\E\\1\E-07 :\
+	:tc=tvi950:
 #
-# <is2> for reverse video 950 changes the following:
+# :is: for reverse video 950 changes the following:
 #	set reverse video (\Ed)
 #
 # set vb accordingly (\Ed ...delay... \Eb)
 #
 tvi950-rv|950-rv|televideo950 rev video:\
 	:is=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\El\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200:\
-	:vb=\Ed\Eb:tc=tvi950:
+	:vb=\Ed\Eb:\
+	:tc=tvi950:
 
 # tvi950-rv-2p uses the appropriate entries from 950-2p and 950-rv
 tvi950-rv-2p|950-rv-2p|televideo950 rev video w/2 pages:\
 	:is=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\2\E-07 :\
-	:ke=\Ek:ks=\El:te=\E\\2\E-07 :ti=\E\\1\E-07 :\
-	:vb=\Ed\Eb:tc=tvi950:
+	:ke=\Ek:ks=\El:te=\E\\2\E-07 :ti=\E\\1\E-07 :vb=\Ed\Eb:\
+	:tc=tvi950:
 
 # tvi950-rv uses the appropriate entries from 950-4p and 950-rv
 tvi950-rv-4p|950-rv-4p|televideo950 rev video w/4 pages:\
 	:is=\EDF\EC\Eb\EG0\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\3\E-07 :\
-	:ke=\Ek:ks=\El:te=\E\\3\E-07 :ti=\E\\1\E-07 :\
-	:vb=\Ed\Eb:tc=tvi950:
+	:ke=\Ek:ks=\El:te=\E\\3\E-07 :ti=\E\\1\E-07 :vb=\Ed\Eb:\
+	:tc=tvi950:
 # From: Andreas Stolcke <stolcke@icsi.berkeley.edu>
 # (tvi955: removed obsolete ":ma:=^Vj^Kk^Hh^Ll^^H";
 # removed incorrect (and overridden) ":do=^J:"; fixed broken continuations in
-# the :rs: string, inserted the <ich> implied by the termcap :ko: string.  Note
+# the :rs: string, inserted the :IC: implied by the termcap :ko: string.  Note
 # the :ko: string had :cl: in it, which means that one of the original
-# <clear>=\E*, <kclr>=\EY had to be wrong; set <kclr>=\E* because that's what
+# :cl=\E*:, <kclr=\EY> had to be wrong; set <kclr=\E*> because that's what
 # the 950 has.   Finally, corrected the <kel> string to match the 950 and what
 # ko implies -- esr)
-# If the BSD termcap file was right, <cup>=\E=%p1%{32}%+%c%p2%{32}%+%c would
+# If the BSD termcap file was right, :cm=\E=%p1%{32}%+%c%p2%{32}%+%c: would
 # also work.
 tvi955|televideo 955:\
 	:5i:ms@:\
 	:it#8:sg@:\
 	:RA=\E[=7l:RX=^N:SA=\E[=7h:SX=^O:\
 	:ac=0_`RjHkGlFmEnIoPqKsQtMuLvOwNxJ:ae=\E%:as=\E$:\
-	:cm=\E[%i%d;%dH:do=^V:\
-	:is=\E[=3l\EF1\Ed\EG0\E[=5l\E%\El:kM=\EQ:kN=\EK:\
-	:kP=\EJ:kT=\E1:ka=\E3:kt=\E2:mb=\EG2:me=\EG0\E[=5l:\
-	:mh=\E[=5h:mk=\EG1:mr=\EG4:ps=\EP:\
+	:cm=\E[%i%d;%dH:do=^V:is=\E[=3l\EF1\Ed\EG0\E[=5l\E%\El:\
+	:kM=\EQ:kN=\EK:kP=\EJ:kT=\E1:ka=\E3:kt=\E2:mb=\EG2:\
+	:me=\EG0\E[=5l:mh=\E[=5h:mk=\EG1:ps=\EP:\
 	:r1=\EDF\EC\Eg\Er\EO\E'\E(\Ew\EX\Ee \017\E0P\E6\200\E0p\E4\200\Ef\r:\
-	:sf@:ve=\E.2:vi=\E.0:vs=\E.1:tc=tvi950:
+	:sf@:ve=\E.2:vi=\E.0:vs=\E.1:\
+	:tc=tvi950:
 tvi955-w|955-w|televideo955 w/132 cols:\
 	:co#132:\
 	:is=\E[=3h\EF1\Ed\EG0\E[=5l\E%\El:tc=tvi955:
-# use half-intensity as normal mode, full intensity as <bold>
+# use half-intensity as normal mode, full intensity as :md:
 tvi955-hb|955-hb|televideo955 half-bright:\
 	:is=\E[=3l\EF1\Ed\EG0\E[=5h\E%\El:md=\E[=5l:\
 	:me=\EG0\E[=5h:mh@:tc=tvi955:
 # From: Humberto Appleton <beto@cs.utexas.edu>, 880521 UT Austin
-# (tvi970: removed ":sg#0:" -- esr)
+# (tvi970: removed ":sg#0:"; removed :se:=\E[m, :ue:=\E[m;
+# also added empty <acsc> to suppress tic warning -- esr)
 tvi970|televideo 970:\
 	:da:db:mi:ms:\
 	:co#80:it#8:li#24:\
-	:ae=\E(B:al=\E[L:as=\E(B:bt=\E[Z:cd=\E[0J:ce=\E[0K:\
+	:ac=:ae=\E(B:al=\E[L:as=\E(B:bt=\E[Z:cd=\E[0J:ce=\E[0K:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%df:dc=\E[P:dl=\E[M:do=\ED:\
 	:ds=\Eg\Ef\r:ei=\E[4l:im=\E[4h:\
-	:is=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J:\
-	:k1=\E?a:k2=\E?b:k3=\E?c:k4=\E?d:k5=\E?e:k6=\E?f:\
-	:k7=\E?g:k8=\E?h:k9=\E?i:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[m:\
-	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\EM:us=\E[4m:\
-	:vb=\E[5;m\E[0;m:vs=\E[1Q:
+	:is=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J:k1=\E?a:\
+	:k2=\E?b:k3=\E?c:k4=\E?d:k5=\E?e:k6=\E?f:k7=\E?g:k8=\E?h:\
+	:k9=\E?i:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ta=^I:\
+	:ue=\E[m:up=\EM:us=\E[4m:vb=\E[5;m\E[0;m:vs=\E[1Q:
 # Works with vi and rogue.  NOTE: Esc v sets autowrap on, Esc u sets 80 chars
 # per line (rather than 40), Esc K chooses the normal character set.  Not sure
-# padding is needed, but adapted from the tvi920c termcap.  The :so: and :us:
-# strings are klutzy, but at least use no screen space.
+# padding is needed, but adapted from the tvi920c termcap.  The :so: and 
+# :us: strings are klutzy, but at least use no screen space.
 # (tvipt: removed obsolete ":ma=^Kk^Ll^R^L:".  I wish we knew <rmam>. -- esr)
 # From: Gene Rochlin <armsis@amber.berkeley.edu> 9/19/84. 
 tvipt|televideo personal terminal:\
 	:am:\
 	:co#80:li#24:\
-	:SA=\Ev:al=\EE:bt=\EI:ce=\ET:cl=^Z:cm=\E=%+ %+ :\
-	:dl=\ER:ho=^^:if=/usr/share/tabset/stdcrt:\
-	:is=\Ev\Eu\EK:kb=^H:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:\
-	:nd=^L:se=\EF:so=\EG1@A\EH:ue=\EF:up=^K:us=\EG1B@\EH:
+	:SA=\Ev:al=\EE:bt=\EI:ce=\ET:cl=^Z:cm=\E=%+ %+ :dl=\ER:\
+	:ho=^^:if=/usr/share/tabset/stdcrt:is=\Ev\Eu\EK:kb=^H:\
+	:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EF:so=\EG1@A\EH:\
+	:ue=\EF:up=^K:us=\EG1B@\EH:
 
 #### Visual (vi)
 #
+# In September 1993, Visual Technology of Westboro, Massachusetts,
+# merged with White Pine Software of Nashua, New Hampshire.
+#
+# White Pine Software may be contacted at +1 603/886-9050.
+# Or visit White Pine on the World Wide Web at URL http://www.wpine.com.
+#
 
 # vi50 is from University of Wisconsin
 # This is a provisional vi50 termcap entry.  It was copied from vi500
-# entry.  Note especially the <il1> function.  <kf4>-<kf6> are really l4-l6 in
-# disguise; <kf7>-<kf9> are really l1-l3.  No highlighting enabled at present.
+# entry.  Note especially the :al: function.  :k4:-:k6: are really l4-l6 in
+# disguise; :k7:-:k9: are really l1-l3.  No highlighting enabled at present.
 vi50|visual 50:\
 	:am:ms:\
 	:co#80:it#8:li#24:\
-	:al=\EL:bt=4\Ez:cd=\Ek:ce=16\EK:cl=\Ev:cm=\EY%+ %+ :\
-	:cr=^M:dl=3*\EM:do=\EB:ho=\EH:k1=\EP:k2=\EQ:k3=\ER:\
-	:k4=\EV:k5=\EE:k6=\E]:k7=\EL:k8=\Ev:k9=\EM:kb=^H:\
-	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
-	:nw=^M^J:sf=^J:ta=^I:up=\EA:
+	:al=\EL:bt=4\Ez:cd=\Ek:ce=16\EK:cl=\Ev:cm=\EY%+ %+ :cr=^M:\
+	:dl=3*\EM:do=\EB:ho=\EH:k1=\EP:k2=\EQ:k3=\ER:k4=\EV:k5=\EE:\
+	:k6=\E]:k7=\EL:k8=\Ev:k9=\EM:kb=^H:kd=\EB:kh=\EH:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:nd=\EC:nw=^M^J:sf=^J:ta=^I:up=\EA:
 # this one was BSD & SCO's vi50
 vi50adm|visual 50 in adm3a mode:\
 	:am:ms:\
 	:co#80:it#8:li#24:\
-	:al=\EL:bl=^G:cd=\Ek:ce=\EK:cl=^Z:cm=\E=%+ %+ :cr=^M:\
-	:dl=\EM:do=^J:ho=\EH:kb=^H:kd=\EB:kh=\EH:kl=\ED:\
-	:kr=\EC:ku=\EA:le=^H:nd=^L:se=\ET:sf=^J:so=\EU:ta=^I:\
-	:up=^K:
+	:al=\EL:bl=^G:cd=\Ek:ce=\EK:cl=^Z:cm=\E=%+ %+ :cr=^M:dl=\EM:\
+	:do=^J:ho=\EH:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:\
+	:nd=^L:se=\ET:sf=^J:so=\EU:ta=^I:up=^K:
 # From: Jeff Siegal <jbs@athena.mit.edu>
 vi55|Visual 55:\
 	:am:mi:ms:\
 	:co#80:it#8:li#24:\
-	:al=\EL:cd=\EJ:ce=\EK:cl=\Ev:cm=\EY%+ %+ :\
-	:cs=\E_%+A%+A:dc=\Ew:dl=\EM:do=^J:ei=\Eb:ho=\EH:\
-	:im=\Ea:is=\Ev\E_AX\Eb\EW\E9P\ET:kb=^H:kd=\EB:kl=\ED:\
-	:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\ET:so=\EU:sr=\EI:\
-	:ta=^I:up=\EA:
+	:al=\EL:cd=\EJ:ce=\EK:cl=\Ev:cm=\EY%+ %+ :cs=\E_%+A%+A:\
+	:dc=\Ew:dl=\EM:do=^J:ei=\Eb:ho=\EH:im=\Ea:\
+	:is=\Ev\E_AX\Eb\EW\E9P\ET:kb=^H:kd=\EB:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:nd=\EC:se=\ET:so=\EU:sr=\EI:ta=^I:up=\EA:
 
 # The Visual 200 beeps when you type a character in insert mode.
 # This is a horribly obnoxious misfeature, and some of the entries
@@ -3690,50 +3698,51 @@ vi55|Visual 55:\
 # turning it off when inputting a character.  They are said not to
 # work well at 300 baud.  (You could always cut the wire to the bell!)
 # (vi200: this used to use ich1=\Ei\s\010\Ej but it's more effective to
-# use <smir>/<rmir> directly -- esr)
+# use :im:/:ei: directly -- esr)
 # From: <mike@brl-vgr> Mon Nov 14 08:34:29 1983
 vi200|vis200|visual 200 with function keys:\
 	:am:\
 	:co#80:it#8:li#24:\
-	:al=\EL:bl=^G:cd=\Ey:ce=\Ex:cl=\Ev:cm=\EY%+ %+ :\
-	:cr=^M:dc=\EO:dl=\EM:do=^J:ei=\Ej:ho=\EH:im=\Ei:\
+	:al=\EL:bl=^G:cd=\Ey:ce=\Ex:cl=\Ev:cm=\EY%+ %+ :cr=^M:\
+	:dc=\EO:dl=\EM:do=^J:ei=\Ej:ho=\EH:im=\Ei:\
 	:is=\E3\Eb\Ej\E\\\El\EG\Ec\Ek:k0=\EP:k1=\EQ:k2=\ER:\
-	:k3=\E :k4=\E!:k5=\E":k6=\E#:k7=\E$:k8=\E%:k9=\E&:\
-	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
-	:se=\E3:sf=^J:so=\E4:sr=\EI:ta=^I:up=\EA:ve=\Ec:\
-	:vs=\Ed:
+	:k3=\E :k4=\E!:k5=\E":k6=\E#:k7=\E$:k8=\E%:k9=\E&:kd=\EB:\
+	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E3:sf=^J:\
+	:so=\E4:sr=\EI:ta=^I:up=\EA:ve=\Ec:vs=\Ed:
 # The older Visuals didn't come with function keys. This entry uses
-# <smkx> and <rmkx> so that the keypad keys can be used as function keys.
+# :ks: and :ke: so that the keypad keys can be used as function keys.
 # If your version of vi doesn't support function keys you may want
 # to use vi200-f.
 vi200-f|visual|visual 200 no function keys:\
-	:is=\E3\Eb\Ej\E\\\El\EG\Ed\Ek:k0=\E?p:k1=\E?q:\
-	:k2=\E?r:k3=\E?s:k4=\E?t:k5=\E?u:k6=\E?v:k7=\E?w:\
-	:k8=\E?x:k9=\E?y:ke=\E>:ks=\E=:se@:so@:tc=vi200:
+	:is=\E3\Eb\Ej\E\\\El\EG\Ed\Ek:k0=\E?p:k1=\E?q:k2=\E?r:\
+	:k3=\E?s:k4=\E?t:k5=\E?u:k6=\E?v:k7=\E?w:k8=\E?x:k9=\E?y:\
+	:ke=\E>:ks=\E=:se@:so@:\
+	:tc=vi200:
 vi200-rv|visual 200 reverse video:\
 	:se=\E3:so=\E4:sr@:ve@:vs@:tc=vi200:
 
 # the function keys are programmable but we don't reprogram them to their
-# default values with <is2> because programming them is very verbose. maybe
+# default values with :is: because programming them is very verbose. maybe
 # an initialization file should be made for the 300 and they could be stuck
 # in it.
 # (vi300: added <rmam>/<smam> based on init string -- esr)
 vi300|visual 300 ansi x3.64:\
 	:am:bw:mi:xn:\
 	:co#80:li#24:\
-	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:\
-	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
-	:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=\E[4l:ho=\E[H:im=\E[4h:\
 	:is=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[1Q\E[0;1(D\E[8s:\
 	:k1=\E_A\E\\:k2=\E_B\E\\:k3=\E_C\E\\:k4=\E_D\E\\:\
 	:k5=\E_E\E\\:k6=\E_F\E\\:k7=\E_G\E\\:k8=\E_H\E\\:\
-	:k9=\E_I\E\\:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[1m:sr=\EM:ta=^I:\
+	:k9=\E_I\E\\:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:me=\E[m:nd=\E[C:se=\E[m:sf=^J:so=\E[1m:sr=\EM:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:
 # some of the vi300s have older firmware that has the command
 # sequence for setting editing extent reversed.
 vi300-old|visual 300 with old firmware (set edit extent reversed):\
-	:is=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[2Q\E[0;1(D\E[8s:tc=vi300:
+	:is=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[2Q\E[0;1(D\E[8s:\
+	:tc=vi300:
 
 # Visual 500 prototype entry from University of Wisconsin.
 # The best place to look for the escape sequences is page A1-1 of the
@@ -3742,17 +3751,18 @@ vi300-old|visual 300 with old firmware (set edit extent reversed):\
 # be done with the menus in set-up mode.
 # The :xp: line below is so that emacs can understand the padding requirements
 # of this slow terminal.  :xp: is 10 time the padding factor.
-# (vi500: removed unknown :xp#4: termcap -- esr)
+# (vi500: removed unknown :xp#4: termcap;
+# also added empty <acsc> to suppress tic warning -- esr)
 vi500|visual 500:\
 	:am:mi:ms:\
 	:co#80:it#8:li#33:\
-	:ae=^O:al=3*\EL\Ex:as=^N:bt=4\Ez:cd=3*\Ey:ce=16\Ex:\
+	:ac=:ae=^O:al=3*\EL\Ex:as=^N:bt=4\Ez:cd=3*\Ey:ce=16\Ex:\
 	:cl=6*\Ev:cm=\EY%+ %+ :cr=^M:cs=\E(%+ %+ :dc=3*\EO:\
 	:dl=3*\EM:do=\EB:ei=\Ej:ho=\EH:im=\Ei:\
 	:is=\E3\E\001\E\007\E\003\Ek\EG\Ed\EX\El\E>\Eb\E\\:\
-	:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:\
-	:nd=\EC:nw=^M^J:se=\E^G:sf=^J:so=\E^H:ta=8\011:\
-	:ue=\E^C:up=\EA:us=\E^D:
+	:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
+	:nw=^M^J:se=\E^G:sf=^J:so=\E^H:ta=8\011:ue=\E^C:up=\EA:\
+	:us=\E^D:
 
 # The visual 550 is a visual 300 with tektronix graphics,
 # and with 33 lines. clear screen is modified here to
@@ -3763,13 +3773,13 @@ vi550|visual 550 ansi x3.64:\
 
 vi603|visual603|visual 603:\
 	:hs:mi:\
-	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
-	:ds=\EP2;1~\E\\:ei=\E[4l:fs=\E\\:\
-	:i1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r:im=\E[4h:\
-	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:ds=\EP2;1~\E\\:ei=\E[4l:\
+	:fs=\E\\:i1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r:\
+	:im=\E[4h:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
 	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:ts=\EP2~:ue=\E[24m:\
-	:up=\E[A:us=\E[4m:tc=vt100:
+	:up=\E[A:us=\E[4m:\
+	:tc=vt100:
 
 #### Wyse (wy)
 #
@@ -3778,14 +3788,28 @@ vi603|visual603|visual 603:\
 #	San Jose, CA 95134
 #	Vox: (408)-473-1200
 #	Fax: (408) 473-1222
+#	Web: http://www.wyse.com
 #
 # Wyse sales can be reached by phone at 1-800-GET-WYSE.  Tech support is at
-# (800)-800-WYSE (option 5 gets you a human).
+# (800)-800-WYSE (option 5 gets you a human).  There's a Web page at the
+# obvious address, http://www.wyse.com.
 #
-# All the following entries until (but not including) wy100q are direct from
+# Wyse bought out Link Technology, Inc. in 1990 and closed it down in 1995.
+# They now own the Qume and Amdek brands, too.  So these are the people to
+# talk with about all Link, Qume, and Amdek terminals.
+#
+# Wyse has a BBS containing termcap and terminfo stuff for their terminals
+# (though this may not last long -- I expect the Web will kill it off by
+# mid-1997 or so).  According to their tech support, at 800-800-9973, it's
+# at 408-922-4400 thru 4405.  The 4400 modem is flaky as of 5/96, so
+# call 4401 etc.  Come in at 9600 hard; don't use autospeed sense.
+#
+# All the following entries until (but not including) wy520 are direct from
 # Wyse technical support and represent their best knowledge as of January 1995.
 # I canceled the bel capacities in the vb entries.
 # I made two trivial syntax fixes in the wyse30 entry.
+# I made some entries relative to adm+sgr.
+#
 #
 # Note: The wyse75, wyse85, and wyse99 have been discontinued.
 
@@ -3801,32 +3825,31 @@ wy30|wyse30|Wyse 30:\
 	:Nl#8:co#80:lh#1:li#24:lw#8:ma#1:ws#45:\
 	:#2=\E{:&3=\Er:@8=\E7:LF=\EA11:LO=\EA10:\
 	:ac=0wa_h[jukslrmqnxqzttuyv]wpxv:ae=\EH^C:al=\EE:\
-	:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:\
-	:ds=\EF\r:ei=\Er:fs=^M:ho=^^:im=\Eq:ip=:\
-	:is=\E'\E(\E^3\E`9\016\024:k1=^A@\r:k2=^AA\r:\
-	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
-	:k8=^AG\r:kA=\EE:kB=\EI:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:\
-	:kN=\EK:kP=\EJ:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:\
-	:ku=^K:le=^H:ll=^^^K:me=\E(\EH\003:mh=\E`7\E):\
-	:mp=\E`7\E):nd=^L:nw=^M^J:pf=^T:pn=\Ez%+/%s\r:po=^X:\
-	:ps=\EP:px=\Ez%+?%s\177:\
+	:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:ei=\Er:fs=^M:\
+	:ho=^^:im=\Eq:ip=:is=\E'\E(\E^3\E`9\016\024:k1=^A@\r:\
+	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
+	:k8=^AG\r:kA=\EE:kB=\EI:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kN=\EK:\
+	:kP=\EJ:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
+	:ll=^^^K:me=\E(\EH\003:mh=\E`7\E):mp=\E`7\E):nd=^L:\
+	:nw=^M^J:pf=^T:pn=\Ez%+/%s\r:po=^X:ps=\EP:px=\Ez%+?%s\177:\
 	:..sa=%?%p1%p5%p8%|%|%t\E`7\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
-	:se=\E(:sf=\n:so=\E`7\E):sr=\Ej:st=\E1:ta=\011:\
-	:ts=\EF:up=^K:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
+	:se=\E(:sf=\n:so=\E`7\E):sr=\Ej:st=\E1:ta=\011:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
 #
+# (wy30-mc: added :ti: to suppress tic warning --esr)
 wy30-mc|wyse30-mc|wyse 30 with magic cookies:\
 	:ms@:\
-	:ma@:sg#1:ug#1:\
+	:ma@:sg#1:\
 	:ae=\EG0\EH\003:as=\EG0\EH\002:mb=\EG2:\
-	:me=\EG0\E(\EH\003:mh=\EGp:mk=\EG1:mp=\EG0\E):\
-	:mr=\EG4:\
+	:me=\EG0\E(\EH\003:mh=\EGp:mp=\EG0\E):\
 	:..sa=\EG%'0'%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
-	:se=\EG0:so=\EG4:te=\EG0:ue=\EG0:us=\EG8:tc=wy30:
-#	The mandatory pause used by <flash> does not work with
+	:te=\EG0:ti=:\
+	:tc=wy30:tc=adm+sgr:
+#	The mandatory pause used by :vb: does not work with
 #	older versions of terminfo.  If you see this effect then
 #	unset xon and delete the / from the delay.
 #	i.e. change $<100/> to $<100>
@@ -3845,45 +3868,46 @@ wy30-vb|wyse30-vb|wyse 30 visible bell:\
 wy50|wyse50|Wyse 50:\
 	:5i:am:bw:hs:mi:ms:xo:\
 	:Nl#8:co#80:lh#1:li#24:lw#8:ma#1:ws#45:\
-	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:\
-	:F3=^AL\r:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:\
-	:LO=\EA10:ac=0wa_h[jukslrmqnxqzttuyv]wpxv:ae=\EH^C:\
-	:al=\EE:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:\
-	:ds=\EF\r:ei=\Er:fs=^M:ho=^^:i1=\E`\072\E`9:im=\Eq:\
-	:ip=:is=\016\024\E'\E(:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
-	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:\
-	:k9=^AH\r:k;=^AI\r:kA=\EE:kB=\EI:kD=\EW:kE=\ET:\
-	:kI=\EQ:kL=\ER:kN=\EK:kP=\EJ:kS=\EY:kb=^H:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:me=\E(\EH\003:\
-	:mh=\E`7\E):mp=\E`7\E):mr=\E`6\E):nd=^L:nw=^M^J:\
-	:pf=^T:pn=\Ez%+/%s\r:po=^X:ps=\EP:px=\Ez%+?%s\177:\
+	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:F3=^AL\r:\
+	:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:LO=\EA10:\
+	:ac=0wa_h[jukslrmqnxqzttuyv]wpxv:ae=\EH^C:al=\EE:\
+	:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:ei=\Er:fs=^M:\
+	:ho=^^:i1=\E`\072\E`9:im=\Eq:ip=:is=\016\024\E'\E(:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:kB=\EI:kD=\EW:\
+	:kE=\ET:kI=\EQ:kL=\ER:kN=\EK:kP=\EJ:kS=\EY:kb=^H:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:me=\E(\EH\003:mh=\E`7\E):\
+	:mp=\E`7\E):mr=\E`6\E):nd=^L:nw=^M^J:pf=^T:pn=\Ez%+/%s\r:\
+	:po=^X:ps=\EP:px=\Ez%+?%s\177:\
 	:..sa=%?%p1%p3%|%t\E`6\E)\n%e%p5%p8%|%t\E`7\E)%e\E(%;\n%?%p9%t\EH\002%e\EH\003%;:\
-	:se=\E(:sf=\n:so=\E`6\E):sr=\Ej:st=\E1:ta=^I:ts=\EF:\
-	:up=^K:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
+	:se=\E(:sf=\n:so=\E`6\E):sr=\Ej:st=\E1:ta=^I:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
 #
 #	The mandatory pause used by flash does not work with some
 #	older versions of terminfo.  If you see this effect then
-#	unset <xon> and delete the / from the delay.
+#	unset :xo: and delete the / from the delay.
 #	i.e. change $<100/> to $<100>
+# (wy50-mc: added :ti: to suppress tic warning --esr)
 wy50-mc|wyse50-mc|wyse 50 with magic cookies:\
 	:ms@:\
-	:ma@:sg#1:ug#1:\
+	:ma@:sg#1:\
 	:ae=\EG0\EH\003:as=\EG0\EH\002:mb=\EG2:\
-	:me=\EG0\E(\EH\003:mh=\EGp:mk=\EG1:mp=\EG0\E):\
-	:mr=\EG4:\
+	:me=\EG0\E(\EH\003:mh=\EGp:mp=\EG0\E):\
 	:..sa=\EG%'0'%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
-	:se=\EG0:so=\EGt:te=\EG0:ue=\EG0:us=\EG8:tc=wy50:
+	:so=\EGt:te=\EG0:ti=:\
+	:tc=wy50:tc=adm+sgr:
 wy50-vb|wyse50-vb|wyse 50 visible bell:\
 	:bl@:tc=wy50:
 wy50-w|wyse50-w|wyse 50 132-column:\
 	:Nl#16:co#132:lw#7:ws#97:\
 	:cm=\Ea%i%dR%dC:dc=\EW:i1=\E`;\E`9:tc=wy50:
 wy50-wvb|wyse50-wvb|wyse 50 132-column visible bell:\
-	:bl@:tc=wy50-w:
+	:bl@:\
+	:tc=wy50-w:
 #
 #	The Wyse 350 is a Wyse 50 with color.
 #	Unfortunately this means that it has magic cookies.
@@ -3906,53 +3930,52 @@ wy50-wvb|wyse50-wvb|wyse 50 132-column visible bell:\
 #	unset xon and delete the / from the delay.
 #	i.e. change $<100/> to $<100>
 #
+# Bug: The <op> capability resets attributes.
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 wy350|wyse350|Wyse 350:\
 	:5i:am:bw:hs:mi:xo:\
-	:Co#8:NC#55:Nl#8:co#80:lh#1:li#24:lw#8:pa#8:sg#1:\
-	:ug#1:ws#45:\
-	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:\
-	:F3=^AL\r:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:\
-	:LO=\EA10:Sb= :ac=0wa_h[jukslrmqnxqzttuyv]wpxv:\
-	:ae=\EG0\EH\003:al=\EE:as=\EG0\EH\002:bl=^G:bt=\EI:\
-	:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:\
-	:dc=\EW:dl=\ER:do=^J:ds=\EF\r:ei=\Er:fs=^M:ho=^^:\
-	:i1=\E`\072\E`9:i2=\E%?:im=\Eq:ip=:is=\016\024\E'\E(:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:\
-	:kB=\EI:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kN=\EK:kP=\EJ:\
-	:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
-	:ll=^^^K:mb=\EG2:me=\EG0\E(\EH\003%{0}%PA%{0}%PC:\
-	:mh=\EGp:mk=\EG1:mp=\EG0\E):mr=\EG4:nd=^L:nw=^M^J:\
-	:oc=\E%?:op=\EG0:pf=^T:pn=\Ez%+/%s\r:po=^X:ps=\EP:\
-	:px=\Ez%+?%s\177:se=\EG0:sf=\n:so=\EG4:sr=\Ej:st=\E1:\
-	:ta=^I:ts=\EF:ue=\EG0:up=^K:us=\EG8:vb=\E`8\E`9:\
-	:ve=\E`1:vi=\E`0:
+	:Co#8:NC#55:Nl#8:co#80:lh#1:li#24:lw#8:pa#8:sg#1:ws#45:\
+	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:F3=^AL\r:\
+	:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:LO=\EA10:Sb=:\
+	:ac=0wa_h[jukslrmqnxqzttuyv]wpxv:ae=\EG0\EH\003:al=\EE:\
+	:as=\EG0\EH\002:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=^^:i1=\E`\072\E`9:i2=\E%?:im=\Eq:ip=:\
+	:is=\016\024\E'\E(:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:\
+	:kA=\EE:kB=\EI:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kN=\EK:kP=\EJ:\
+	:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:\
+	:mb=\EG2:me=\EG0\E(\EH\003%{0}%PA%{0}%PC:mh=\EGp:\
+	:mp=\EG0\E):nd=^L:nw=^M^J:oc=\E%?:op=\EG0:pf=^T:\
+	:pn=\Ez%+/%s\r:po=^X:ps=\EP:px=\Ez%+?%s\177:sf=\n:sr=\Ej:\
+	:st=\E1:ta=^I:ts=\EF:up=^K:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
 wy350-vb|wyse350-vb|wyse 350 visible bell:\
 	:bl@:tc=wy350:
 wy350-w|wyse350-w|wyse 350 132-column:\
 	:Nl#16:co#132:lw#7:ws#97:\
 	:cm=\Ea%i%dR%dC:dc=\EW:i1=\E`;\E`9:tc=wy350:
 wy350-wvb|wyse350-wvb|wyse 350 132-column visible bell:\
-	:bl@:tc=wy350-w:
+	:bl@:\
+	:tc=wy350-w:
 #
 #	This terminfo description is untested.
 #
 wy100|wyse 100:\
 	:hs:mi:\
-	:co#80:li#24:sg#1:ug#1:\
-	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :\
-	:cr=^M:dc=\EW:dl=\ER:do=^J:ds=\EA31:ei=\Er:fs=^M:\
-	:im=\Eq:is=\Eu\E0:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
-	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:kb=^H:\
-	:kd=^J:kh=\E{:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:\
-	:sf=^J:so=\EG4:ts=\EF:ue=\EG0:up=^K:us=\EG8:
+	:co#80:li#24:sg#1:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ds=\EA31:ei=\Er:fs=^M:im=\Eq:is=\Eu\E0:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:kb=^H:kd=^J:kh=\E{:kl=^H:kr=^L:ku=^K:\
+	:le=^H:mk@:nd=^L:sf=^J:ts=\EF:up=^K:\
+	:tc=adm+sgr:
 #
 #	The Wyse 120/150 has most of the features of the Wyse 60.
 #	This terminal does not need padding up to 9600 baud!
-#	<msgr> should be set but the clear screen fails when in
+#	:ms: should be set but the clear screen fails when in
 #	alt-charset mode.  Try \EcE\s\s\E+\s if the screen is really clear
-#	then set <msgr>.
+#	then set :ms:.
 #
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
@@ -3960,18 +3983,17 @@ wy100|wyse 100:\
 wy120|wyse120|wy150|wyse150|Wyse 120/150:\
 	:am:bw:hs:km:mi:ms:xo:\
 	:co#80:it#8:li#24:pb#9601:ws#45:\
-	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:cl=\E+:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:\
-	:ds=\EF\r:ei=\Er:fs=^M:ho=^^:i1=\EcB0\EcC1:\
-	:i2=\EwJ\Ew1:im=\Eq:ip=:\
+	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ds=\EF\r:ei=\Er:\
+	:fs=^M:ho=^^:i1=\EcB0\EcC1:i2=\EwJ\Ew1:im=\Eq:ip=:\
 	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
-	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:le=^H:ll=^^^K:mb=\EG2:me=\E(\EH\003\EG0\EcD:mh=\EGp:\
-	:mr=\EG4:nd=^L:nw=\r\n:se=\EG0:sf=\n:so=\EGt:sr=\Ej:\
-	:st=\E1:ta=\011:te=\Ew1:ti=\Ew0:ts=\EF:ue=\EG0:up=^K:\
-	:us=\EG8:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=\n:\
+	:so=\EGt:sr=\Ej:st=\E1:ta=\011:te=\Ew1:ti=\Ew0:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
 #
 wy120-w|wyse120-w|wy150-w|wyse150-w|wyse 120/150 132-column:\
 	:Nl#16:co#132:lw#7:ws#97:\
@@ -3986,10 +4008,12 @@ wy120-25-w|wyse120-25-w|wy150-25-w|wyse150-25-w|wyse 120/150 132-column 25-lines
 	:pn@:r3=\EwG\Ee):tc=wy120-w:
 #
 wy120-vb|wyse120-vb|wy150-vb|wyse150-vb|Wyse 120/150 visible bell:\
-	:bl@:tc=wy120:
+	:bl@:\
+	:tc=wy120:
 #
 wy120-w-vb|wy120-wvb|wyse120-wvb|wy150-w-vb|wyse150-w-vb|Wyse 120/150 132-column visible bell:\
-	:bl@:tc=wy120-w:
+	:bl@:\
+	:tc=wy120-w:
 #
 #	The Wyse 60 is like the Wyse 50 but with more padding.
 #	The reset strings are slow and the pad times very depending
@@ -3999,13 +4023,13 @@ wy120-w-vb|wy120-wvb|wyse120-wvb|wy150-w-vb|wyse150-w-vb|Wyse 120/150 132-column
 #		<rs1> -> set personality
 #		<rs2> -> set number of columns
 #		<rs3> -> set number of lines
-#		<is1> -> select the proper font
-#		<is2> -> do the initialization
-#		<is3> -> set up display memory (2 pages)
+#		:i1: -> select the proper font
+#		:is: -> do the initialization
+#		:i3: -> set up display memory (2 pages)
 #
 #	The Wyse 60's that have vt100 emulation are slower than the
 #	older Wyse 60's.  This change happened mid-1987.
-#	The capabilities effected are <dch1> <dl1> <il1> <ind> <ri>
+#	The capabilities effected are :dc: :dl: :al: :sf: :sr:
 #
 #	The meta key is only half right.  This terminal will return the
 #	high order bit set when you hit CTRL-function_key
@@ -4027,18 +4051,17 @@ wy120-w-vb|wy120-wvb|wyse120-wvb|wy150-w-vb|wyse150-w-vb|Wyse 120/150 132-column
 wy60|wyse60|Wyse 60:\
 	:am:bw:hs:km:mi:ms:\
 	:co#80:li#24:ws#45:\
-	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
-	:do=^J:ds=\EF\r:ei=\Er:fs=^M:ho=\E{:i1=\EcB0\EcC1:\
-	:i2=\EwJ\Ew1:im=\Eq:ip=:\
+	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=\E{:i1=\EcB0\EcC1:i2=\EwJ\Ew1:im=\Eq:ip=:\
 	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
-	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:le=^H:ll=\E{^K:mb=\EG2:me=\E(\EH\003\EG0\EcD:\
-	:mh=\EGp:mr=\EG4:nd=^L:nw=\r\n:se=\EG0:sf=\n:so=\EGt:\
-	:sr=\Ej:st=\E1:ta=\011:te=\Ew1:ti=\Ew0:ts=\EF:\
-	:ue=\EG0:up=^K:us=\EG8:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=\E{^K:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=\n:\
+	:so=\EGt:sr=\Ej:st=\E1:ta=\011:te=\Ew1:ti=\Ew0:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
 #
 wy60-w|wyse60-w|wyse 60 132-column:\
 	:Nl#16:co#132:lw#7:ws#97:\
@@ -4057,8 +4080,9 @@ wy60-42|wyse60-42|wyse 60 80-column 42-lines:\
 	:i1=\EcB2\EcC3:ip=:nw=\r\n:r3=\Ee*:sf=\n:sr=\Ej:tc=wy60:
 wy60-42-w|wyse60-42-w|wyse 60 132-column 42-lines:\
 	:Nl#16:co#132:lw#7:ws#97:\
-	:cd=\Ey:cl=\E+:cm=\Ea%i%dR%dC:dc=\EW:ho=\036:ip=:\
-	:nw=\r\n:r2=\EeF\E`;:tc=wy60-42:
+	:cd=\Ey:cl=\E+:cm=\Ea%i%dR%dC:dc=\EW:ho=\036:ip=:nw=\r\n:\
+	:r2=\EeF\E`;:\
+	:tc=wy60-42:
 #
 wy60-43|wyse60-43|wyse 60 80-column 43-lines:\
 	:Nl@:lh@:li#43:lw@:\
@@ -4070,7 +4094,8 @@ wy60-43-w|wyse60-43-w|wyse 60 132-column 43-lines:\
 wy60-vb|wyse60-vb|Wyse 60 visible bell:\
 	:bl@:tc=wy60:
 wy60-w-vb|wy60-wvb|wyse60-wvb|Wyse 60 132-column visible bell:\
-	:bl@:tc=wy60-w:
+	:bl@:\
+	:tc=wy60-w:
 
 #	The Wyse-99GT looks at lot like the Wyse 60 except that it
 #	does not have the 42/43 line mode.  In the Wyse-60 the "lines"
@@ -4089,9 +4114,9 @@ wy60-w-vb|wy60-wvb|wyse60-wvb|Wyse 60 132-column visible bell:\
 #
 wy99gt|wyse99gt|Wyse 99gt:\
 	:ms@:\
-	:al=\EE:cd=\Ey:ce=\Et:cl=\E+:dc=\EW:dl=\ER:i2=\Ew0:\
-	:ip=:nw@:r2=\E`\072:sf=\n:sr=\Ej:ta=\011:te=\Ew0:\
-	:ti=\Ew1:u0=\E~>\E8:u1=\E[42h:vb=\E`8\E`9:tc=wy60:
+	:al=\EE:cd=\Ey:ce=\Et:cl=\E+:dc=\EW:dl=\ER:i2=\Ew0:ip=:nw@:\
+	:r2=\E`\072:sf=\n:sr=\Ej:ta=\011:te=\Ew0:ti=\Ew1:\
+	:u0=\E~>\E8:u1=\E[42h:vb=\E`8\E`9:tc=wy60:
 #
 wy99gt-w|wyse99gt-w|wyse 99gt 132-column:\
 	:Nl#16:co#132:lw#7:ws#97:\
@@ -4109,7 +4134,8 @@ wy99gt-vb|wyse99gt-vb|Wyse 99gt visible bell:\
 	:bl@:tc=wy99gt:
 #
 wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell:\
-	:bl@:tc=wy99gt-w:
+	:bl@:\
+	:tc=wy99gt-w:
 #
 #	The Wyse 160 is combination of the WY-60 and the WY-99gt.
 #	The reset strings are slow and the pad times very depending
@@ -4119,9 +4145,9 @@ wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell:\
 #		<rs1> -> set personality
 #		<rs2> -> set number of columns
 #		<rs3> -> set number of lines
-#		<is1> -> select the proper font
-#		<is2> -> do the initialization
-#		<is3> -> set up display memory (2 pages)
+#		:i1: -> select the proper font
+#		:is: -> do the initialization
+#		:i3: -> set up display memory (2 pages)
 #
 #	The display memory may be used for either text or graphics.
 #	When "Display Memory = Shared" the terminal will have more pages
@@ -4137,18 +4163,17 @@ wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell:\
 wy160|wyse160|Wyse 160:\
 	:am:bw:hs:km:mi:ms:\
 	:co#80:li#24:ws#38:\
-	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
-	:do=^J:ds=\EF\r:ei=\Er:fs=^M:ho=\E{:i1=\EcB0\EcC1:\
-	:i2=\Ew0:im=\Eq:ip=:\
+	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=\E{:i1=\EcB0\EcC1:i2=\Ew0:im=\Eq:ip=:\
 	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
-	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:le=^H:ll=\E{^K:mb=\EG2:me=\E(\EH\003\EG0\EcD:\
-	:mh=\EGp:mr=\EG4:nd=^L:nw=\r\n:se=\EG0:sf=\n:so=\EGt:\
-	:sr=\Ej:st=\E1:ta=^I:te=\Ew0:ti=\Ew1:ts=\EF:ue=\EG0:\
-	:up=^K:us=\EG8:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=\E{^K:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=\n:\
+	:so=\EGt:sr=\Ej:st=\E1:ta=^I:te=\Ew0:ti=\Ew1:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
 #
 wy160-w|wyse160-w|wyse 160 132-column:\
 	:Nl#16:co#132:lw#7:ws#90:\
@@ -4163,8 +4188,9 @@ wy160-25-w|wyse160-25-w|wyse 160 132-column 25-lines:\
 #
 wy160-42|wyse160-42|wyse 160 80-column 42-lines:\
 	:li#42:\
-	:al=\EE:cd=\Ey:cl=\E+:dl=\ER:i1=\EcB2\EcC3:nw=\r\n:\
-	:r3=\Ee*:sf=\n:sr=\Ej:tc=wy160:
+	:al=\EE:cd=\Ey:cl=\E+:dl=\ER:i1=\EcB2\EcC3:nw=\r\n:r3=\Ee*:\
+	:sf=\n:sr=\Ej:\
+	:tc=wy160:
 wy160-42-w|wyse160-42-w|wyse 160 132-column 42-lines:\
 	:Nl#16:co#132:lw#7:ws#90:\
 	:cm=\Ea%i%dR%dC:dc=\EW:ip=:r2=\EeF\E`;:tc=wy160-42:
@@ -4179,7 +4205,8 @@ wy160-43-w|wyse160-43-w|wyse 160 132-column 43-lines:\
 wy160-vb|wyse160-vb|Wyse 160 visible bell:\
 	:bl@:tc=wy160:
 wy160-w-vb|wy160-wvb|wyse160-wvb|Wyse 160 132-column visible bell:\
-	:bl@:tc=wy160-w:
+	:bl@:\
+	:tc=wy160-w:
 #
 #	The Wyse 75 is a vt100 lookalike without advanced video.
 #
@@ -4200,19 +4227,18 @@ wy75|wyse75|wyse 75:\
 	:co#80:li#24:ma#1:pb#1201:ws#78:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
-	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
-	:ds=\E[>\\\054\001\001\E[>-\001\001:ec=\E[%dX:\
-	:ei=\E[4l:fs=^A:ho=\E[H:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E[>\\\054\001\001\E[>-\001\001:ec=\E[%dX:ei=\E[4l:\
+	:fs=^A:ho=\E[H:\
 	:i1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h:i2=\E[m:\
 	:im=\E[4h:ip=:is=\E>\E(B\E)0\017:k1=\E[?5i:k2=\E[?3i:\
-	:k3=\E[2i:k4=\E[@:k5=\E[M:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kI=\E[@:kN=\E[6~:kP=\E[5~:kb=^H:\
-	:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ks=\E[?1l\E[?7h\E=:ku=\E[A:le=^H:me=\E[m\017:\
-	:mh=\E[0t\E[2m:mr=\E[1t\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
-	:se=\E[m:sf=\n:so=\E[1t\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:k3=\E[2i:k4=\E[@:k5=\E[M:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
+	:k9=\E[20~:kI=\E[@:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[?1l\E[?7h\E=:ku=\E[A:le=^H:\
+	:me=\E[m\017:mh=\E[0t\E[2m:mr=\E[1t\E[7m:nd=\E[C:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=\n:so=\E[1t\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ts=\E[>\\\054\001:ue=\E[m:up=\E[A:us=\E[2t\E[4m:\
 	:vb=\E[30h\E\\\054\E[30l:ve=\E[?25h:vi=\E[?25l:
 #
@@ -4225,7 +4251,8 @@ wy75-mc|wyse75-mc|wyse 75 with magic cookies:\
 	:ae=\E[0p\017:as=\E[0p\016:i2=\E[m\E[p:mb=\E[2p:\
 	:me=\E[0p\017:mh=\E[1p:mk=\E[4p:mr=\E[16p:\
 	:..sa=\E[%{0}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{16}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{1}%|%;%?%p7%t%{4}%|%;%dp%?%p9%t\016%e\017%;:\
-	:se=\E[0p:so=\E[17p:ue=\E[0p:us=\E[8p:tc=wy75:
+	:se=\E[0p:so=\E[17p:ue=\E[0p:us=\E[8p:\
+	:tc=wy75:
 wy75-vb|wyse75-vb|wyse 75 with visible bell:\
 	:pb@:\
 	:bl@:tc=wy75:
@@ -4245,8 +4272,8 @@ wy75-wvb|wyse75-wvb|wyse 75 with visible bell 132 columns:\
 #	The terminal may have to be set for 8 data bits and 2 stop
 #	bits for the arrow keys to work.
 #	The Wyse 85 runs faster with XON/XOFF enabled.  Also the
-#	<dch> and <ich> work best when XON/XOFF is set.  <ich> and
-#	<dch> leave trash on the screen when used without XON/XOFF.
+#	:DC: and :IC: work best when XON/XOFF is set.  :IC: and
+#	:DC: leave trash on the screen when used without XON/XOFF.
 #
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
@@ -4256,21 +4283,20 @@ wy85|wyse85|wyse 85:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
-	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
-	:ds=\E[40l:ec=\E[%dX:ei=\E[4l:fs=\E[1;24r\E8:ho=\E[H:\
-	:i1=\E[62;1"p\E[?5W:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:\
-	:ip=:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[40l:\
+	:ec=\E[%dX:ei=\E[4l:fs=\E[1;24r\E8:ho=\E[H:\
+	:i1=\E[62;1"p\E[?5W:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:ip=:\
+	:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:kl=\E[D:\
-	:kr=\E[C:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
-	:rc=\E8:sc=\E7:se=\E[m:sf=\n:so=\E[7m:sr=\EM:st=\EH:\
-	:ta=\011:ts=\E[40h\E7\E[25;%i%p1%dH:ue=\E[m:up=\E[A:\
-	:us=\E[4m:vb=\E[30h\E\\\054\E[30l:ve=\E[?25h:\
-	:vi=\E[?25l:
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:kl=\E[D:kr=\E[C:\
+	:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=\n:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=\011:\
+	:ts=\E[40h\E7\E[25;%i%p1%dH:ue=\E[m:up=\E[A:us=\E[4m:\
+	:vb=\E[30h\E\\\054\E[30l:ve=\E[?25h:vi=\E[?25l:
 #
 #	Wyse 85 with visual bell.
 wy85-vb|wyse85-vb|wyse 85 with visible bell:\
@@ -4283,7 +4309,8 @@ wy85-w|wyse85-w|wyse 85 in 132-column mode:\
 #
 #	Wyse 85 in 132-column mode with visual bell.
 wy85-wvb|wyse85-wvb|wyse 85 with visible bell 132-columns:\
-	:bl@:tc=wy85-w:
+	:bl@:\
+	:tc=wy85-w:
 #
 #	Wyse 185 emulating a vt320 7 bit mode.
 #
@@ -4303,22 +4330,22 @@ wy185|wyse185|wyse 185:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
-	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
 	:ds=\E7\E[99;0H\E[K\E8:ec=\E[%dX:ei=\E[4l:\
 	:fs=\E[1;24r\E8:ho=\E[H:i1=\E[?5W:\
 	:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:ip=:\
 	:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:kl=\E[D:\
-	:kr=\E[C:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
-	:rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:\
-	:st=\EH:ta=^I:te=\E[ R:ti=\E[ Q:ts=\E7\E[99;%i%p1%dH:\
-	:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[30h\E\\\054\E[30l:\
-	:ve=\E[34h\E[?25h:vi=\E[?25l:vs=\E[?25h\E[34l:
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:kl=\E[D:kr=\E[C:\
+	:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:sf=\n:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=\E[ R:ti=\E[ Q:\
+	:ts=\E7\E[99;%i%p1%dH:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=\E[30h\E\\\054\E[30l:ve=\E[34h\E[?25h:vi=\E[?25l:\
+	:vs=\E[?25h\E[34l:
 #
 #	Wyse 185 with 24 data lines and top status (terminal status)
 wy185-24|wyse185-24|wyse 185 with 24 data lines:\
@@ -4332,8 +4359,7 @@ wy185-vb|wyse185-vb|wyse 185+flash:\
 #	Wyse 185 in 132-column mode.
 wy185-w|wyse185-w|wyse 185 in 132-column mode:\
 	:co#132:ws#132:\
-	:DC=\E[%dP:IC=\E[%d@:dc=\E[P:ei=:im=:ip=:\
-	:r2=\E[35h\E[?3h:tc=wy185:
+	:DC=\E[%dP:IC=\E[%d@:dc=\E[P:ei=:im=:ip=:r2=\E[35h\E[?3h:tc=wy185:
 #
 #	Wyse 185 in 132-column mode with visual bell.
 wy185-wvb|wyse185-wvb|wyse 185+flash+132 cols:\
@@ -4345,23 +4371,27 @@ wy185-wvb|wyse185-wvb|wyse 185+flash+132 cols:\
 # lines 25  columns 80
 #
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
-# (sgr removed to fit entry within 1023 bytes)
-# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
 wy325|wyse325|Wyse epc:\
-	:am:bw:hs:mi:\
-	:co#80:li#24:pb#9601:ws#45:\
-	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
-	:do=^J:ds=\EF\r:ei=\Er:fs=^M:ho=^^:i1=\EcB0\EcC1:\
-	:i2=\Ew0:im=\Eq:ip=:\
+	:5i:am:bw:hs:mi:\
+	:Nl#8:co#80:lh#1:li#24:lw#8:pb#9601:ws#45:\
+	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:F3=^AL\r:\
+	:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:LO=\EA10:RA=\Ed.:\
+	:SA=\Ed/:\
+	:ac=+/\\\054.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~:\
+	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=^^:i1=\EcB0\EcC1:i2=\Ew0:im=\Eq:ip=:\
 	:is=\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\Eq:\
-	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:le=^H:ll=^^^K:mb=\EG2:me=\E(\EH\003\EG0\EcD:mh=\EGp:\
-	:mr=\EG4:nd=^L:se=\EG0:sf=\n:so=\EGt:sr=\Ej:st=\E1:\
-	:ta=^I:te=\Ew0:ti=\Ew1:ts=\EF:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:kB=\EI:kD=\EW:\
+	:kE=\ET:kI=\Eq:kL=\ER:kN=\EK:kP=\EJ:kS=\EY:kb=^H:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:mp=\E):nd=^L:pf=^T:\
+	:pl=\EZ2%+?%s\177:pn=\Ez%+/%s\r:po=\Ed#:ps=\EP:\
+	:px=\EZ1%+?%s\177:r1=\E~!\E~4:r2=\EeF\E`\072:\
+	:r3=\EwG\Ee(:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=^I:te=\Ew0:\
+	:ti=\Ew1:ts=\EF:up=^K:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
 
 #
 # lines 24  columns 80  vb 
@@ -4391,7 +4421,8 @@ wy325-25w|wyse325-25w|wy325 132 columns:\
 # lines 25  columns 132  vb 
 #
 wy325-w-vb|wy325-wvb|wyse325-wvb|wyse-325 wide mode reverse video:\
-	:bl@:tc=wy325-w:
+	:bl@:\
+	:tc=wy325-w:
 
 #
 # lines 42  columns 80
@@ -4409,7 +4440,8 @@ wy325-42w|wyse325-42w|wyse-325 42 lines wide mode:\
 # lines 42  columns 132  vb 
 #
 wy325-42w-vb|wy325-42wvb|wyse-325 42 lines wide mode visual bell:\
-	:bl@:tc=wy325-w:
+	:bl@:\
+	:tc=wy325-w:
 #
 # lines 43  columns 80
 #
@@ -4426,7 +4458,8 @@ wy325-43w|wyse325-43w|wyse-325 43 lines wide mode:\
 # lines 43  columns 132  vb 
 #
 wy325-43w-vb|wy325-43wvb|wyse-325 43 lines wide mode visual bell:\
-	:bl@:tc=wy325-w:
+	:bl@:\
+	:tc=wy325-w:
 
 #	Wyse 370 -- 24 line screen with status line.
 #
@@ -4445,6 +4478,7 @@ wy325-43w-vb|wy325-43wvb|wyse-325 43 lines wide mode visual bell:\
 #	<u4> -> enter Tek 4207 ANSI mode (from any ANSI mode)
 #	<u5> -> exit  Tek 4207 mode (goto native ANSI mode)
 #
+# Bug: The <op> capability resets attributes.
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
 # (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
@@ -4452,51 +4486,51 @@ wy370-nk|wyse 370 without function keys:\
 	:am:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
-	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:do=^J:ds=\E[40l:ec=\E[%dX:ei=\E[4l:\
-	:fs=\E[1;24r\E8:ho=\E[H:i1=\E[90;1"p\E[?5W:\
-	:i2=\E>\017\E)0\E(B\E[63;0w\E[m:im=\E[4h:ip=:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[40l:\
+	:ec=\E[%dX:ei=\E[4l:fs=\E[1;24r\E8:ho=\E[H:\
+	:i1=\E[90;1"p\E[?5W:i2=\E>\017\E)0\E(B\E[63;0w\E[m:\
+	:im=\E[4h:ip=:\
 	:is=\E[2;4;20;30;40l\E[?1;10;16l\E[12h\E[?7;8;25h:\
-	:ke=\E>:ks=\E[?1l\E=:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
-	:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=\011:\
-	:te=\E[ R:ti=\E[ Q:ts=\E[40l\E[40h\E7\E[99;%i%p1%dH:\
-	:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[30h\E\\\054\E[30l:\
-	:ve=\E[34h\E[?25h:vi=\E[?25l:vs=\E[?25h\E[34l:
+	:ke=\E>:ks=\E[?1l\E=:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:sf=\n:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=\011:te=\E[ R:ti=\E[ Q:\
+	:ts=\E[40l\E[40h\E7\E[99;%i%p1%dH:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:vb=\E[30h\E\\\054\E[30l:ve=\E[34h\E[?25h:\
+	:vi=\E[?25l:vs=\E[?25h\E[34l:
 #
 #	Function key set for the ASCII (wy-50 compatible) keyboard
 #	This is the default 370.
 #
 wy370|wyse370|wy370-101k|Wyse 370 with 101 key keyboard:\
 	:@8=\EOM:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:k1=\E[?4i:k2=\E[?3i:k3=\E[2i:\
-	:k4=\E[@:k5=\E[M:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
-	:k9=\E[20~:k;=\E[21~:kA=\EOP:kB=\E[Z:kD=\EOQ:kI=\EOP:\
-	:kL=\EOQ:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:tc=wy370-nk:
+	:F5=\E[28~:F6=\E[29~:k1=\E[?4i:k2=\E[?3i:k3=\E[2i:k4=\E[@:\
+	:k5=\E[M:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
+	:k;=\E[21~:kA=\EOP:kB=\E[Z:kD=\EOQ:kI=\EOP:kL=\EOQ:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:tc=wy370-nk:
 #
 #	Function key set for the VT-320 (and wy85) compatible keyboard
 #
 wy370-105k|Wyse 370 with 105 key keyboard:\
-	:%1=\E[28~:*6=\E[4~:@0=\E[1~:@8=\EOM:F1=\E[23~:\
-	:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:\
-	:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:K1=\EOw:\
-	:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:k1=\EOP:k2=\EOQ:\
-	:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
-	:k9=\E[20~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[26~:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:l1=PF1:l2=PF2:l3=PF3:l4=PF4:tc=wy370-nk:
+	:%1=\E[28~:*6=\E[4~:@0=\E[1~:@8=\EOM:F1=\E[23~:F2=\E[24~:\
+	:F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:F7=\E[31~:\
+	:F8=\E[32~:F9=\E[33~:FA=\E[34~:K1=\EOw:K2=\EOu:K3=\EOy:\
+	:K4=\EOq:K5=\EOs:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kD=\E[3~:\
+	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[26~:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:l1=PF1:l2=PF2:l3=PF3:l4=PF4:\
+	:tc=wy370-nk:
 #
 #	Function key set for the PC compatible keyboard
 #
 wy370-EPC|Wyse 370 with 102 key keyboard:\
-	:@7=\E[1~:@8=\EOM:F1=\E[23~:F2=\E[24~:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[M:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:k;=\E[21~:kB=\E[Z:kI=\E[2~:\
-	:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:tc=wy370-nk:
+	:@7=\E[1~:@8=\EOM:F1=\E[23~:F2=\E[24~:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\E[M:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
+	:k9=\E[20~:k;=\E[21~:kB=\E[Z:kI=\E[2~:kN=\E[U:kP=\E[V:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:tc=wy370-nk:
 #
 #	Wyse 370 with visual bell.
 wy370-vb|Wyse 370 with visible bell:\
@@ -4524,14 +4558,14 @@ wy99gt-tek|Wyse 99gt Tektronix 4010/4014 emulator:\
 	:hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH\037:\
 	:ho=^]7`x @\037:\
 	:hu=\036DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\037:\
-	:is=\E8:le=^H:nd= :nw=^M^J:u0=\E~>\E8:u1=\E[42h:\
-	:up=^K:
+	:is=\E8:le=^H:nd= :nw=^M^J:u0=\E~>\E8:u1=\E[42h:up=^K:
 #
 #	Wyse 160 Tektronix 4010/4014 emulator,
 #
 wy160-tek|Wyse 160 Tektronix 4010/4014 emulator:\
 	:..cm=\035%{3103}%{91}%p1%*%-%Py\n%p2%{55}%*%Px\n%gy%{128}%/%{31}%&%{32}%+%c\n%gy%{3}%&%{4}%*%gx%{3}%&%+%{96}%+%c\n%gy%{004}%/%{31}%&%{96}%+%c\n%gx%{128}%/%{31}%&%{32}%+%c\n%gx%{004}%/%{31}%&%{64}%+%c\037:\
-	:ho=^]8`g @\037:tc=wy99gt-tek:
+	:ho=^]8`g @\037:\
+	:tc=wy99gt-tek:
 #
 #	Wyse 370 Tektronix 4010/4014 emulator,
 #
@@ -4544,22 +4578,176 @@ wy370-tek|Wyse 370 Tektronix 4010/4014 emulator:\
 	:hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH\037:\
 	:ho=^]8g @\037:\
 	:hu=\036DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\037:\
-	:is=\E8:kb=^H:kd=^J:kl=^H:kr=^I:ku=^K:le=^H:nd= :\
-	:nw=^M^J:u0=\E[?38h\E8:u1=\E[?38l\E)0:up=^K:
+	:is=\E8:kb=^H:kd=^J:kl=^H:kr=^I:ku=^K:le=^H:nd= :nw=^M^J:\
+	:u0=\E[?38h\E8:u1=\E[?38l\E)0:up=^K:
 
 # Vendor-supplied Wyse entries end here.
 
+#
+#TITLE:  TERMINFO ENTRY WY520
+#DATE:   8/5/93
+# The WY520 terminfo is based on the WY285 entry published on the WYSE 
+# BBS with the addition of more function keys and special keys.
+#
+#               rs1 -> set personality
+#               rs2 -> set number of columns
+#               rs3 -> set number of lines
+#               is1 -> select the proper font
+#               is2 -> do the initialization
+#               is3 -> If this string is empty then rs3 gets sent.
+#
+#       Wyse 520 emulating a vt420 7 bit mode with default ANSI keyboard
+#       - The BS key is programmed to generate BS in smcup since
+#         is2 doesn't seem to work.
+#       - Remove and shift/Remove: delete a character
+#       - Insert : enter insert mode
+#       - Find   : delete to end of file
+#       - Select : clear a line
+#       - F11, F12, F13: send default sequences (not ESC, BS, LF)
+#       - F14 : Home key
+#       - Bottom status line (host writable line) is used.
+#       - smkx,rmkx are removed because this would put the numeric
+#         keypad in Dec application mode which doesn't seem to work
+#         with SCO applications.
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy520|wyse520|wyse 520:\
+	:am:hs:km:mi:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[0$~:\
+	:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:ho=\E[H:i1=\E[?5W:\
+	:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:ip=:\
+	:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:kh=\E[26~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:te=\E[ R:ti=\E[ Q\E[?67;8h:ts=\E[2$~\E[1$}\E[%i%p1%d`:\
+	:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[34h\E[?25h:vi=\E[?25l:\
+	:vs=\E[?25h\E[34l:
+#
+#       Wyse 520 with 24 data lines and status (terminal status)
+wy520-24|wyse520-24|wyse 520 with 24 data lines:\
+	:hs@:\
+	:ds@:fs@:r3=\E[?5l\E[47h\E[40l\E[1;24r:ts@:tc=wy520:
+#
+#       Wyse 520 with visual bell.
+wy520-vb|wyse520-vb|wyse 520 with visible bell:\
+	:vb=\E[30h\E\\\054\E[30l:tc=wy520:
+#
+#       Wyse 520 in 132-column mode.
+wy520-w|wyse520-w|wyse 520 in 132-column mode:\
+	:co#132:ws#132:\
+	:DC=\E[%dP:IC=\E[%d@:dc=\E[P:ei=:im=:ip=:r2=\E[35h\E[?3h:tc=wy520:
+#
+#       Wyse 520 in 132-column mode with visual bell.
+wy520-wvb|wyse520-wvb|wyse 520 with visible bell 132-columns:\
+	:vb=\E[30h\E\\\054\E[30l:\
+	:tc=wy520-w:
+#
+#
+#       Wyse 520 emulating a vt420 7 bit mode.
+#       The DEL key is programmed to generate BS in is2.
+#       With EPC keyboard.
+#       - 'End' key will clear till end of line on EPC keyboard
+#       - Shift/End : ignored.
+#       - Insert : enter insert mode.
+#       - Delete : delete a character (have to change interrupt character
+#                  to CTRL-C: stty intr '^c') for it to work since the
+#                  Delete key sends 7FH.
+wy520-epc|wyse520-epc|wyse 520 with EPC kb:\
+	:@7=\E[4~:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:\
+	:k4=\E[14~:k5=\E[15~:kD=\177:kE=\E[4~:kh=\E[H:\
+	:tc=wy520:
+#
+#       Wyse 520 with 24 data lines and status (terminal status)
+#       with EPC keyboard.
+wy520-epc-24|wyse520-pc-24|wyse 520 with 24 data lines:\
+	:hs@:\
+	:ds@:fs@:r3=\E[?5l\E[47h\E[40l\E[1;24r:ts@:tc=wy520-epc:
+#
+#       Wyse 520 with visual bell.
+wy520-epc-vb|wyse520-pc-vb|wyse 520 with visible bell:\
+	:vb=\E[30h\E\\\054\E[30l:\
+	:tc=wy520-epc:
+#
+#       Wyse 520 in 132-column mode.
+wy520-epc-w|wyse520-epc-w|wyse 520 in 132-column mode:\
+	:co#132:ws#132:\
+	:DC=\E[%dP:IC=\E[%d@:dc=\E[P:ei=:im=:ip=:r2=\E[35h\E[?3h:tc=wy520-epc:
+#
+#       Wyse 520 in 132-column mode with visual bell.
+wy520-epc-wvb|wyse520-p-wvb|wyse 520 with visible bell 132-columns:\
+	:vb=\E[30h\E\\\054\E[30l:\
+	:tc=wy520-epc-w:
+#
+#       Wyse 520 in 80-column, 36 lines
+wy520-36|wyse520-36|wyse 520 with 36 data lines:\
+	:hs@:\
+	:li#36:\
+	:ds@:fs@:r3=\E[?5l\E[36*|\E[36t\E[40l\E[1;36r:ts@:tc=wy520:
+#
+#       Wyse 520 in 80-column, 48 lines
+wy520-48|wyse520-48|wyse 520 with 48 data lines:\
+	:hs@:\
+	:li#48:\
+	:ds@:fs@:r3=\E[?5l\E[48*|\E[48t\E[40l\E[1;48r:ts@:tc=wy520:
+#
+#       Wyse 520 in 132-column, 36 lines
+wy520-36w|wyse520-36w|wyse 520 with 36 data lines:\
+	:co#132:ws#132:\
+	:r2=\E[?3h:\
+	:r3=\E[?5l\E[36*|\E[36t\E[40l\E[1;36r\E[132$|:tc=wy520-36:
+#
+#       Wyse 520 in 132-column, 48 lines
+wy520-48w|wyse520-48w|wyse 520 with 48 data lines:\
+	:co#132:ws#132:\
+	:r2=\E[?3h:\
+	:r3=\E[?5l\E[48*|\E[48t\E[40l\E[1;48r\E[132$|:tc=wy520-48:
+#
+#
+#       Wyse 520 in 80-column, 36 lines with EPC keyboard
+wy520-36pc|wyse520-36pc|wyse 520 with 36 data lines:\
+	:hs@:\
+	:li#36:\
+	:ds@:fs@:r3=\E[?5l\E[36*|\E[36t\E[40l\E[1;36r:ts@:tc=wy520-epc:
+#
+#       Wyse 520 in 80-column, 48 lines with EPC keyboard
+wy520-48pc|wyse520-48pc|wyse 520 with 48 data lines:\
+	:hs@:\
+	:li#48:\
+	:ds@:fs@:r3=\E[?5l\E[48*|\E[48t\E[40l\E[1;48r:ts@:tc=wy520-epc:
+#
+#       Wyse 520 in 132-column, 36 lines with EPC keyboard
+wy520-36wpc|wyse520-36wpc|wyse 520 with 36 data lines:\
+	:co#132:ws#132:\
+	:r2=\E[?3h:\
+	:r3=\E[?5l\E[36*|\E[36t\E[40l\E[1;36r\E[132$|:tc=wy520-36pc:
+#
+#       Wyse 520 in 132-column, 48 lines with EPC keyboard
+wy520-48wpc|wyse520-48wpc|wyse 520 with 48 data lines:\
+	:co#132:ws#132:\
+	:r2=\E[?3h:\
+	:r3=\E[?5l\E[48*|\E[48t\E[40l\E[1;48r\E[132$|:tc=wy520-48pc:
+
 # From: John Gilmore <hoptoad!gnu@lll-crg.arpa>
+# (wyse-vp: removed :if=/usr/share/tabset/wyse-adds:, there's no such
+# file and we don't know what :st: is -- esr)
 wyse-vp|wyse|Wyse 50 in ADDS Viewpoint emulation mode with "enhance" on:\
 	:am:\
 	:co#80:it#8:li#24:\
-	:al=\EM:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:\
-	:dc=\EW:dl=\El:do=^J:ei=\Er:ho=^A:\
-	:if=/usr/share/tabset/wyse-adds:im=\Eq:\
-	:is=\E`\072\E`9\017\Er:kb=^H:kd=^J:kh=^A:kl=^U:kr=^F:\
-	:ku=^Z:le=^H:ll=^A^Z:nd=^F:nw=^M^J:\
-	:r1=\E`\072\E`9\017\Er:se=^O:sf=^J:so=^N:ta=^I:ue=^O:\
-	:up=^Z:us=^N:
+	:al=\EM:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dc=\EW:\
+	:dl=\El:do=^J:ei=\Er:ho=^A:im=\Eq:is=\E`\072\E`9\017\Er:\
+	:kb=^H:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A^Z:me=^O:\
+	:nd=^F:nw=^M^J:r1=\E`\072\E`9\017\Er:se=^O:sf=^J:so=^N:\
+	:ta=^I:ue=^O:up=^Z:us=^N:
 
 wy75ap|wyse75ap|wy-75ap|wyse-75ap|Wyse WY-75 Applications and Cursor keypad:\
 	:is=\E[1;24r\E[?10;3l\E[?1;25h\E[4l\E[m\E(B\E=:kb=^H:\
@@ -4568,12 +4756,12 @@ wy75ap|wyse75ap|wy-75ap|wyse-75ap|Wyse WY-75 Applications and Cursor keypad:\
 
 # From: Eric Freudenthal <freudent@eric.ultra.nyu.edu>
 wy100q|Wyse 100 for Quotron:\
-	:co#80:li#24:sg#1:ug#1:\
-	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :\
-	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:\
-	:is=\E`\072\200\EC\EDF\E0\E'\E(\EA21:kd=^J:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:so=\EG4:sr=\Ej:\
-	:ue=\EG0:up=^K:us=\EG8:
+	:co#80:li#24:sg#1:\
+	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :dc=\EW:\
+	:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:\
+	:is=\E`\072\200\EC\EDF\E0\E'\E(\EA21:kd=^J:kl=^H:kr=^L:\
+	:ku=^K:le=^H:mk@:nd=^L:sr=\Ej:up=^K:\
+	:tc=adm+sgr:
 
 #### Kermit terminal emulations
 #
@@ -4594,7 +4782,7 @@ kermit-am|standard kermit plus auto-margin:\
 	:am:\
 	:is=K1 Standard Kermit plus Automatic Margins\n:tc=kermit:
 # IBMPC Kermit 1.2.
-# Bugs: <ed>, <el>: do not work except at beginning of line!  <clear> does
+# Bugs: :cd:, :ce:: do not work except at beginning of line!  :cl: does
 # not work, but fake with :cl=\EH\EJ (since :cd=\EJ: works at beginning of
 # line).
 # From: greg small <gts@populi.berkeley.edu> 8-30-84
@@ -4613,7 +4801,8 @@ pckermit120|UCB IBMPC Kermit 1.20:\
 	:it#8:li#24:\
 	:al=\EL:dc=\EN:dl=\EM:do=\EB:ei@:im@:\
 	:is=\EO\Eq\EJ\EY7 K3 UCB IBMPC Kermit 1.20  12-19-84\n:\
-	:se=\Eq:so=\Ep:ta=^I:vs=\EO\Eq\EEK3:tc=kermit:
+	:se=\Eq:so=\Ep:ta=^I:vs=\EO\Eq\EEK3:\
+	:tc=kermit:
 # MS-DOS Kermit 2.27 for the IBMPC
 # Straight ascii keyboard. :sr=\EI: not avail. many versions + bug prone in vi.
 # Cannot use line 25, now acts funny like ansi special scrolling region.
@@ -4625,28 +4814,30 @@ pckermit120|UCB IBMPC Kermit 1.20:\
 msk227|mskermit227|MS-DOS Kermit 2.27 for the IBMPC:\
 	:am@:\
 	:co#80:it#8:li#24:\
-	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :dc=\EN:\
-	:dl=\EM:do=\EB:ei=\EO:ho=\EH:im=\E@:\
+	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :dc=\EN:dl=\EM:\
+	:do=\EB:ei=\EO:ho=\EH:im=\E@:\
 	:is=\EO\Eq\EG\Ew\EJ\EY7 K4 MS Kermit 2.27 for the IBMPC 3-17-85\n:\
-	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=\EC:rc=\Ek:\
-	:sc=\Ej:se=\Eq:so=\Ep:ta=^I:up=\EA:vs=\EO\Eq\EG\EwK4:
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=\EC:rc=\Ek:sc=\Ej:\
+	:se=\Eq:so=\Ep:ta=^I:up=\EA:vs=\EO\Eq\EG\EwK4:
 # MS-DOS Kermit 2.27 with automatic margins
 # From:	greg small <gts@populi.berkeley.edu> 3-17-85
 msk227am|mskermit227am|UCB MS-DOS Kermit 2.27 with automatic margins:\
 	:am:\
 	:is=\EO\Eq\EG\Ev\EJ\EY7 K5 MS Kermit 2.27 +automatic margins 3-17-85\n:\
-	:vs=\EO\Eq\EG\EvK5:tc=msk227:
+	:vs=\EO\Eq\EG\EvK5:\
+	:tc=msk227:
 # MS-DOS Kermit 2.27 UCB 227.14 for the IBM PC
-# Automatic margins now default.  Use ansi <sgr> for highlights.
+# Automatic margins now default.  Use ansi :sa: for highlights.
 # Define function keys.
 # (msk22714: removed obsolete ":kn#10:" -- esr)
 # From: greg small <gts@populi.berkeley.edu> 3-17-85
 msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC:\
 	:am:\
 	:is=\EO\Eq\EG\Ev\EJ\EY7 K6 MS Kermit 2.27 UCB 227.14 IBM PC 3-17-85\n:\
-	:k0=\E0:k1=\E1:k2=\E2:k3=\E3:k4=\E4:k5=\E5:k6=\E6:\
-	:k7=\E7:k8=\E8:k9=\E9:md=\E[1m:me=\E[m:mr=\E[7m:\
-	:se=\E[m:so=\E[1m:ue=\E[m:us=\E[4m:vs=\EO\Eq\EG\EvK6:tc=mskermit227:
+	:k0=\E0:k1=\E1:k2=\E2:k3=\E3:k4=\E4:k5=\E5:k6=\E6:k7=\E7:\
+	:k8=\E8:k9=\E9:md=\E[1m:me=\E[m:mr=\E[7m:se=\E[m:so=\E[1m:\
+	:ue=\E[m:us=\E[4m:vs=\EO\Eq\EG\EvK6:\
+	:tc=mskermit227:
 # This was designed for a VT320 emulator, but it is probably a good start
 # at support for the VT320 itself.
 # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
@@ -4657,41 +4848,40 @@ msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC:\
 vt320-k3|MS-Kermit 3.00's vt320 emulation:\
 	:am:es:hs:km:mi:ms:xn:\
 	:co#80:it#8:li#49:pb#9600:vt#3:\
-	:AL=\E[%dL:CC=\E:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
-	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:SR=\E[%dL:UP=\E[%dA:\
-	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[0$~:ec=\E[%dX:\
-	:ei=\E[4l:fs=\E[0$}:ho=\E[H:im=\E[4h:\
+	:AL=\E[%dL:CC=\E:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SR=\E[%dL:UP=\E[%dA:ae=\E(B:al=\E[L:\
+	:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E[0$~:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:ho=\E[H:im=\E[4h:\
 	:is=\E>\E F\E[?1l\E[?7h\E[r\E[2$~:k0=\E[21~:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
-	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:\
-	:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
+	:k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\
+	:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:\
+	:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ts=\E[1$}\r\E[K:ue=\E[24m:up=\E[A:us=\E[4m:\
 	:vb=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l:ve=\E[?25h:\
 	:vi=\E[?25l:
 # From: Joseph Gil <yogi@cs.ubc.ca> 13 Dec 1991
-# (I removed a bogus boolean :mo: and added <msgr>, <smam>, <rmam> -- esr)
+# ACS capabilities from Philippe De Muyter  <phdm@info.ucl.ac.be> 30 May 1996
+# (I removed a bogus boolean :mo: and added :ms:, <smam>, <rmam> -- esr)
 vt320-k311|dec vt320 series as defined by kermit 3.11:\
 	:am:es:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:vt#3:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
-	:al=3\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:do=^J:ds=\E[2$~\r\E[1$}\E[K\E[$}:\
-	:ei=\E[4l:fs=\E[$}:ho=\E[H:im=\E[4h:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=3\E[L:as=^N:bl=^G:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:\
+	:fs=\E[$}:ho=\E[H:im=\E[4h:\
 	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l1=pf1:l2=pf2:\
-	:l3=pf3:l4=pf4:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:nw=^M\ED:r1=\E[?3l:rc=\E8:\
-	:rf=/usr/lib/tabset/vt100:sc=\E7:se=\E[27m:sf=\ED:\
-	:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l1=pf1:l2=pf2:l3=pf3:l4=pf4:\
+	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:\
+	:r1=\E[?3l:rc=\E8:rf=/usr/share/tabset/vt100:sc=\E7:\
+	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:us=\E[4m:\
 	:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
 
@@ -4714,24 +4904,26 @@ vt320-k311|dec vt320 series as defined by kermit 3.11:\
 # the facilities to test them.  Let me know if they work, or don't.
 #
 # From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
-# (The <blink>/<bold>/<rev>/<smacs>/<smul>/<smso> capabilities exist only to
-# tell ncurses that the corresponding highlights exist; it should use <sgr>,
+# (The :mb:/:md:/:mr:/:as:/:us:/:so: capabilities exist only to
+# tell ncurses that the corresponding highlights exist; it should use :sa:,
 # which is the only method that will actually work for multiple highlights.)
 avatar0|avatar terminal emulator level 0:\
 	:am:ms:ut:\
 	:co#80:it#8:li#25:\
 	:as=:ce=^V^G:cm=\026\010%.%.:cr=^M:do=^V^D:le=^V^E:\
-	:mb=^A^V\177:md=^V^A^P:me=^V^A^G:mk=^V^A\200:\
-	:mr=^A^Vp:nd=^V^F:r2=^L:rp=\031%.%d:\
+	:mb=^A^V\177:md=^V^A^P:me=^V^A^G:mk=^V^A\200:mr=^A^Vp:\
+	:nd=^V^F:r2=^L:rp=\031%.%d:\
 	:..sa=\026\001%{0}%?%p1%t%{112}%|%;%?%p2%t%{1}%|%;%?%p3%t%{112}%|%;%?%p4%t{128}%|%;%?%p6%t%{16}%|%;:\
-	:sf=^J:so=^A^Vp:up=^V^C:us=^V^A:tc=klone+acs:
+	:sf=^J:so=^A^Vp:up=^V^C:us=^V^A:\
+	:tc=klone+acs:
 # From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
 avatar0+|avatar terminal emulator level 0+:\
 	:dc=^V^N:ei=\026\n\200\200\200\200:im=^V^I:tc=avatar0:
 # From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
 avatar|avatar1|avatar terminal emulator level 1:\
-	:RA=^V":SA=^V$:al=^V+:dl=^V-:ei=^V^P:ve=^V'^A:\
-	:vi=^V'^B:vs=^V^C:tc=avatar0+:
+	:RA=^V":SA=^V$:al=^V+:dl=^V-:ei=^V^P:ve=^V'^A:vi=^V'^B:\
+	:vs=^V^C:\
+	:tc=avatar0+:
 
 ######## OLDER TERMINAL TYPES
 #
@@ -4754,18 +4946,18 @@ att2300|sv80|AT&T 2300 Video Information Terminal 80 column mode:\
 	:co#80:it#8:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[11r:\
 	:F2=\E[12r:F3=\E[13r:F4=\E[14r:F5=\E[15r:F6=\E[16r:\
-	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:\
-	:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
-	:ho=\E[H:im=\E[4h:k1=\E[1r:k2=\E[2r:k3=\E[3r:\
-	:k4=\E[4r:k5=\E[5r:k6=\E[6r:k7=\E[7r:k8=\E[8r:\
-	:k9=\E[9r:k;=\E[10r:kA=\E[L:kB=\E[Z:kC=\E[J:kD=\E[P:\
-	:kI=\E[@:kL=\E[M:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:pf=\E[4i:po=\E[5i:ps=\E[0i:se=\E[m:sf=^J:so=\E[7m:\
-	:ta=^I:up=\E[A:
+	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:\
+	:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:k1=\E[1r:k2=\E[2r:k3=\E[3r:k4=\E[4r:k5=\E[5r:k6=\E[6r:\
+	:k7=\E[7r:k8=\E[8r:k9=\E[9r:k;=\E[10r:kA=\E[L:kB=\E[Z:\
+	:kC=\E[J:kD=\E[P:kI=\E[@:kL=\E[M:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:pf=\E[4i:po=\E[5i:ps=\E[0i:se=\E[m:sf=^J:so=\E[7m:ta=^I:\
+	:up=\E[A:
 att2350|AT&T 2350 Video Information Terminal 80 column mode:\
-	:pf@:po@:ps@:tc=att2300:
+	:pf@:po@:ps@:\
+	:tc=att2300:
 
 # Must setup RETURN KEY - CR, REC'VD LF - INDEX.
 # Seems upward compatible with vt100, plus ins/del line/char.
@@ -4776,33 +4968,32 @@ att2350|AT&T 2350 Video Information Terminal 80 column mode:\
 # note that half-bright blinking doesn't look different from normal blinking.
 # NOTE:you must program the function keys first, label second!
 # (att4410: a BSD entry has been seen with the following capabilities: 
-# <is2>=\E[?6l, <kf1>=\EOc, <kf2>=\EOd, <kf3>=\EOe, <kf4>=\EOg,
-# <kf6>=\EOh, <kf7>=\EOi, <kf8>=\EOj, -- esr)
+# :is=\E[?6l:, :k1=\EOc:, :k2=\EOd:, :k3=\EOe:, :k4=\EOg:,
+# :k6=\EOh:, :k7=\EOi:, :k8=\EOj:, -- esr)
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1:\
 	:am:hs:mi:ms:xo:\
 	:Nl#8:co#80:it#8:lh#2:li#24:lw#8:ws#80:\
 	:ac=``aaffhhggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~00++--\\\054\\\054..:\
-	:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=:fs=\E8:ho=\E[H:\
-	:i1=\E[?3l\E)0:\
+	:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=:fs=\E8:ho=\E[H:i1=\E[?3l\E)0:\
 	:i2=\E[1;03q   f1           \EOP\E[2;03q   f2           \EOQ\E[3;03q   f3           \EOR\E[4;03q   f4           \EOS\E[5;03q   f5           \EOT\E[6;03q   f6           \EOU\E[7;03q   f7           \EOV\E[8;03q   f8           \EOW:\
 	:ic=\E[@:im=:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:\
 	:k6=\EOU:k7=\EOV:k8=\EOW:kC=\E[2J:kH=\E[24;1H:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:ll=\E[24H:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:\
-	:mk=\E[8m:mr=\E[7m:nd=\E[C:nw=^M^J:\
-	:r2=\Ec\E[?3l\E[2;0y:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
-	:so=\E[7m:sr=\EM:ta=^I:ts=\E7\E[25;%p1%{1}%+%dH:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mk=\E[8m:\
+	:mr=\E[7m:nd=\E[C:nw=^M^J:r2=\Ec\E[?3l\E[2;0y:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
+	:ts=\E7\E[25;%p1%{1}%+%dH:ue=\E[m:up=\E[A:us=\E[4m:
 
 att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1:\
 	:co#132:ws#132:\
 	:i1=\E[?3h\E)0:r2=\Ec\E[?3h\E[2;0y:tc=att5410v1:
 
 att4410|att5410|tty5410|AT&T 4410/5410 80 columns - version 2:\
-	:..px=\E[%p1%d;%p2%l%02dq   f%p1%d           %p2%s:tc=att5410v1:
+	:..px=\E[%p1%d;%p2%l%02dq   f%p1%d           %p2%s:\
+	:tc=att5410v1:
 
 att5410-w|att4410-w|4410-w|tty5410-w|5410-w|AT&T 4410/5410 in 132 column mode:\
 	:co#132:ws#132:\
@@ -4813,18 +5004,17 @@ att5410-w|att4410-w|4410-w|tty5410-w|5410-w|AT&T 4410/5410 in 132 column mode:\
 v5410|5410 in terms of a vt100:\
 	:am:mi:ms:xo:\
 	:co#80:it#8:li#24:vt#3:\
-	:@8=\EOM:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
-	:RA=\E[?7l:SA=\E[?7h:\
+	:@8=\EOM:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:RA=\E[?7l:\
+	:SA=\E[?7h:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:eA=\E(B\E)0:ei=:\
-	:ho=\E[H:ic=\E[@:im=:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
-	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:\
-	:k;=\EOx:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\017:mr=\E[7m:nd=\E[C:\
-	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:eA=\E(B\E)0:ei=:ho=\E[H:\
+	:ic=\E[@:im=:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:kb=^H:\
+	:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\
+	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
 	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
 	:sc=\E7:se=\E[m:sf=^J:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:
@@ -4837,11 +5027,11 @@ v5410|5410 in terms of a vt100:\
 #
 # Has memory below (2 lines!)
 # 3 pages of memory (plus some spare)
-# The 5410 sequences for <cup>, <cvvis>, <dch>, <dl>, <ech>, <flash>, <home>,
-# <hpa>, <hts> would work for these, but these work in both scroll and window
+# The 5410 sequences for :cm:, :vs:, :DC:, :DL:, :ec:, :vb:, :ho:,
+# <hpa>, :st: would work for these, but these work in both scroll and window
 # mode... Unset insert character so insert mode works
-# <is1> sets 80 column mode,
-# <is2> escape sequence:
+# :i1: sets 80 column mode,
+# :is: escape sequence:
 # 1) turn off all fonts
 # 2) function keys off, keyboard lock off, control display off,
 #    insert mode off, erasure mode off,
@@ -4854,46 +5044,46 @@ v5410|5410 in terms of a vt100:\
 # We use \212 to program the ^J because a bare ^J will get translated by
 # UNIX into a CR/LF. The enter key is needed for AT&T uOMS.
 #     1      2            3              4     5     6    7  8
-# <is3> set screen color to black,
+# :i3: set screen color to black,
 # No representation in terminfo for the delete word key: kdw1=\Ed
 # Key capabilities assume the power-up send sequence...
-# This <rmcup> is not strictly necessary, but it helps maximize 
-# memory usefulness: <rmcup>=\Ez,
-# Alternate sgr0:	<sgr0>=\E[m\EW^O,
-# Alternate sgr:	<sgr>=\E[%?%p1%t2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t^N%e^O%;,
+# This :te: is not strictly necessary, but it helps maximize 
+# memory usefulness: :te=\Ez:,
+# Alternate sgr0:	:me=\E[m\EW^O:,
+# Alternate sgr:	:sa=\E[%?%p1%t2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t^N%e^O%;:,
 # smkx programs the SYS PF keys to send a set sequence.
 # It also sets up labels f1, f2, ..., f8, and sends edit keys.
-# This string causes them to send the strings <kf1>-<kf8>
+# This string causes them to send the strings :k1:-:k8:
 # when pressed in SYS PF mode.
 # (att4415: I added <rmam>/<smam> based on the init string -- esr)
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 att4415|tty5420|att5420|AT&T 4415/5420 80 cols:\
 	:db:mi:xo:\
 	:Nl#8:lh#2:lm#78:lw#8:ws#55:\
-	:@1=\Et:@7=\Ez:@8=\Eent:AL=\E[%dL:\
-	:CM=\E[%i%p1%d;%p2%dt:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
-	:IC=\E[%d@:LE=\E[%dD:LF=\E|:LO=\E~:RA=\E[?7l:\
-	:RI=\E[%dC:SA=\E[?7h:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:\
-	:bt=\E[Z:ch=\E[%+^AG:cl=\E[x\E[J:cm=\E[%i%d;%dx:\
-	:ct=\E[3g:cv=\E[%+^Ad:ec=\E[%ds\E[%dD:ei=\E[4l:\
-	:ho=\E[x:i1=\E[?3l:i2=\E[?5l:ic@:im=\E[4h:\
+	:@1=\Et:@7=\Ez:@8=\Eent:AL=\E[%dL:CM=\E[%i%p1%d;%p2%dt:\
+	:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:LF=\E|:\
+	:LO=\E~:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:SF=\E[%dE:SR=\E[%dF:\
+	:UP=\E[%dA:bt=\E[Z:ch=\E[%+^AG:cl=\E[x\E[J:\
+	:cm=\E[%i%d;%dx:ct=\E[3g:cv=\E[%+^Ad:ec=\E[%ds\E[%dD:\
+	:ei=\E[4l:ho=\E[x:i1=\E[?3l:i2=\E[?5l:ic@:im=\E[4h:\
 	:is=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[21;1j\212:\
-	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:\
-	:k7=\EOi:k8=\EOj:kA=\E[L:kB=\E[Z:kD=\E[P:kE=\E[2K:\
-	:kF=\E[T:kH=\Eu:kI=\E[4h:kL=\E[M:kN=\E[U:kP=\E[V:\
-	:kR=\E[S:ke=\E[19;0j\E[21;1j\212:\
-	:ks=\E[19;1j\E[21;4j\Eent:l1=F1:l2=F2:l3=F3:l4=F4:\
-	:l5=F5:l6=F6:l7=F7:l8=F8:ll=\Ew:me=\E[m\017:mp=\EV:\
-	:pf=\E[?9i:po=\E[?4i:ps=\E[?2i:st=\EH:\
-	:ts=\E7\E[25;%p1%{8}%+%dH:vb=\E[?5h\E[?5l:\
-	:ve=\E[11;0j:vs=\E[11;1j:tc=att4410:
+	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:\
+	:k8=\EOj:kA=\E[L:kB=\E[Z:kD=\E[P:kE=\E[2K:kF=\E[T:kH=\Eu:\
+	:kI=\E[4h:kL=\E[M:kN=\E[U:kP=\E[V:kR=\E[S:\
+	:ke=\E[19;0j\E[21;1j\212:ks=\E[19;1j\E[21;4j\Eent:\
+	:l1=F1:l2=F2:l3=F3:l4=F4:l5=F5:l6=F6:l7=F7:l8=F8:ll=\Ew:\
+	:me=\E[m\017:mp=\EV:pf=\E[?9i:po=\E[?4i:ps=\E[?2i:st=\EH:\
+	:ts=\E7\E[25;%p1%{8}%+%dH:vb=\E[?5h\E[?5l:ve=\E[11;0j:\
+	:vs=\E[11;1j:\
+	:tc=att4410:
 
 att4415-w|tty5420-w|att5420-w|AT&T 4415/5420 132 cols:\
 	:co#132:lm#54:ws#97:\
 	:i1=\E[?3h:tc=att4415:
 
 att4415-rv|tty5420-rv|att5420-rv|AT&T 4415/5420 80 cols/rv:\
-	:i2=\E[?5h:vb=\E[?5l\E[?5h:tc=att4415:
+	:i2=\E[?5h:vb=\E[?5l\E[?5h:\
+	:tc=att4415:
 
 att4415-w-rv|tty5420-w-rv|att5420-w-rv|AT&T 4415/5420 132 cols/rv:\
 	:co#132:lm#54:ws#97:\
@@ -4908,16 +5098,20 @@ att4415+nl|4415+nl|tty5420+nl|att5420+nl|generic AT&T 4415/5420 changes for not
 	:..px=\E[%p1%d;%p2%l%02d;0;1q   F%p1%d           %p2%s:
 
 att4415-nl|4415-nl|tty5420-nl|att5420-nl|AT&T 4415/5420 without changing labels:\
-	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:tc=att4415+nl:tc=att4415:
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:tc=att4415+nl:tc=att4415:
 
 att4415-rv-nl|tty5420-rv-nl|att5420-rv-nl|AT&T 4415/5420 reverse video without changing labels:\
-	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:tc=att4415+nl:tc=att4415-rv:
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:tc=att4415+nl:tc=att4415-rv:
 
 att4415-w-nl|tty5420-w-nl|att5420-w-nl|AT&T 4415/5420 132 cols without changing labels:\
-	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:tc=att4415+nl:tc=att4415-w:
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:tc=att4415+nl:tc=att4415-w:
 
 att4415-w-rv-n|tty5420-w-rv-n|att5420-w-rv-n|AT&T 4415/5420 132 cols reverse without changing labels:\
-	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:tc=att4415+nl:tc=att4415-w-rv:
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:tc=att4415+nl:tc=att4415-w-rv:
 
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
@@ -4927,19 +5121,19 @@ att5420_2|AT&T 5420 model 2 80 cols:\
 	:co#80:it#8:li#24:lm#78:ws#55:\
 	:AL=\E[%dL:CM=\E[%i%p1%d;%p2%dt:DC=\E[%dP:DL=\E[%dM:\
 	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:\
-	:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bt=\E[1Z:cd=\E[0J:\
-	:ce=\E[0K:cl=\EH\EJ:cm=\E[%i%d;%dH:cr=\EG:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[1B:\
-	:ec=\E[%ds\E[%dD:ei=:fs=\E8:ho=\E[H:\
+	:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bt=\E[1Z:cd=\E[0J:ce=\E[0K:\
+	:cl=\EH\EJ:cm=\E[%i%d;%dH:cr=\EG:cs=\E[%i%d;%dr:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=\E[1B:ec=\E[%ds\E[%dD:ei=:fs=\E8:\
+	:ho=\E[H:\
 	:i1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j\E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j\E[29;0j\E[1;24r:\
 	:ic=\E[@:im=:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:\
-	:k6=\EOh:k7=\EOi:k8=\EOj:kD=\E[P:kH=\Eu:kI=\E[4h:\
-	:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:ke=\E[19;0j:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ks=\E[19;1j:ku=\E[A:le=^H:ll=\Ew:\
-	:mb=\E[5m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[1C:\
-	:nw=^M^J:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
-	:st=\EH:ta=^I:ts=\E7\E[25;%p1%{8}%+%dH:ue=\E[m:\
-	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[11;0j:vs=\E[11;1j:
+	:k6=\EOh:k7=\EOi:k8=\EOj:kD=\E[P:kH=\Eu:kI=\E[4h:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\E[B:ke=\E[19;0j:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E[19;1j:ku=\E[A:le=^H:ll=\Ew:mb=\E[5m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[1C:nw=^M^J:rc=\E8:sc=\E7:se=\E[m:\
+	:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E7\E[25;%p1%{8}%+%dH:ue=\E[m:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[11;0j:vs=\E[11;1j:
 att5420_2-w|AT&T 5420 model 2 in 132 column mode:\
 	:co#132:\
 	:i1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;1j\E[6;0j\E[7;0j\E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j\E[29;0j\E[1;24r:tc=att5420_2:
@@ -4947,18 +5141,18 @@ att5420_2-w|AT&T 5420 model 2 in 132 column mode:\
 att4418|att5418|AT&T 5418 80 cols:\
 	:am:xo:\
 	:co#80:li#24:\
-	:@8=\E[:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
-	:F1=\E[n:F2=\E[o:F3=\E[H:F4=\E[I:F5=\E[J:F8=\E[K:\
-	:F9=\E[L:FA=\E[E:FB=\E[_:FC=\E[M:FD=\E[N:FE=\E[O:\
-	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:\
-	:al=\E[1L:as=^N:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[1P:dl=\E[M:do=\E[B:ei=:\
-	:ho=\E[H:i1=\E[?3l:ic=\E[1@:im=:is=\E)0\E?6l\E?5l:\
-	:k1=\E[h:k2=\E[i:k3=\E[j:k6=\E[k:k7=\E[l:k8=\E[f:\
-	:k9=\E[w:k;=\E[m:kC=\E[%:kd=\EU:kh=\Ec:kl=\E@:kr=\EA:\
-	:ku=\ES:le=\E[D:mb=\E[5m:me=\E[m\017:mh=\E[2m:\
-	:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
-	:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
+	:@8=\E[:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[n:\
+	:F2=\E[o:F3=\E[H:F4=\E[I:F5=\E[J:F8=\E[K:F9=\E[L:FA=\E[E:\
+	:FB=\E[_:FC=\E[M:FD=\E[N:FE=\E[O:IC=\E[%d@:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[1L:as=^N:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[1P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:i1=\E[?3l:ic=\E[1@:im=:is=\E)0\E?6l\E?5l:k1=\E[h:k2=\E[i:\
+	:k3=\E[j:k6=\E[k:k7=\E[l:k8=\E[f:k9=\E[w:k;=\E[m:kC=\E[%:\
+	:kd=\EU:kh=\Ec:kl=\E@:kr=\EA:ku=\ES:le=\E[D:mb=\E[5m:\
+	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
 att4418-w|att5418-w|AT&T 5418 132 cols:\
 	:co#132:\
 	:i1=\E[?3h:tc=att5418:
@@ -4966,12 +5160,12 @@ att4418-w|att5418-w|AT&T 5418 132 cols:\
 att4420|tty4420|teletype 4420:\
 	:da:db:eo:ms:ul:xo:\
 	:co#80:li#24:lm#72:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\Ez:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=\EG:dc=\EP:dl=\EM:dm@:do=\EB:ed@:ho=\EH:k0=\EU:\
-	:k3=\E@:kA=\EL:kB=\EO:kC=\EJ:kD=\EP:kF=\ES:kI=\E^:\
-	:kL=\EM:kR=\ET:kd=\EB:kh=\EH:kl=^H:kr=\EC:ku=\EA:\
-	:l0=segment advance:l3=cursor tab:le=\ED:nd=\EC:\
-	:se=\E~:sf=\EH\EM\EY7 :so=\E}:ue=\EZ:up=\EA:us=\E\\:
+	:al=\EL:bl=^G:cd=\EJ:ce=\Ez:cl=\EH\EJ:cm=\EY%+ %+ :cr=\EG:\
+	:dc=\EP:dl=\EM:dm@:do=\EB:ed@:ho=\EH:k0=\EU:k3=\E@:kA=\EL:\
+	:kB=\EO:kC=\EJ:kD=\EP:kF=\ES:kI=\E^:kL=\EM:kR=\ET:kd=\EB:\
+	:kh=\EH:kl=^H:kr=\EC:ku=\EA:l0=segment advance:\
+	:l3=cursor tab:le=\ED:nd=\EC:se=\E~:sf=\EH\EM\EY7 :so=\E}:\
+	:ue=\EZ:up=\EA:us=\E\\:
 
 #  The following is a termcap entry for the Teletype 4424
 #  asynchronous keyboard-display terminal.  It supports
@@ -4991,20 +5185,21 @@ att4424|tty4424|teletype 4424:\
 	:am:xo:\
 	:co#80:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\EL:\
-	:as=\E(0:bl=^G:bt=\EO:cd=\EJ:ce=\Ez:cl=\E[H\E[2J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\EF:dc=\EP:\
-	:dl=\EM:do=\EB:ei=:ho=\E[H:ic=\E^:im=:\
-	:is=\E[20l\E[?7h:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
-	:kC=\EJ:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:mb=\E3:md=\E3:me=\EX\E~\EZ\E4\E(B:\
-	:mh=\EW:mr=\E}:nd=\EC:nw=\EE:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E(B:al=\EL:as=\E(0:bl=^G:bt=\EO:cd=\EJ:ce=\Ez:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\EF:\
+	:dc=\EP:dl=\EM:do=\EB:ei=:ho=\E[H:ic=\E^:im=:\
+	:is=\E[20l\E[?7h:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kC=\EJ:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E3:\
+	:md=\E3:me=\EX\E~\EZ\E4\E(B:mh=\EW:mr=\E}:nd=\EC:nw=\EE:\
 	:..sa=\E[%?%p1%t7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p6%p4%|%t;5%;%?%p5%t;0%;m:\
-	:se=\E~:sf=^J:so=\E}:sr=\ET:st=\EH:ta=^I:ti=\E[1m:\
-	:ue=\EZ:up=\EA:us=\E\\:
+	:se=\E~:sf=^J:so=\E}:sr=\ET:st=\EH:ta=^I:ti=\E[1m:ue=\EZ:\
+	:up=\EA:us=\E\\:
 
 att4424-1|tty4424-1|teletype 4424 in display function group I:\
-	:kC@:kd=\EB:kh@:kl=\ED:kr=\EC:ku=\EA:tc=att4424:
+	:kC@:kd=\EB:kh@:kl=\ED:kr=\EC:ku=\EA:\
+	:tc=att4424:
 
 # This entry is not one of AT&T's official ones, it was translated from the
 # 4.4BSD termcap file.  The highlight strings are different from att4424.
@@ -5015,16 +5210,16 @@ att4424-1|tty4424-1|teletype 4424 in display function group I:\
 att4424m|tty4424m|teletype 4424M:\
 	:am:da:db:mi:\
 	:co#80:it#8:li#23:\
-	:al=\EL:bl=^G:ce=\E[K:cl=\E[2;H\E[J:\
-	:cm=\E[%i%2;%2H\E[B:cr=^M:dc=\EP:dl=\EM:do=^J:ei=:\
-	:ic=\E^:im=:ip=2:is=\E[m\E[2;24r:k1=\EOP:k2=\EOQ:\
-	:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:nw=^M^J:se=\E[m:sf=^J:\
-	:so=\E[7m:sr=\ET:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+	:al=\EL:bl=^G:ce=\E[K:cl=\E[2;H\E[J:cm=\E[%i%2;%2H\E[B:\
+	:cr=^M:dc=\EP:dl=\EM:do=^J:ei=:ic=\E^:im=:ip=2:\
+	:is=\E[m\E[2;24r:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:\
+	:nd=\E[C:nw=^M^J:se=\E[m:sf=^J:so=\E[7m:sr=\ET:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
 
 # The Teletype 5425 is really version 2 of the Teletype 5420. It 
 # is quite similar, except for some minor differences. No page 
-# mode, for example, so all of the <cup> sequences used above have 
+# mode, for example, so all of the :cm: sequences used above have 
 # to change back to what's being used for the 5410. Many of the 
 # option settings have changed their numbering as well.
 # 
@@ -5038,25 +5233,25 @@ att5425|tty5425|att4425|AT&T 4425/5425:\
 	:am:da:db:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:lm#78:ws#55:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:\
-	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%ds\E[%dD:\
-	:ei=\E[4l:fs=\E8:ho=\E[H:i1=\E<\E[?3l:i2=\E[?5l:\
-	:im=\E[4h:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:ae=^O:\
+	:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ec=\E[%ds\E[%dD:ei=\E[4l:fs=\E8:ho=\E[H:\
+	:i1=\E<\E[?3l:i2=\E[?5l:im=\E[4h:\
 	:is=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[25;1j\212:\
-	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:\
-	:k7=\EOi:k8=\EOj:kD=\E[P:kI=\E[4h:kb=^H:kd=\E[B:\
+	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:\
+	:k8=\EOj:kD=\E[P:kI=\E[4h:kb=^H:kd=\E[B:\
 	:ke=\E[21;0j\E[25;1j\212:kh=\E[H:kl=\E[D:kr=\E[C:\
 	:ks=\E[21;1j\E[25;4j\Eent\E~:ku=\E[A:le=^H:ll=\E[24H:\
 	:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:\
-	:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
-	:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ts=\E7\E[25;%p1%{8}%+%dH:ue=\E[m:up=\E[A:us=\E[4m:\
-	:vb=\E[?5h\E[?5l:ve=\E[12;0j:vs=\E[12;1j:
+	:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:\
+	:sr=\EM:st=\EH:ta=^I:ts=\E7\E[25;%p1%{8}%+%dH:ue=\E[m:\
+	:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[12;0j:\
+	:vs=\E[12;1j:
 
 att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels:\
-	:ks=\E[21;1j\E[25;4j\Eent:tc=att4425:
+	:ks=\E[21;1j\E[25;4j\Eent:\
+	:tc=att4425:
 
 att5425-w|att4425-w|tty5425-w|teletype 4425/5425 in 132 column mode:\
 	:co#132:lm#54:ws#97:\
@@ -5069,17 +5264,17 @@ att4426|tty4426|teletype 4426S:\
 	:co#80:li#24:lm#48:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:SF=\E[%dS:\
-	:SR=\E[%dT:UP=\E[%dA:ae=\E(B:al=\EL:as=\E(0:bl=^G:\
-	:cd=\E[J:ce=\E[0K:ch=\E[%dG:\
-	:cl=\E[H\E[2J\E[1U\E[H\E[2J\E[1V:cm=\E[%i%d;%dH:\
-	:cr=^M:ct=\E[3g:cv=\E[%dd:dc=\EP:dl=\E[M:do=\E[B:ei=:\
-	:ho=\E[H:i1=\Ec\E[?7h:ic=\E^:im=:is=\E[m\E[1;24r:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:\
-	:k7=\EOV:k8=\EOW:kB=\EO:kC=\E[2J:kH=\E[24;1H:kb=^H:\
-	:kd=\EB:kh=\E[H:kl=\ED:kr=\EC:ku=\EA:le=\E[D:\
-	:ll=\E[24H:md=\E[5m:me=\E[m\E(B:mr=\E[7m:nd=\E[C:\
-	:nw=^M^J:r2=\Ec\E[?3l\E[2;0y:rc=\E8:sc=\E7:se=\E[m:\
-	:sf=^J:so=\E[5m:sr=\ET:st=\E1:ta=^I:ue=\E[m:up=\EA:\
+	:SR=\E[%dT:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E(B:al=\EL:as=\E(0:bl=^G:cd=\E[J:ce=\E[0K:ch=\E[%dG:\
+	:cl=\E[H\E[2J\E[1U\E[H\E[2J\E[1V:cm=\E[%i%d;%dH:cr=^M:\
+	:ct=\E[3g:cv=\E[%dd:dc=\EP:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:i1=\Ec\E[?7h:ic=\E^:im=:is=\E[m\E[1;24r:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:kB=\EO:\
+	:kC=\E[2J:kH=\E[24;1H:kb=^H:kd=\EB:kh=\E[H:kl=\ED:kr=\EC:\
+	:ku=\EA:le=\E[D:ll=\E[24H:md=\E[5m:me=\E[m\E(B:mr=\E[7m:\
+	:nd=\E[C:nw=^M^J:r2=\Ec\E[?3l\E[2;0y:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[5m:sr=\ET:st=\E1:ta=^I:ue=\E[m:up=\EA:\
 	:us=\E[4m:
 
 # Terminfo entry for the AT&T 510 A Personal Terminal
@@ -5094,22 +5289,21 @@ att4426|tty4426|teletype 4426S:\
 att510a|510a|bct510a|510A|AT&T 510A Personal Terminal:\
 	:am:mi:ms:xn:xo:\
 	:Nl#8:co#80:lh#2:li#24:lw#7:\
-	:#4=\E[u:%i=\E[v:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\EOe:F2=\EOf:F3=\EOg:F4=\EOh:F5=\EOi:\
-	:F6=\EOj:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
+	:#4=\E[u:%i=\E[v:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
+	:F1=\EOe:F2=\EOf:F3=\EOg:F4=\EOh:F5=\EOi:F6=\EOj:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:\
 	:ac=hrisjjkkllmmnnqqttuuvvwwxx{{||}}~~-f\\\054h.e+g`b:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[0J:\
 	:ce=\E[0K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
 	:dc=\E[P:dl=\E[M:do=\E[1B:eA=\E(B\E)1:ff=^L:ho=\E[H:\
 	:i1=\E(B\E)1\E[2l:i2=\E[21;1|\212:k1=\EOm:k2=\EOV:\
-	:k3=\EOu:k4=\ENj:k5=\ENe:k6=\ENf:k7=\ENh:k8=\E[H:\
-	:k9=\EOc:k;=\EOd:kB=\E[Z:kF=\E[S:kR=\E[T:kb=^H:\
-	:kd=\E[B:ke=\E[19;0|:kl=\E[D:kr=\E[C:ks=\E[19;1|:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[2;7m:me=\E[m\017:\
-	:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:pf=\E[?8i:\
-	:po=\E[?4i:ps=\E[0i:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
-	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
-	:us=\E[4m:ve=\E[11;3|:vi=\E[11;0|:vs=\E[11;2|:
+	:k3=\EOu:k4=\ENj:k5=\ENe:k6=\ENf:k7=\ENh:k8=\E[H:k9=\EOc:\
+	:k;=\EOd:kB=\E[Z:kF=\E[S:kR=\E[T:kb=^H:kd=\E[B:ke=\E[19;0|:\
+	:kl=\E[D:kr=\E[C:ks=\E[19;1|:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:pf=\E[?8i:po=\E[?4i:ps=\E[0i:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[11;3|:vi=\E[11;0|:vs=\E[11;2|:
 
 # Terminfo entry for the AT&T 510 D Personal Terminal
 # Function keys 9 through 16 are accessed by bringing up the
@@ -5127,18 +5321,17 @@ att510d|510d|bct510d|510D|AT&T 510D Personal Terminal:\
 	:am:da:db:mi:ms:xn:xo:\
 	:co#80:li#24:lm#48:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
-	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[0J:ce=\E[0K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=\E[1B:ei=\E[4l:ff=^L:ho=\E[H:\
-	:i1=\E(B\E)1\E[5;0|:i2=\E[21;1|\212:im=\E[4h:k1=\EOm:\
-	:k2=\EOV:k3=\EOu:k4=\ENj:k5=\ENe:k6=\ENf:k7=\ENh:\
-	:k8=\E[H:k9=\EOc:kb=^H:kd=\E[B:ke=\E[19;0|:kl=\E[D:\
-	:kr=\E[C:ks=\E[19;1|:ku=\E[A:le=^H:ll=\E#2:mb=\E[5m:\
-	:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
-	:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
-	:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[11;3|:\
-	:vs=\E[11;2|:
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ae=^O:\
+	:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[0J:ce=\E[0K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[1B:\
+	:ei=\E[4l:ff=^L:ho=\E[H:i1=\E(B\E)1\E[5;0|:\
+	:i2=\E[21;1|\212:im=\E[4h:k1=\EOm:k2=\EOV:k3=\EOu:k4=\ENj:\
+	:k5=\ENe:k6=\ENf:k7=\ENh:k8=\E[H:k9=\EOc:kb=^H:kd=\E[B:\
+	:ke=\E[19;0|:kl=\E[D:kr=\E[C:ks=\E[19;1|:ku=\E[A:le=^H:\
+	:ll=\E#2:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[11;3|:vs=\E[11;2|:
 
 # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
@@ -5148,43 +5341,36 @@ att500|att513|500bct|513bct|AT&T 513 using page mode:\
 	:am:mi:ms:xn:xo:\
 	:co#80:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:\
-	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=%i\E[%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:ae=^O:\
+	:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
 	:i1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l:\
-	:im=\E[4h:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:\
-	:k6=\EOh:k7=\EOi:k8=\EOj:kD=\ENf:kI=\ENj:kN=\E[U:\
-	:kP=\E[V:kb=^H:kd=\E[B:ke=\E[19;0|\E[21;1|\212:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[19;1|\E[21;4|\Eent:\
-	:ku=\E[A:le=^H:ll=\E#2:mb=\E[5m:md=\E[2;7m:\
-	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:im=\E[4h:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:\
+	:k7=\EOi:k8=\EOj:kD=\ENf:kI=\ENj:kN=\E[U:kP=\E[V:kb=^H:\
+	:kd=\E[B:ke=\E[19;0|\E[21;1|\212:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E[19;1|\E[21;4|\Eent:ku=\E[A:le=^H:ll=\E#2:mb=\E[5m:\
+	:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[11;0|:vs=\E[11;1|:
 
 # 01-07-88
 # printer must be set to EMUL ANSI to accept ESC codes
-# <cuu1> stops at top margin
-# <is1> sets cpi 10,lpi 6,form 66,left 1,right 132,top 1,bottom 66,font
+# :up: stops at top margin
+# :i1: sets cpi 10,lpi 6,form 66,left 1,right 132,top 1,bottom 66,font
 #	and alt font ascii,wrap on,tabs cleared
-# <is2> disables newline on LF,Emphasized off
+# :is: disables newline on LF,Emphasized off
 # The <u0> capability sets form length
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
 att5310|att5320|AT&T Model 53210 or 5320 matrix printer:\
-	:YA:YD:\
-	:Ya#8192:Yi#10:Yj#12:Yk#100:Yl#72:Ym#120:co#132:it#8:\
-	:li#66:\
-	:DO=\E[%de:RI=\E[%da:\
-	:ZA=%?%p1%{10}%=%t\E[w%e%p1%{12}%=%t\E[2w%e%p1%{5}%=%t\E[5w%e%p1%{13}%=%p1%{14}%=%O%t\E[3w%e%p1%{16}%=%p1%{17}%=%O%t\E[4w%e%p1%{6}%=%t\E[6w%e%p1%{7}%=%t\E[7w%e%p1%{8}%=%t\E[8w%;:\
-	:ZB=%?%p1%{2}%=%t\E[4z%e%p1%{3}%=%t\E[5z%e%p1%{4}%=%t\E[6z%e%p1%{6}%=%t\E[z%e%p1%{8}%=%t\E[2z%e%p1%{12}%=%t\E[3z%;:\
-	:ZM=\E[5m:ZU=\E[m:\
-	:Zj=%?%p1%{0}%=%t\E(B%e%p1%{1}%=%t\E(A%e%p1%{2}%=%t\E(C%e%p1%{3}%=%t\E(D%e%p1%{4}%=%t\E(E%e%p1%{5}%=%t\E(H%e%p1%{6}%=%t\E(K%e%p1%{7}%=%t\E(R%e%p1%{8}%}%=%t\E(}%;:\
-	:Zl=\E[;%dr:Zm=\E[%+^As:Zn=\E[;%+^As:Zp=\E[%dr:\
-	:Zy=%?%p1%{0}%=%tusascii%e%p1%{1}%=%tenglish%e%p1%{2}%=%tfinnish%e%p1%{3}%=%tjapanese%e%p1%{4}%=%tnorwegian%e%p1%{5}%=%tswedish%e%p1%{6}%=%tgermanic%e%p1%{7:\
-	:ch=\E[%d`:cr=^M:cv=\E[%dd:do=^J:ff=^L:i1=\Ec:\
-	:is=\E[20l\r:nd= :ta=^I:u0=\E[%dt:up=\EM:
+	:co#132:it#8:li#66:\
+	:DO=\E[%de:RI=\E[%da:cr=^M:do=^J:ff=^L:i1=\Ec:is=\E[20l\r:\
+	:nd= :ta=^I:up=\EM:
 
 # 5620 terminfo  (2.0 or later ROMS with char attributes)
-# assumptions: <ind> (scroll forward one line) is only done at screen bottom
+# assumptions: :sf: (scroll forward one line) is only done at screen bottom
 # Be aware that older versions of the dmd have a firmware bug that affects
 # parameter defaulting; for this terminal, the 0 in \E[0m is not optional.
 # For more, see the 5620 FAQ maintained by David Breneman <daveb@dgtl.com>.
@@ -5193,13 +5379,12 @@ att5620|dmd|tty5620|ttydmd|5620|5620 terminal 88 columns:\
 	:co#88:it#8:li#70:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:SF=\E[%dS:\
 	:SR=\E[%dT:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
-	:ho=\E[H:ic=\E[@:im=:kC=\E[2J:kH=\E[70;1H:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:md=\E[2m:me=\E[0m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^J:\
-	:..px=\E[%p1%d;%p2%l%dq%p2%s:r1=\Ec:rc=\E8:sc=\E7:\
-	:se=\E[0m:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:ue=\E[0m:\
-	:up=\E[A:us=\E[4m:
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:ic=\E[@:im=:kC=\E[2J:kH=\E[70;1H:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md=\E[2m:me=\E[0m:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=^J:..px=\E[%p1%d;%p2%l%dq%p2%s:\
+	:r1=\Ec:rc=\E8:sc=\E7:se=\E[0m:sf=\E[S:so=\E[7m:sr=\E[T:\
+	:ta=^I:ue=\E[0m:up=\E[A:us=\E[4m:
 att5620-24|dmd-24|teletype dmd 5620 in a 24x80 layer:\
 	:li#24:tc=att5620:
 att5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer:\
@@ -5215,32 +5400,32 @@ att5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer:\
 att605|605bct|AT&T 605  80 column  102key keyboard:\
 	:am:eo:xo:\
 	:co#80:li#24:ws#80:\
-	:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:ae=^O:al=\E[L:\
-	:as=\E)0\016:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
-	:do=\E[B:ei=\E[4l:fs=\E8:\
+	:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:ae=^O:al=\E[L:as=\E)0\016:\
+	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:fs=\E8:\
 	:i1=\E[8;0|\E[?\E[13;20l\E[?\E[12h:ic=\E[@:im=\E[4h:\
 	:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:\
-	:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kD=\E[P:kI=\E[@:\
-	:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:ta=^I:\
-	:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:us=\E[4m:
+	:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kD=\E[P:kI=\E[@:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[7m:ta=^I:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 att605-pc|605bct-pc|ATT 605 in pc term mode:\
-	:@7=\E[F:AL=\E[L:S4=250\E[?11l\E[50;1|:\
-	:S5=400\E[50;0|:XF=g:XN=e:\
+	:@7=\E[F:AL=\E[L:S4=250\E[?11l\E[50;1|:S5=400\E[50;0|:\
+	:XF=g:XN=e:\
 	:ac=k\277l\332m\300j\331n\305w\302q\304u\264t\303v\301x\263:\
-	:al=\E[L:bt=\E[Z:dc=\E[P:dl=\E[M:do=\E[B:ei=:ic=\E[@:\
-	:im=:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:\
-	:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:kB=\E[Z:kD=\E[P:\
-	:kI=\E[@:kL=\E[M:kN=\E[G:kP=\E[I:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:nd=\E[C:up=\E[A:tc=att605:
+	:al=\E[L:bt=\E[Z:dc=\E[P:dl=\E[M:do=\E[B:ei=:ic=\E[@:im=:\
+	:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:\
+	:k8=\E[T:k9=\E[U:k;=\E[V:kB=\E[Z:kD=\E[P:kI=\E[@:kL=\E[M:\
+	:kN=\E[G:kP=\E[I:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=\E[D:nd=\E[C:up=\E[A:\
+	:tc=att605:
 att605-w|605bct-w|AT&T 605-w 132 column 102 key keyboard:\
 	:co#132:ws#132:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h\E(B\E)0:tc=att605:
 # (att610: I added <rmam>/<smam> based on the init string.  I also
-# added <indn> and <rin> because the BSD file says the 615s have them,
+# added :SF: and :SR: because the BSD file says the 615s have them,
 # and the 615 is like a 610 with a big keyboard, and most of their other
 # smart terminals support the same sequence -- esr)
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
@@ -5250,17 +5435,16 @@ att610|610bct|AT&T 610; 80 column; 98key keyboard:\
 	:am:es:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
-	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ae=^O:\
+	:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
 	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0:\
-	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:\
-	:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
-	:k9=\ENo:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:\
+	:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
 	:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:us=\E[4m:\
 	:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
 	:vs=\E[?12;25h:
@@ -5269,40 +5453,41 @@ att610-w|610bct-w|AT&T 610; 132 column; 98key keyboard:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att610:
 
 att610-103k|610-103k|610bct-103k|AT&T 610; 80 column; 103key keyboard:\
-	:!1=\EOO:!2=\EOP:!3=\EOS:#1=\EOM:%0=\EOt:%1=\EOm:\
-	:%2=\ENi:%3=\EOl:%4=\ENc:%5=\ENh:%6=\EOv:%7=\EOr:\
-	:%8=\ENg:%9=\EOz:%a=\EOL:%b=\ENC:%c=\ENH:%d=\EOR:\
-	:%e=\ENG:%f=\EOZ:%g=\EOT:%h=\EOY:%j=\EOQ:&0=\EOW:\
-	:&1=\EOb:&2=\ENa:&3=\EOy:&4=\EOB:&5=\EOq:&6=\EOo:\
-	:&7=\EOp:&8=\EOs:&9=\ENB:*0=\EOX:*1=\EOU:*2=\END:\
-	:*3=\EON:*4=\ENF:*5=\ENE:*6=\ENI:*7=\ENN:*8=\EOA:\
-	:*9=\EOK:@0=\EOx:@1=\E9:@2=\EOw:@3=\EOV:@4=\EOu:\
-	:@5=\ENd:@6=\EOn:@7=\E0:@8=^M:@9=\EOk:F1@:F2@:F3@:\
-	:F4@:k9@:k;@:kD=\ENf:kE=\EOa:kI=\ENj:kL=\ENe:kM=\ENj:\
-	:kN=\E[U:kP=\E[V:tc=att610:
+	:!1=\EOO:!2=\EOP:!3=\EOS:#1=\EOM:%0=\EOt:%1=\EOm:%2=\ENi:\
+	:%3=\EOl:%4=\ENc:%5=\ENh:%6=\EOv:%7=\EOr:%8=\ENg:%9=\EOz:\
+	:%a=\EOL:%b=\ENC:%c=\ENH:%d=\EOR:%e=\ENG:%f=\EOZ:%g=\EOT:\
+	:%h=\EOY:%j=\EOQ:&0=\EOW:&1=\EOb:&2=\ENa:&3=\EOy:&4=\EOB:\
+	:&5=\EOq:&6=\EOo:&7=\EOp:&8=\EOs:&9=\ENB:*0=\EOX:*1=\EOU:\
+	:*2=\END:*3=\EON:*4=\ENF:*5=\ENE:*6=\ENI:*7=\ENN:*8=\EOA:\
+	:*9=\EOK:@0=\EOx:@1=\E9:@2=\EOw:@3=\EOV:@4=\EOu:@5=\ENd:\
+	:@6=\EOn:@7=\E0:@8=^M:@9=\EOk:F1@:F2@:F3@:F4@:k9@:k;@:kD=\ENf:\
+	:kE=\EOa:kI=\ENj:kL=\ENe:kM=\ENj:kN=\E[U:kP=\E[V:\
+	:tc=att610:
 att610-103k-w|610-103k-w|610bct-103k-w|AT&T 610; 132 column; 103key keyboard:\
 	:co#132:ws#132:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att610-103k:
 att615|615mt|AT&T 615; 80 column; 98key keyboard:\
-	:#4=\E[ A:%i=\E[ @:F5=\EOC:F6=\EOD:F7=\EOE:F8=\EOF:\
-	:F9=\EOG:FA=\EOH:FB=\EOI:FC=\EOJ:FD=\ENO:FE=\ENP:\
-	:FF=\ENQ:FG=\ENR:FH=\ENS:FI=\ENT:FJ=\EOP:FK=\EOQ:\
-	:FL=\EOR:FM=\EOS:FN=\EOw:FO=\EOx:FP=\EOy:FQ=\EOm:\
-	:FR=\EOt:FS=\EOu:FT=\EOv:FU=\EOl:FV=\EOq:FW=\EOr:\
-	:FX=\EOs:FY=\EOp:FZ=\EOn:Fa=\EOM:tc=att610:
+	:#4=\E[ A:%i=\E[ @:F5=\EOC:F6=\EOD:F7=\EOE:F8=\EOF:F9=\EOG:\
+	:FA=\EOH:FB=\EOI:FC=\EOJ:FD=\ENO:FE=\ENP:FF=\ENQ:FG=\ENR:\
+	:FH=\ENS:FI=\ENT:FJ=\EOP:FK=\EOQ:FL=\EOR:FM=\EOS:FN=\EOw:\
+	:FO=\EOx:FP=\EOy:FQ=\EOm:FR=\EOt:FS=\EOu:FT=\EOv:FU=\EOl:\
+	:FV=\EOq:FW=\EOr:FX=\EOs:FY=\EOp:FZ=\EOn:Fa=\EOM:\
+	:tc=att610:
 att615-w|615-w|615mt-w|AT&T 615; 132 column; 98key keyboard:\
-	:#4=\E[ A:%i=\E[ @:F5=\EOC:F6=\EOD:F7=\EOE:F8=\EOF:\
-	:F9=\EOG:FA=\EOH:FB=\EOI:FC=\EOJ:FD=\ENO:FE=\ENP:\
-	:FF=\ENQ:FG=\ENR:FH=\ENS:FI=\ENT:FJ=\EOP:FK=\EOQ:\
-	:FL=\EOR:FM=\EOS:FN=\EOw:FO=\EOx:FP=\EOy:FQ=\EOm:\
-	:FR=\EOt:FS=\EOu:FT=\EOv:FU=\EOl:FV=\EOq:FW=\EOr:\
-	:FX=\EOs:FY=\EOp:FZ=\EOn:Fa=\EOM:tc=att610-w:
+	:#4=\E[ A:%i=\E[ @:F5=\EOC:F6=\EOD:F7=\EOE:F8=\EOF:F9=\EOG:\
+	:FA=\EOH:FB=\EOI:FC=\EOJ:FD=\ENO:FE=\ENP:FF=\ENQ:FG=\ENR:\
+	:FH=\ENS:FI=\ENT:FJ=\EOP:FK=\EOQ:FL=\EOR:FM=\EOS:FN=\EOw:\
+	:FO=\EOx:FP=\EOy:FQ=\EOm:FR=\EOt:FS=\EOu:FT=\EOv:FU=\EOl:\
+	:FV=\EOq:FW=\EOr:FX=\EOs:FY=\EOp:FZ=\EOn:Fa=\EOM:\
+	:tc=att610-w:
 att615-103k|615-103k|615mt-103k|AT&T 615; 80 column; 103key keyboard:\
-	:#4=\E[ A:%i=\E[ @:tc=att610-103k:
+	:#4=\E[ A:%i=\E[ @:\
+	:tc=att610-103k:
 att615-103k-w|615-103k-w|615mt-103k-w|AT&T 615; 132 column; 103key keyboard:\
-	:#4=\E[ A:%i=\E[ @:tc=att610-103k-w:
+	:#4=\E[ A:%i=\E[ @:\
+	:tc=att610-103k-w:
 # (att620: I added <rmam>/<smam> based on the init string and
-# <rin>/<indn> from a BSD termcap -- esr)
+# :SR:/:SF: from a BSD termcap -- esr)
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
 # (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
@@ -5311,59 +5496,54 @@ att620|620mtg|AT&T 620; 80 column; 98key keyboard:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
-	:ae=\E(B\017:al=\E[L:as=\E)0\016:bl=^G:bt=\E[Z:\
-	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:\
-	:fs=\E8:ho=\E[H:\
+	:ae=\E(B\017:al=\E[L:as=\E)0\016:bl=^G:bt=\E[Z:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
 	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h:\
-	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:\
-	:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
-	:k9=\ENo:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\E(B\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
-	:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
-	:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:us=\E[4m:\
-	:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:\
+	:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\E(B\017:mh=\E[2m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:\
+	:sr=\EM:ta=^I:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:\
+	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
 	:vs=\E[?12;25h:
 att620-w|620-w|620mtg-w|AT&T 620; 132 column; 98key keyboard:\
 	:co#132:ws#132:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att620:
 att620-103k|620-103k|620mtg-103k|AT&T 620; 80 column; 103key keyboard:\
-	:!1=\EOO:!2=\EOP:!3=\EOS:#1=\EOM:%0=\EOt:%1=\EOm:\
-	:%2=\ENi:%3=\EOl:%4=\ENc:%5=\ENh:%6=\EOv:%7=\EOr:\
-	:%8=\ENg:%9=\EOz:%a=\EOL:%b=\ENC:%c=\ENH:%d=\EOR:\
-	:%e=\ENG:%f=\EOZ:%g=\EOT:%h=\EOY:%j=\EOQ:&0=\EOW:\
-	:&1=\EOb:&2=\ENa:&3=\EOy:&4=\EOB:&5=\EOq:&6=\EOo:\
-	:&7=\EOp:&8=\EOs:&9=\ENB:*0=\EOX:*1=\EOU:*2=\END:\
-	:*3=\EON:*4=\ENF:*5=\ENE:*6=\ENI:*7=\ENN:*8=\EOA:\
-	:*9=\EOK:@0=\EOx:@1=\E9:@2=\EOw:@3=\EOV:@4=\EOu:\
-	:@5=\ENd:@6=\EOn:@7=\E0:@8=^M:@9=\EOk:F1@:F2@:F3@:\
-	:F4@:F5@:F6@:F7@:F8@:F9@:FA@:FB@:FC@:FD@:FE@:FF@:FG@:\
-	:FH@:FI@:FJ@:FK@:FL@:FM@:FN@:FO@:FP@:FQ@:FR@:FS@:FT@:\
-	:FU@:FV@:FW@:FX@:FY@:FZ@:Fa@:k9@:k;@:kD=\ENf:kE=\EOa:\
-	:kI=\ENj:kL=\ENe:kM=\ENj:kN=\E[U:kP=\E[V:tc=att620:
+	:!1=\EOO:!2=\EOP:!3=\EOS:#1=\EOM:%0=\EOt:%1=\EOm:%2=\ENi:\
+	:%3=\EOl:%4=\ENc:%5=\ENh:%6=\EOv:%7=\EOr:%8=\ENg:%9=\EOz:\
+	:%a=\EOL:%b=\ENC:%c=\ENH:%d=\EOR:%e=\ENG:%f=\EOZ:%g=\EOT:\
+	:%h=\EOY:%j=\EOQ:&0=\EOW:&1=\EOb:&2=\ENa:&3=\EOy:&4=\EOB:\
+	:&5=\EOq:&6=\EOo:&7=\EOp:&8=\EOs:&9=\ENB:*0=\EOX:*1=\EOU:\
+	:*2=\END:*3=\EON:*4=\ENF:*5=\ENE:*6=\ENI:*7=\ENN:*8=\EOA:\
+	:*9=\EOK:@0=\EOx:@1=\E9:@2=\EOw:@3=\EOV:@4=\EOu:@5=\ENd:\
+	:@6=\EOn:@7=\E0:@8=^M:@9=\EOk:F1@:F2@:F3@:F4@:F5@:F6@:F7@:F8@:\
+	:F9@:FA@:FB@:FC@:FD@:FE@:FF@:FG@:FH@:FI@:FJ@:FK@:FL@:FM@:FN@:FO@:FP@:\
+	:FQ@:FR@:FS@:FT@:FU@:FV@:FW@:FX@:FY@:FZ@:Fa@:k9@:k;@:kD=\ENf:\
+	:kE=\EOa:kI=\ENj:kL=\ENe:kM=\ENj:kN=\E[U:kP=\E[V:\
+	:tc=att620:
 
 att620-103k-w|620-103k-w|620mtg-103k-w|AT&T 620; 132 column; 103key keyboard:\
 	:co#132:ws#132:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att620-103k:
 
-# (att630: added <ich1>, <blink> and <dim> from a BSD termcap file -- esr)
+# (att630: added :ic:, :mb: and :mh: from a BSD termcap file -- esr)
 att630|5630|5630DMD|630MTG|AT&T 630 windowing terminal:\
 	:NP:am:da:db:mi:ms:xo:\
 	:co#80:it#8:li#60:lm#0:\
-	:@8=^M:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
-	:F1=\ENq:F2=\ENr:F3=\ENs:F4=\ENt:F5=\ENu:F6=\ENv:\
-	:F7=\ENw:F8=\ENx:F9=\ENy:FA=\ENz:FB=\EN{:FC=\EN|:\
-	:FD=\EN}:FE=\EN~:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:\
-	:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:al=\E[L:bl=^G:bt=\E[Z:\
-	:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
-	:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
-	:ic=\E[@:im=\E[4h:is=\E[m:k9=\ENo:k;=\ENp:kA=\E[L:\
-	:kB=\E[Z:kC=\E[2J:kD=\E[P:kI=\E[@:kL=\E[M:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:mb=\E[5m:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^M^J:\
-	:pf=\E[?4i:po=\E[?5i:..px=\E[%p1%d;%p2%l%dq%p2%s:\
-	:r2=\Ec:rc=\E8:\
+	:@8=^M:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\ENq:\
+	:F2=\ENr:F3=\ENs:F4=\ENt:F5=\ENu:F6=\ENv:F7=\ENw:F8=\ENx:\
+	:F9=\ENy:FA=\ENz:FB=\EN{:FC=\EN|:FD=\EN}:FE=\EN~:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:al=\E[L:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:is=\E[m:k9=\ENo:k;=\ENp:\
+	:kA=\E[L:kB=\E[Z:kC=\E[2J:kD=\E[P:kI=\E[@:kL=\E[M:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^M^J:pf=\E[?4i:\
+	:po=\E[?5i:..px=\E[%p1%d;%p2%l%dq%p2%s:r2=\Ec:rc=\E8:\
 	:..sa=\E[0%?%p2%t;4%;%?%p1%p3%|%p4%|%p5%|%t;7%;m:\
 	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
 	:up=\E[A:us=\E[4m:
@@ -5371,13 +5551,13 @@ att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines:\
 	:li#24:tc=att630:
 
 # This entry was modified 3/13/90 by JWE.
-# fixes include additions of <enacs>, correcting <rep>, and modification
+# fixes include additions of <enacs>, correcting :rp:, and modification
 # of <kHOM>.  (See comments below)
 # att730 has status line of 80 chars
-# These were commented out: <indn>=\E[%p1%dS, <rin>=\E[%p1%dT,
+# These were commented out: :SF=\E[%p1%dS:, :SR=\E[%p1%dT:,
 # the <kf25> and up keys are used for shifted system Fkeys
 # NOTE: JWE 3/13/90 The 98 key keyboard translation for shift/HOME is 
-# currently the same as <khome> (unshifted HOME or \E[H).  On the 102, 102+1
+# currently the same as :kh: (unshifted HOME or \E[H).  On the 102, 102+1
 # and 122 key keyboards, the 730's translation is \E[2J.  For consistency
 # <kHOM> has been commented out.  The user can uncomment <kHOM> if using the
 # 102, 102+1, or 122 key keyboards
@@ -5390,18 +5570,17 @@ att730|730MTG|AT&T 730 windowing terminal:\
 	:am:da:db:es:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#60:lm#0:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
-	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
-	:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:fs=\E8:\
+	:ho=\E[H:\
 	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B:\
-	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:\
-	:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
-	:k9=\ENo:kI=\E[@:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
-	:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\
-	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
-	:ts=\E7\E[;%i%p1%dx:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:\
+	:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kI=\E[@:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
+	:ta=^I:ts=\E7\E[;%i%p1%dx:ue=\E[24m:up=\E[A:us=\E[4m:\
 	:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
 	:vs=\E[?12;25h:
 att730-41|730MTG-41|AT&T 730-41 windowing terminal Version:\
@@ -5410,7 +5589,8 @@ att730-24|730MTG-24|AT&T 730-24 windowing terminal Version:\
 	:li#24:tc=att730:
 att730r|730MTGr|AT&T 730 rev video windowing terminal Version:\
 	:i1=\E[8;0|\E[?3;4;13;15l\E[?5h\E[13;20l\E[?7h\E[12h\E(B\E)B:\
-	:vb=\E[?5l\E[?5h:tc=att730:
+	:vb=\E[?5l\E[?5h:\
+	:tc=att730:
 att730r-41|730MTG-41r|AT&T 730r-41 rev video windowing terminal Version:\
 	:li#41:tc=att730r:
 att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version:\
@@ -5581,20 +5761,21 @@ att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version:\
 att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal:\
 	:am:xo:\
 	:co#80:it#8:li#24:\
-	:&2=\E[27s:@4=\E!:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F8=\E[18s:F9=\E[19s:FA=\E[20s:FB=\E[21s:\
-	:FC=\E[22s:FD=\E[23s:FE=\E24s:FG=\E26s:LE=\E[%dD:\
-	:RA=\E[11;1j:RI=\E[%dC:SA=\E[11;0j:UP=\E[%dA:\
+	:&2=\E[27s:@4=\E!:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
+	:F8=\E[18s:F9=\E[19s:FA=\E[20s:FB=\E[21s:FC=\E[22s:\
+	:FD=\E[23s:FE=\E24s:FG=\E26s:LE=\E[%dD:RA=\E[11;1j:\
+	:RI=\E[%dC:SA=\E[11;0j:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
 	:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:cb=\E2K:cd=\E[0J:\
-	:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%d;%dH:cr=^M:dc=\E[P:\
-	:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=\E[4l:ho=\E[H:\
 	:i1=\EPr\\E[0u\E[2J\E[0;0H\E[m\E[3l\E[<l\E[4l\E[>l\E[=l\E[?l:\
 	:im=\E[4h:k0=\E[00s:k1=\E[01s:k2=\E[02s:k3=\E[03s:\
 	:k4=\E[04s:k5=\E[05s:k6=\E[06s:kb=^H:kd=\E[B:kl=\E[D:\
 	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:r1=\Ec:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[1m:ta=^I:ue=\E[m:up=\E[A:\
-	:us=\E[4m:ve=\E[>l:vs=\E[>h:
+	:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:r1=\Ec:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[1m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[>l:vs=\E[>h:
 
 # The following Terminfo entry describes functions which are supported by
 # the AT&T 5430/pt505 terminal software version 1.
@@ -5615,25 +5796,25 @@ tt505-22|pt505-22|gs5430-22|AT&T PT505 or 5430 GETSET version 1 22 lines:\
 #
 # Yes, these are the same people who are better-known for making audio- and
 # videotape.  I'm told they are located in Redwood City, CA.
+#
 
 # From: <cbosg!ucbvax!SRC:george> Fri Sep 11 22:38:32 1981
 # (ampex80: some capabilities merged in from SCO's entry -- esr)
 ampex80|a80|d80|dialogue|dialogue80|ampex dialogue 80:\
 	:am:bw:ul:\
 	:co#80:it#8:li#24:\
-	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:ei=:\
-	:ic=\EQ:im=:is=\EA:le=^H:nd=^L:se=\Ek:sf=^J:so=\Ej:\
-	:st=\E1:ta=^I:ue=\Em:up=^K:us=\El:
+	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:ei=:ic=\EQ:im=:is=\EA:le=^H:\
+	:nd=^L:se=\Ek:sf=^J:so=\Ej:st=\E1:ta=^I:ue=\Em:up=^K:us=\El:
 # This entry was from somebody anonymous, Tue Aug  9 20:11:37 1983, who wrote:
 ampex175|ampex d175:\
 	:am:\
 	:co#80:li#24:\
-	:al=\EE:bl=^G:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :\
-	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:\
-	:is=\EX\EA\EF:kA=\EE:kD=\EW:kI=\EQ:kL=\ER:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:nd=^L:se=\Ek:\
-	:sf=^J:so=\Ej:te=\EF:ti=\EN:ue=\Em:up=^K:us=\El:
+	:al=\EE:bl=^G:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:is=\EX\EA\EF:\
+	:kA=\EE:kD=\EW:kI=\EQ:kL=\ER:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:le=^H:ll=^^^K:nd=^L:se=\Ek:sf=^J:so=\Ej:te=\EF:ti=\EN:\
+	:ue=\Em:up=^K:us=\El:
 # No backspace key in the main QWERTY cluster. Fortunately, it has a
 # NEWLINE/PAGE key just above RETURN that sends a strange single-character
 # code.  Given a suitable Unix (one that lets you set an echo-erase-as-BS-SP-BS
@@ -5641,64 +5822,70 @@ ampex175|ampex d175:\
 # some people and some systems may not, there is another termcap ("ampex175")
 # that suppresses this little eccentricity by omitting the relevant capability.
 ampex175-b|ampex d175 using left arrow for erase:\
-	:kb=^_:tc=ampex175:
+	:kb=^_:\
+	:tc=ampex175:
 # From: Richard Bascove <atd!dsd!rcb@ucbvax.berkeley.edu>
 # (ampex210: removed obsolete ":kn#10:" -- esr)
 ampex210|a210|ampex a210:\
 	:am:hs:xn:\
-	:co#80:it#8:li#24:sg#1:ug#1:\
-	:al=\EE:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :\
-	:dc=\EW:dl=\ER:ei=:fs=\E.2:ho=^^:ic=\EQ:\
-	:if=/usr/share/tabset/std:im=:\
-	:is=\EC\Eu\E'\E(\El\EA\E%\E{\E.2\EG0\Ed\En:k0=^A0\r:\
-	:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:k5=^A5\r:\
-	:k6=^A6\r:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^V:kh=^^:\
-	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:so=\EG4:ta=^I:\
-	:ts=\E.0\Eg\E}\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\EU\EX\EU\EX\EU\EX\EU\EX:
-# (ampex219: I added <rmam>/<smam> based on the init string -- esr)
+	:co#80:it#8:li#24:sg#1:\
+	:al=\EE:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :dc=\EW:\
+	:dl=\ER:ei=:fs=\E.2:ho=^^:ic=\EQ:if=/usr/share/tabset/std:\
+	:im=:is=\EC\Eu\E'\E(\El\EA\E%\E{\E.2\EG0\Ed\En:\
+	:k0=^A0\r:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:k5=^A5\r:\
+	:k6=^A6\r:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^V:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:mk@:nd=^L:ta=^I:ts=\E.0\Eg\E}\Ef:up=^K:\
+	:vb=\EU\EX\EU\EX\EU\EX\EU\EX:\
+	:tc=adm+sgr:
+# (ampex219: I added <rmam>/<smam> based on the init string,
+# and moved the padding to be *after* the caps -- esr)
 ampex219|ampex-219|amp219|Ampex with Automargins:\
 	:hs:xn:\
 	:co#80:it#8:li#24:\
 	:RA=\E[?7l:SA=\E[?7h:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=%i\E[%2;%2r:\
 	:do=\E[B:ho=\E[H:\
-	:is=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
-	:k0=\E[21~:k1=\E[7~:k2=\E[8~:k3=\E[9~:k4=\E[10~:\
-	:k5=\E[11~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
-	:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E=:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mh=\E[1m:\
-	:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
-	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+	:is=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k0=\E[21~:\
+	:k1=\E[7~:k2=\E[8~:k3=\E[9~:k4=\E[10~:k5=\E[11~:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kd=\E[B:ke=\E>:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mh=\E[1m:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:\
+	:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 ampex219w|ampex-219w|amp219w|Ampex 132 cols:\
 	:co#132:li#24:\
-	:bl=^G:cr=^M:do=^J:\
-	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h:sf=^J:\
-	:vs=\E[?3h:tc=ampex219:
+	:bl=^G:cr=^M:do=^J:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:sf=^J:vs=\E[?3h:\
+	:tc=ampex219:
+# (ampex232: removed :if=/usr/share/tabset/ampex:, no file and no :st: --esr) 
 ampex232|ampex-232|Ampex Model 232:\
 	:am:\
-	:co#80:li#24:sg#1:ug#1:\
-	:al=5*\EE:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :\
-	:dc=\EW:dl=5*\ER:do=^V:ei=:ic=\EQ:\
-	:if=/usr/share/tabset/ampex:im=:is=\Eg\El:k0=^A@\r:\
-	:k1=^AA\r:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:\
-	:k6=^AF\r:k7=^AG\r:k8=^AH\r:k9=^AI\r:kb=^H:kd=^V:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:so=\EG4:\
-	:ta=^I:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:ve=\E.4:\
-	:vi=\E.0:
+	:co#80:li#24:sg#1:\
+	:al=5*\EE:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :dc=\EW:\
+	:dl=5*\ER:do=^V:ei=:ic=\EQ:im=:is=\Eg\El:k0=^A@\r:k1=^AA\r:\
+	:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:\
+	:k8=^AH\r:k9=^AI\r:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
+	:mk@:nd=^L:ta=^I:up=^K:vb=\Eb\Ed:ve=\E.4:vi=\E.0:\
+	:tc=adm+sgr:
+# (ampex: removed :if=/usr/share/tabset/amp-132:, no file and no :st: -- esr) 
 ampex232w|Ampex Model 232 / 132 columns:\
 	:co#132:li#24:\
-	:if=/usr/share/tabset/amp-132:is=\E\034Eg\El:tc=ampex232:
+	:is=\E\034Eg\El:tc=ampex232:
 
 #### Ann Arbor (aa)
 #
+# Ann Arbor made dream terminals for hackers -- large screen sizes and huge
+# numbers of function keys.  At least some used monitors in portrait mode,
+# allowing up to 76-character screen heights!  They can't be found on the Web;
+# I fear they're long dead.  R.I.P.
+#
+
 
 # Originally from Mike O'Brien@Rand and Howard Katseff at Bell Labs.
 # Highly modified 6/22 by Mike O'Brien.
 # split out into several for the various screen sizes by dave-yost@rand
 # Modifications made 3/82 by Mark Horton
 # Modified by Tom Quarles at UCB for greater efficiency and more diversity
-# status line moved to top of screen, <flash> removed 5/82
+# status line moved to top of screen, :vb: removed 5/82
 # Some unknown person at SCO then hacked the init strings to make them more
 # efficient.
 #
@@ -5722,7 +5909,7 @@ ampex232w|Ampex Model 232 / 132 columns:\
 #	bell/no bell at column 72*
 #
 #	key pad is cursor control*/key pad is numeric
-#	return and line feed/return for <cr> key *
+#	return and line feed/return for :cr: key *
 #	repeat after .5 sec*/no repeat
 #	repeat at 25/15 chars per sec. *
 #
@@ -5810,8 +5997,8 @@ annarbor4080|aa4080|ann arbor 4080:\
 	:co#80:li#40:\
 	:bl=^G:cl=\014:\
 	:..cm=\017%p2%{10}%/%{16}%*%p2%{10}%m%+%c%p1%?%p1%{19}%>%t%{12}%+%;%'@'%+%c:\
-	:cr=^M:ct=^^P^P:do=^J:ho=^K:kb=^^:kd=^J:kh=^K:kl=^H:\
-	:kr=^_:ku=^N:le=^H:nd=^_:sf=^J:st=^]^P1:ta=^I:up=^N:
+	:cr=^M:ct=^^P^P:do=^J:ho=^K:kb=^^:kd=^J:kh=^K:kl=^H:kr=^_:\
+	:ku=^N:le=^H:nd=^_:sf=^J:st=^]^P1:ta=^I:up=^N:
 
 # If you're using the GNU termcap library, add
 #	:cS=\E[%p1%d;%p2%d;%p3%d;%p4%dp:
@@ -5834,15 +6021,14 @@ aaa+unk|aaa-unk|ann arbor ambassador (internal - don't use this directly):\
 	:ct=\E[2g:dc=\E[P:dl=\E[M:do=^K:ei=:ho=\E[H:\
 	:i1=\E[m\E7\E[H\E9\E8:i2=\E[1Q\E[>20;30l\EP`+x~M\E\\:\
 	:ic=\E[@:im=:k1=\EOA:k2=\EOB:k3=\EOC:k4=\EOD:k5=\EOE:\
-	:k6=\EOF:k7=\EOG:k8=\EOH:k9=\EOI:kD=\E[P:kI=\E[@:\
-	:kb=^H:kd=\E[B:\
+	:k6=\EOF:k7=\EOG:k8=\EOH:k9=\EOI:kD=\E[P:kI=\E[@:kb=^H:\
+	:kd=\E[B:\
 	:ke=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E\\:\
 	:kh=\E[H:kl=\E[D:kr=\E[C:\
 	:ks=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\:\
 	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mm=\E[>52h:\
-	:mo=\E[>52l:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:\
-	:sf=^K:so=\E[7m:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
+	:mo=\E[>52l:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=^K:\
+	:so=\E[7m:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 
 aaa+rv|ann arbor ambassador in reverse video:\
 	:i1=\E[7m\E7\E[H\E9\E8:mb=\E[5;7m:md=\E[1;7m:\
@@ -5857,31 +6043,37 @@ aaa+dec|ann arbor ambassador in dec vt100 mode:\
 aaa-18|ann arbor ambassador/18 lines:\
 	:li#18:\
 	:is=\E7\E[60;0;0;18p\E8:te=\E[60;0;0;18p\E[60;1H\E[K:\
-	:ti=\E[18;0;0;18p:tc=aaa+unk:
+	:ti=\E[18;0;0;18p:\
+	:tc=aaa+unk:
 aaa-18-rv|ann arbor ambassador/18 lines+reverse video:\
 	:tc=aaa+rv:tc=aaa-18:
 aaa-20|ann arbor ambassador/20 lines:\
 	:li#20:\
 	:is=\E7\E[60;0;0;20p\E8:te=\E[60;0;0;20p\E[60;1H\E[K:\
-	:ti=\E[20;0;0;20p:tc=aaa+unk:
+	:ti=\E[20;0;0;20p:\
+	:tc=aaa+unk:
 aaa-22|ann arbor ambassador/22 lines:\
 	:li#22:\
 	:is=\E7\E[60;0;0;22p\E8:te=\E[60;0;0;22p\E[60;1H\E[K:\
-	:ti=\E[22;0;0;22p:tc=aaa+unk:
+	:ti=\E[22;0;0;22p:\
+	:tc=aaa+unk:
 aaa-24|ann arbor ambassador/24 lines:\
 	:li#24:\
 	:is=\E7\E[60;0;0;24p\E8:te=\E[60;0;0;24p\E[60;1H\E[K:\
-	:ti=\E[24;0;0;24p:tc=aaa+unk:
+	:ti=\E[24;0;0;24p:\
+	:tc=aaa+unk:
 aaa-24-rv|ann arbor ambassador/24 lines+reverse video:\
 	:tc=aaa+rv:tc=aaa-24:
 aaa-26|ann arbor ambassador/26 lines:\
 	:li#26:\
 	:is=\E7\E[60;0;0;26p\E8:te=\E[60;0;0;26p\E[26;1H\E[K:\
-	:ti=\E[H\E[J\E[26;0;0;26p:tc=aaa+unk:
+	:ti=\E[H\E[J\E[26;0;0;26p:\
+	:tc=aaa+unk:
 aaa-28|ann arbor ambassador/28 lines:\
 	:li#28:\
 	:is=\E7\E[60;0;0;28p\E8:te=\E[60;0;0;28p\E[28;1H\E[K:\
-	:ti=\E[H\E[J\E[28;0;0;28p:tc=aaa+unk:
+	:ti=\E[H\E[J\E[28;0;0;28p:\
+	:tc=aaa+unk:
 aaa-30-s|aaa-s|ann arbor ambassador/30 lines w/status:\
 	:es:hs:\
 	:li#29:\
@@ -5901,29 +6093,35 @@ aaa-s-rv-ctxt|aaa-30-s-rv-ct|ann arbor ambassador/30 lines+status+save context:\
 aaa|aaa-30|ambas|ambassador|ann arbor ambassador/30 lines:\
 	:li#30:\
 	:is=\E7\E[60;0;0;30p\E8:te=\E[60;0;0;30p\E[30;1H\E[K:\
-	:ti=\E[H\E[J\E[30;0;0;30p:tc=aaa+unk:
+	:ti=\E[H\E[J\E[30;0;0;30p:\
+	:tc=aaa+unk:
 aaa-30-rv|aaa-rv|ann arbor ambassador/30 lines in reverse video:\
 	:tc=aaa+rv:tc=aaa-30:
 aaa-30-ctxt|aaa-ctxt|ann arbor ambassador/30 lines; saving context:\
-	:te=\E[60;0;0;30p\E[60;1H\E[K:ti=\E[30;0;0;30p:tc=aaa-30:
+	:te=\E[60;0;0;30p\E[60;1H\E[K:ti=\E[30;0;0;30p:\
+	:tc=aaa-30:
 aaa-30-rv-ctxt|aaa-rv-ctxt|ann arbor ambassador/30 lines reverse video; saving context:\
-	:te=\E[60;0;0;30p\E[60;1H\E[K:ti=\E[30;0;0;30p:tc=aaa+rv:tc=aaa-30:
+	:te=\E[60;0;0;30p\E[60;1H\E[K:ti=\E[30;0;0;30p:\
+	:tc=aaa+rv:tc=aaa-30:
 aaa-36|ann arbor ambassador/36 lines:\
 	:li#36:\
 	:is=\E7\E[60;0;0;36p\E8:te=\E[60;0;0;36p\E[36;1H\E[K:\
-	:ti=\E[H\E[J\E[36;0;0;36p:tc=aaa+unk:
+	:ti=\E[H\E[J\E[36;0;0;36p:\
+	:tc=aaa+unk:
 aaa-36-rv|ann arbor ambassador/36 lines+reverse video:\
 	:tc=aaa+rv:tc=aaa-36:
 aaa-40|ann arbor ambassador/40 lines:\
 	:li#40:\
 	:is=\E7\E[60;0;0;40p\E8:te=\E[60;0;0;40p\E[40;1H\E[K:\
-	:ti=\E[H\E[J\E[40;0;0;40p:tc=aaa+unk:
+	:ti=\E[H\E[J\E[40;0;0;40p:\
+	:tc=aaa+unk:
 aaa-40-rv|ann arbor ambassador/40 lines+reverse video:\
 	:tc=aaa+rv:tc=aaa-40:
 aaa-48|ann arbor ambassador/48 lines:\
 	:li#48:\
 	:is=\E7\E[60;0;0;48p\E8:te=\E[60;0;0;48p\E[48;1H\E[K:\
-	:ti=\E[H\E[J\E[48;0;0;48p:tc=aaa+unk:
+	:ti=\E[H\E[J\E[48;0;0;48p:\
+	:tc=aaa+unk:
 aaa-48-rv|ann arbor ambassador/48 lines+reverse video:\
 	:tc=aaa+rv:tc=aaa-48:
 aaa-60-s|ann arbor ambassador/59 lines+status:\
@@ -5942,12 +6140,14 @@ aaa-60|ann arbor ambassador/60 lines:\
 aaa-60-rv|ann arbor ambassador/60 lines+reverse video:\
 	:tc=aaa+rv:tc=aaa-60:
 aaa-db|ann arbor ambassador 30/destructive backspace:\
-	:i2=\E[1Q\E[m\E[>20l\E[>30h:le=\E[D:tc=aaa-30:
+	:i2=\E[1Q\E[m\E[>20l\E[>30h:le=\E[D:\
+	:tc=aaa-30:
 
 guru|guru-33|guru+unk|ann arbor guru/33 lines 80 cols:\
 	:li#33:\
 	:i2=\E[>59l:is=\E7\E[255;0;0;33;80;80p\E8\E[J:\
-	:te=\E[255p\E[255;1H\E[K:ti=\E[33p:vb=\E[>59h\E[>59l:tc=aaa+unk:
+	:te=\E[255p\E[255;1H\E[K:ti=\E[33p:vb=\E[>59h\E[>59l:\
+	:tc=aaa+unk:
 guru+rv|guru changes for reverse video:\
 	:i2=\E[>59h:vb=\E[>59l\E[>59h:
 guru-rv|guru-33-rv|ann arbor guru/33 lines+reverse video:\
@@ -5955,14 +6155,14 @@ guru-rv|guru-33-rv|ann arbor guru/33 lines+reverse video:\
 guru+s|guru status line:\
 	:es:hs:\
 	:ds=\E7\E[;0p\E[1;1H\E[K\E[H\E8\r\n\E[K:fs=\E[>51l:\
-	:te=\E[255;1p\E[255;1H\E[K:\
-	:ts=\E[>51h\E[1;%p1%dH\E[2K:
+	:te=\E[255;1p\E[255;1H\E[K:ts=\E[>51h\E[1;%p1%dH\E[2K:
 guru-nctxt|guru with no saved context:\
 	:ti=\E[H\E[J\E[33p\E[255;1H\E[K:tc=guru:
 guru-s|guru-33-s|ann arbor guru/33 lines+status:\
 	:li#32:\
 	:is=\r\n\E[A\E7\E[255;1;0;33;80;80p\E8\E[J:\
-	:ti=\E[33;1p\E[255;1H\E[K:tc=guru+s:tc=guru+unk:
+	:ti=\E[33;1p\E[255;1H\E[K:tc=guru+s:\
+	:tc=guru+unk:
 guru-24|ann arbor guru 24 lines:\
 	:co#80:li#24:\
 	:is=\E7\E[255;0;0;24;80;80p\E8\E[J:ti=\E[24p:tc=guru+unk:
@@ -5972,14 +6172,16 @@ guru-44|ann arbor guru 44 lines:\
 guru-44-s|ann arbor guru/44 lines+status:\
 	:li#43:\
 	:is=\r\n\E[A\E7\E[255;1;0;44;80;80p\E8\E[J:\
-	:ti=\E[44;1p\E[255;1H\E[K:tc=guru+s:tc=guru+unk:
+	:ti=\E[44;1p\E[255;1H\E[K:tc=guru+s:\
+	:tc=guru+unk:
 guru-76|guru with 76 lines by 89 cols:\
 	:co#89:li#76:\
 	:is=\E7\E[255;0;0;76;89;100p\E8\E[J:ti=\E[76p:tc=guru+unk:
 guru-76-s|ann arbor guru/76 lines+status:\
 	:co#89:li#75:\
 	:is=\r\n\E[A\E7\E[255;1;0;76;89;100p\E8\E[J:\
-	:ti=\E[76;1p\E[255;1H\E[K:tc=guru+s:tc=guru+unk:
+	:ti=\E[76;1p\E[255;1H\E[K:tc=guru+s:\
+	:tc=guru+unk:
 guru-76-lp|guru-lp|guru with page bigger than line printer:\
 	:co#134:li#76:\
 	:is=\E7\E[255;0;0;76;134;134p\E8\E[J:ti=\E[76p:tc=guru+unk:
@@ -5989,7 +6191,8 @@ guru-76-w|guru 76 lines by 178 cols:\
 guru-76-w-s|ann arbor guru/76 lines+status+wide:\
 	:co#178:li#75:\
 	:is=\r\n\E[A\E7\E[255;1;0;76;178;178p\E8\E[J:\
-	:ti=\E[76;1p\E[255;1H\E[K:tc=guru+s:tc=guru+unk:
+	:ti=\E[76;1p\E[255;1H\E[K:\
+	:tc=guru+s:tc=guru+unk:
 guru-76-wm|guru 76 lines by 178 cols with 255 cols memory:\
 	:co#178:li#76:\
 	:is=\E7\E[255;0;0;76;178;255p\E8\E[J:ti=\E[76p:tc=guru+unk:
@@ -6010,58 +6213,62 @@ aaa-rv-unk|ann arbor unknown type:\
 #
 #	SunRiver Data Systems
 #	100 Marcus Boulevard
-#	Hauppauge, NY 117883-762
+#	Hauppauge, NY 11788-3762
 #	Vox: (800)-231-5445
 #	Fax: (516)-342-7378
 #
-# Their voice mail describes the place as "SunRiver (formerly ADDS)". 
+# Their voice mail used to describe the place as "SunRiver (formerly ADDS)". 
+# In 1995 SunRiver acquired DEC's terminals business.
+#
 
 # Regent: lowest common denominator, works on all regents.
 # (regent: renamed ":bc:" to ":le:" -- esr)
 regent|Adds Regent Series:\
 	:am:bs:\
 	:co#80:li#24:\
-	:bl=^G:cl=^L:cr=^M:do=^J:ho=\EY  :le=^U:ll=^A:nd=^F:\
-	:sf=^J:up=^Z:
+	:bl=^G:cl=^L:cr=^M:do=^J:ho=\EY  :le=^U:ll=^A:nd=^F:sf=^J:\
+	:up=^Z:
 # Regent 100 has a bug where if computer sends escape when user is holding
 # down shift key it gets confused, so we avoid escape.
 regent100|Adds Regent 100:\
 	:sg#1:ug#1:\
 	:bl=^G:cm=\013%+ %B\020%.:k0=^B1\r:k1=^B2\r:k2=^B3\r:\
-	:k3=^B4\r:k4=^B5\r:k5=^B6\r:k6=^B7\r:k7=^B8\r:l0=F1:\
-	:l1=F2:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:se=\E0@:\
-	:so=\E0P:ue=\E0@:us=\E0`:tc=regent:
+	:k3=^B4\r:k4=^B5\r:k5=^B6\r:k6=^B7\r:k7=^B8\r:l0=F1:l1=F2:\
+	:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:me=\E0@:se=\E0@:so=\E0P:\
+	:ue=\E0@:us=\E0`:\
+	:tc=regent:
 regent20|Adds Regent 20:\
 	:bl=^G:cd=\Ek:ce=\EK:cm=\EY%+ %+ :tc=regent:
 regent25|Adds Regent 25:\
 	:bl=^G:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:tc=regent20:
 regent40|Adds Regent 40:\
 	:sg#1:ug#1:\
-	:al=\EM:bl=^G:dl=\El:k0=^B1\r:k1=^B2\r:k2=^B3\r:\
-	:k3=^B4\r:k4=^B5\r:k5=^B6\r:k6=^B7\r:k7=^B8\r:l0=F1:\
-	:l1=F2:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:se=\E0@:\
-	:so=\E0P:ue=\E0@:us=\E0`:tc=regent25:
+	:al=\EM:bl=^G:dl=\El:k0=^B1\r:k1=^B2\r:k2=^B3\r:k3=^B4\r:\
+	:k4=^B5\r:k5=^B6\r:k6=^B7\r:k7=^B8\r:l0=F1:l1=F2:l2=F3:\
+	:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:me=\E0@:se=\E0@:so=\E0P:\
+	:ue=\E0@:us=\E0`:\
+	:tc=regent25:
 regent40+|Adds Regent 40+:\
 	:is=\EB:tc=regent40:
 regent60|regent200|Adds Regent 60:\
 	:dc=\EE:ei=\EF:im=\EF:is=\EV\EB:kD=\EE:kI=\EF:kM=\EF:\
-	:se=\ER\E0@\EV:so=\ER\E0P\EV:tc=regent40+:
+	:se=\ER\E0@\EV:so=\ER\E0P\EV:\
+	:tc=regent40+:
 # From: <edward@onyx.berkeley.edu> Thu Jul  9 09:27:33 1981
-# (viewpoint: added <kcuf1>, function key, and <dl1> capabilities -- esr)
+# (viewpoint: added :kr:, function key, and :dl: capabilities -- esr)
 viewpoint|addsviewpoint|adds viewpoint:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dl=\El:\
-	:do=^J:is=\017\E0`:k0=^B1:k2=^B2:k3=^B!:k4=^B":\
-	:k5=^B#:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A:\
-	:nd=^F:se=^O:sf=^J:so=^N:ue=^O:up=^Z:us=^N:\
-	:ve=\017\E0`:vs=\017\E0P:
+	:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dl=\El:do=^J:\
+	:is=\017\E0`:k0=^B1:k2=^B2:k3=^B!:k4=^B":k5=^B#:kd=^J:kh=^A:\
+	:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A:me=^O:nd=^F:se=^O:sf=^J:so=^N:\
+	:ue=^O:up=^Z:us=^N:ve=\017\E0`:vs=\017\E0P:
 # Some viewpoints have bad ROMs that foo up on ^O
 screwpoint|adds viewpoint with ^O bug:\
 	:se@:so@:ue@:us@:vs@:tc=viewpoint:
 
 # From: Jay S. Rouman <jsr@dexter.mi.org> 5 Jul 92
-# The <civis>/<cnorm>/<sgr>/<sgr0> strings were added by ESR from specs.  
+# The :vi:/:ve:/:sa:/:me: strings were added by ESR from specs.  
 # Theory; the 3a+ wants \E0%c to set highlights, where normal=01000000,
 # underline=01100000, rev=01010000, blink=01000010,dim=01000001,
 # invis=01000100 and %c is the logical or of desired attributes.
@@ -6069,9 +6276,8 @@ screwpoint|adds viewpoint with ^O bug:\
 vp3a+|viewpoint3a+|adds viewpoint 3a+:\
 	:am:bw:\
 	:co#80:it#8:li#24:\
-	:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:\
-	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:me=\E(:\
-	:nd=^L:nw=^M^J:\
+	:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:kb=^H:\
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:me=\E(:nd=^L:nw=^M^J:\
 	:..sa=\E0%'@'%?%p1%tQ%|%;%?%p2%t%'`'%|%;%?%p3%tP%|%;%?%p4%t%{2}%|%;%?%p5%t%{1}%|%;%?%p7%tD%|%;%c\E):\
 	:se=\E(:sf=^J:so=\E0Q\E):ta=^I:up=^K:ve=^X:vi=^W:
 vp60|viewpoint60|addsvp60|adds viewpoint60:\
@@ -6080,34 +6286,33 @@ vp60|viewpoint60|addsvp60|adds viewpoint60:\
 # adds viewpoint 90 - from cornell
 # Note:  emacs sends ei occasionally to insure the terminal is out of
 #        insert mode. This unfortunately puts the viewpoint90 IN insert
-#        mode.  A hack to get around this is <ich1>=\EF\s\EF^U.  (Also,
+#        mode.  A hack to get around this is :ic=\EF\s\EF^U:.  (Also,
 #   -    :ei=:im=: must be present in the termcap translation.)
-#   -    <xhp> indicates glitch that attributes stick to location
-#   -    <msgr> means it's safe to move in standout mode
-#   -    <clear>=\EG\Ek: clears screen and visual attributes without affecting
+#   -    :xs: indicates glitch that attributes stick to location
+#   -    :ms: means it's safe to move in standout mode
+#   -    :cl=\EG\Ek:: clears screen and visual attributes without affecting
 #               the status line
 # Function key and label capabilities merged in from SCO.
 vp90|viewpoint90|adds viewpoint 90:\
 	:bw:ms:xs:\
 	:co#80:li#24:\
-	:cd=\Ek:ce=\EK:cl=\EG\Ek:cm=\EY%+ %+ :dc=\EE:dl=\El:\
-	:do=^J:ei=:ho=\EY  :ic=\EF \EF\025:im=:k0=^B1\r:\
-	:k1=^B2\r:k2=^B3\r:k3=^B4\r:k4=^B5\r:k5=^B6\r:\
-	:k6=^B7\r:k7=^B8\r:k8=^B9\r:k9=^B\072\r:k;=^B;\r:\
-	:kb=^H:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:l0=F1:l1=F2:\
-	:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:l8=F9:l9=F10:\
-	:la=F11:le=^H:ll=^A:nd=^F:se=\ER\E0@\EV:sf=^J:\
-	:so=\ER\E0Q\EV:ta=^I:ue=\ER\E0@\EV:up=^Z:\
-	:us=\ER\E0`\EV:
+	:cd=\Ek:ce=\EK:cl=\EG\Ek:cm=\EY%+ %+ :dc=\EE:dl=\El:do=^J:\
+	:ei=:ho=\EY  :ic=\EF \EF\025:im=:k0=^B1\r:k1=^B2\r:\
+	:k2=^B3\r:k3=^B4\r:k4=^B5\r:k5=^B6\r:k6=^B7\r:k7=^B8\r:\
+	:k8=^B9\r:k9=^B\072\r:k;=^B;\r:kb=^H:kd=^J:kh=^A:kl=^U:\
+	:kr=^F:ku=^Z:l0=F1:l1=F2:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:\
+	:l8=F9:l9=F10:la=F11:le=^H:ll=^A:me=\ER\E0@\EV:nd=^F:\
+	:se=\ER\E0@\EV:sf=^J:so=\ER\E0Q\EV:ta=^I:ue=\ER\E0@\EV:\
+	:up=^Z:us=\ER\E0`\EV:
 # Note: if return acts weird on a980, check internal switch #2
 # on the top chip on the CONTROL pc board.
 adds980|a980|adds consul 980:\
 	:am:\
 	:co#80:li#24:\
-	:al=\E\016:bl=^G:cl=\014\013@:cm=\013%+@\E\005%2:\
-	:cr=^M:dl=\E\017:do=^J:k0=\E0:k1=\E1:k2=\E2:k3=\E3:\
-	:k4=\E4:k5=\E5:k6=\E6:k7=\E7:k8=\E8:k9=\E9:le=^H:\
-	:nd=\E^E01:se=^O:sf=^J:so=^Y^^^N:
+	:al=\E\016:bl=^G:cl=\014\013@:cm=\013%+@\E\005%2:cr=^M:\
+	:dl=\E\017:do=^J:k0=\E0:k1=\E1:k2=\E2:k3=\E3:k4=\E4:k5=\E5:\
+	:k6=\E6:k7=\E7:k8=\E8:k9=\E9:le=^H:me=^O:nd=\E^E01:se=^O:\
+	:sf=^J:so=^Y^^^N:
 
 #### C. Itoh Electronics
 #
@@ -6123,42 +6328,55 @@ cit80|cit-80|citoh 80:\
 	:am:\
 	:co#80:li#24:\
 	:cd=\EJ:ce=\EK:cl=\E[H\EJ:cm=\E[%i%2;%2H:cr=^M:ff=^L:\
-	:is=\E>:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:nd=\E[C:sf=^J:up=\E[A:
+	:is=\E>:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:nd=\E[C:sf=^J:up=\E[A:
 # From: Tim Wood <mtxinu!sybase!tim> Fri Sep 27 09:39:12 PDT 1985
 # (cit101: added <rmam>/<smam> based on init string, merged this with c101 -- esr)
 cit101|citc|C.itoh fast vt100:\
 	:am:xn:\
 	:co#80:li#24:\
 	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=:\
-	:ic=\E[@:im=:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=:ic=\E[@:\
+	:im=:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g:\
 	:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:le=^H:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:\
-	:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[V\E8:\
-	:vs=\E7\E[U:
-# The CIT-500 was unusual in that it had a portrait-style display.
+	:ku=\EOA:le=^H:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:\
+	:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[V\E8:vs=\E7\E[U:
+# CIE Terminals CIT-500 from BRL
+# The following SET-UP modes are assumed for normal operation:
+#	GENERATE_XON/XOFF:YES	DUPLEX:FULL		NEWLINE:OFF
+#	AUTOWRAP:ON		MODE:ANSI		SCREEN_LENGTH:64_LINES
+#	DSPLY_CNTRL_CODES?NO	PAGE_WIDTH:80		EDIT_MODE:OFF
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements.
+# Hardware tabs are assumed to be set every 8 columns; they can be set up
+# by the "reset", "tset", or "tabs" utilities.  No delays are specified; use
+# "stty ixon -ixany" to enable DC3/DC1 flow control!
 # (cit500: I added <rmam>/<smam> based on the init string -- esr)
-# (This entry used to have lines#40, but Michael Coughlin <mikc@gnu.ai.mit.edu>
-# says this is wrong, they actually have 64 lines.  Perhaps someone was 
-# thinking in hex? -- esr)
-cit500|cit-500|cit 500:\
-	:am:xn:\
-	:co#80:it#8:li#64:\
-	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=50\E[J:ce=3\E[K:\
-	:cl=50\E[H\E[2J:cm=5\E[%i%2;%2H:dc=\E[P:dl=\E[M:\
-	:do=\ED:is=\E(B\E)0\E>\E[?3l\E[?7h\E[?8h:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:ke=\E[?1l\E>:\
-	:kh=\E[H:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
-	:nd=2\E[C:se=2\E[m:so=2\E[7m:sr=5\EM:ta=^I:ue=2\E[m:\
-	:up=2\E[A:us=2\E[4m:
-
+cit500|CIE Terminals CIT-500:\
+	:mi:ms:xo:\
+	:co#80:it#8:li#64:vt#3:\
+	:#3=\E[4h:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:ac=:ae=^O:al=\E[L:\
+	:as=^N:bl=^G:bt=\E[Z:cd=\EJ:ce=\EK:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:is=\E<\E)0:\
+	:k0=\EOP:k1=\EOQ:k2=\EOR:k3=\EOS:k4=\EOU:k5=\EOV:k6=\EOW:\
+	:k7=\EOX:k8=\EOY:k9=\EOZ:kA=\E[L:kB=\E[Z:kD=\E[P:kE=\EK:\
+	:kI=\E[4h:kL=\E[M:kM=\E[4l:kS=\EJ:kb=^H:kd=\EOB:\
+	:ke=\E[?1l\E>:kh=\E[H:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:l0=PF1:l1=PF2:l2=PF3:l3=PF4:l4=F15:l5=F16:l6=F17:\
+	:l7=F18:l8=F19:l9=F20:le=^H:ll=\E[64H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:r1=\E<\E2\E[20l\E[?6l\E[r\E[m\E[q\E(B\017\E)0\E>:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\EM:us=\E[4m:
+
+# C. Itoh printers begin here
 citoh|ci8510|8510|c.itoh 8510a:\
 	:co#80:it#8:\
 	:is=\E(009\054017\054025\054033\054041\054049\054057\054065\054073.:\
-	:le@:md=\E!:me=\E"\EY:rp=\ER%r%03%.:sr=\Er:ue=\EY:\
-	:us=\EX:tc=lpr:
+	:le@:md=\E!:me=\E"\EY:rp=\ER%r%03%.:sr=\Er:ue=\EY:us=\EX:\
+	:tc=lpr:
 citoh-pica|citoh in pica:\
 	:i1=\EN:tc=citoh:
 citoh-elite|citoh in elite:\
@@ -6185,8 +6403,76 @@ citoh-8lpi|citoh in 8 lines per inch mode:\
 cdc456|cdc 456 terminal:\
 	:am:\
 	:co#80:li#24:\
-	:al=\EL:bl=^G:cd=^X:ce=^V:cl=^Y^X:cm=\E1%+ %+ :cr=^M:\
-	:dl=\EJ:do=^J:ho=^Y:le=^H:nd=^L:sf=^J:up=^Z:
+	:al=\EL:bl=^G:cd=^X:ce=^V:cl=^Y^X:cm=\E1%+ %+ :cr=^M:dl=\EJ:\
+	:do=^J:ho=^Y:le=^H:nd=^L:sf=^J:up=^Z:
+#
+# CDC 721 from Robert Viduya, Ga. Tech. <ihnp4!gatech!gitpyr!robert> via BRL.
+#
+# Part of the long initialization string defines the "DOWN" key to the left
+# of the tab key to send an ESC.  The real ESC key is position way out in right
+# field.
+#
+# The termcap won't work in 132 column mode due to the way it it moves the
+# cursor.  Termcap doesn't have the capability (as far as I could tell) to
+# handle the 721 in 132 column mode.
+#
+# Personal preference: the key definitions have been commented out by a
+# period before the name.  Remove them if you want.
+#
+# (cdc721: changed :ri: to :sr: -- esr)
+cdc721-esc|Control Data 721:\
+	:am:bw:ms:xo:\
+	:co#80:it#8:li#30:\
+	:al=^^R:bl=^G:bt=^^^K:cd=^^P:ce=^K:cl=^L:cm=\002%r%+ %+ :\
+	:cr=^M:ct=^^^RY:dc=^^N:dl=^^Q:do=^Z:ei=:ho=^Y:ic=^^O:im=:\
+	:is=\036\022B\003\036\035\017\022\025\035\036E\036\022H\036\022J\036\022L\036\022N\036\022P\036\022Q\036\022\\\036\022^\036\022b\036\022i\036W =\036\022Z\036\011C1-` `!k/o:\
+	:k0=^^q:k1=^^r:k2=^^s:k3=^^t:k4=^^u:k5=^^v:k6=^^w:k7=^^x:\
+	:k8=^^y:k9=^^z:kb=^H:kd=^J:kl=^H:le=^H:ll=^B =:mb=^N:\
+	:me=\017\025\035\036E\036\022\\:mh=^\:mk=^^^R[:mr=^^D:\
+	:nd=^X:nw=\r\036W =\036U:se=^^E:sf=\036W =\036U:so=^^D:\
+	:sr=\036W =\036V:st=^^^RW:ta=^I:ue=^]:up=^W:us=^\:
+
+#### Getronics
+#
+# Getronics is a Dutch electronics company that at one time was called 
+# `Geveke' and made async terminals; but (according to the company itself!)
+# they've lost all their documentation on the command set.  The hardware
+# documentation suggests the terminals were actually manufactured by a
+# Taiwanese electronics company named Cal-Comp.  There are known
+# to have been at least two models, the 33 and the 50.
+#
+
+# The 50 seems to be a top end vt220 clone, with the addition of a higher
+# screen resolution, a larger screen, at least 1 page of memory above and
+# below the screen, apparently pages of memory right and left of the screen
+# which can be panned, and about 75 function keys (15 function keys x normal,
+# shift, control, func A, func B). It also has more setup possibilities than
+# the vt220. The monitor case is dated November 1978 and the keyboard case is
+# May 1982.
+#
+# The vt100 emulation works as is.  The entry below describes the rather
+# non-conformant (but more featureful) ANSI mode.
+#
+# From: Stephen Peterson <stv@utrecht.ow.nl>, 27 May 1995
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+visa50|geveke visa 50 terminal in ansi 80 character mode:\
+	:bw:mi:ms:\
+	:co#80:li#25:\
+	:AL=\E[%dL:DC=\E[%dX:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\E[f:K2=\EOP:K3=\EOQ:K4=\EOR:K5=\EOS:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=\E[3l:al=\E[L:as=\E3h:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[X:dl=\E[M:do=\E[B:\
+	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:\
+	:is=\E0;2m\E[1;25r\E[25;1H\E[?3l\E[?7h\E[?8h:k0=\E010:\
+	:k1=\E001:k2=\E002:k3=\E003:k4=\E004:k5=\E005:k6=\E006:\
+	:k7=\E007:k8=\E008:k9=\E009:kD=\177:kb=^H:kd=\E[A:ke=\E>:\
+	:kh=\E[f:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=\E[D:mb=\E[5m:\
+	:md=\E[1m:me=\E[0;2m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^M^J:\
+	:se=\E[0;2m:sf=^J:so=\E[2;7m:ta=^I:ue=\E[0m:up=\E[A:\
+	:us=\E[4m:vb=\E[?5h\E[?5l:
 
 #### Human Designed Systems (Concept)
 #
@@ -6201,6 +6487,7 @@ cdc456|cdc 456 terminal:\
 # the character-terminal business now (1995) and making X terminals.  In
 # particular, the whole `Concept' line described here was discontinued long
 # ago.
+#
 
 # From: <vax135!hpk>  Sat Jun 27 07:41:20 1981
 # Extensive changes to c108 by arpavax:eric Feb 1982
@@ -6218,16 +6505,16 @@ cdc456|cdc 456 terminal:\
 # It is much faster (at 9600 baud) than the c100 because the delays
 # are not fixed.
 # new status line display entries for c108-8p:
-# <is3> - init str #3 - setup term for status display - 
+# :i3: - init str #3 - setup term for status display - 
 # set programmer mode, select window 2, define window at last 
 # line of memory, set bkgnd stat mesg there, select window 0.
 # 
-# <tsl> - to status line - select window 2, home cursor, erase to 
+# :ts: - to status line - select window 2, home cursor, erase to 
 # end-of-window, 1/2 bright on, goto(line#0, col#?)
 # 
-# <fsl> - from status line - 1/2 bright off, select window 0
+# :fs: - from status line - 1/2 bright off, select window 0
 # 
-# <dsl> - disable status display - set bkgnd status mesg with 
+# :ds: - disable status display - set bkgnd status mesg with 
 # illegal window #
 # 
 # There are probably more function keys that should be added but 
@@ -6237,7 +6524,8 @@ cdc456|cdc 456 terminal:\
 #
 c108|concept108|c108-8p|concept108-8p|concept 108 w/8 pages:\
 	:i2=\EU\E z"\Ev\001\177 !p\E ;"\E z \Ev  \001\177p\Ep\n:\
-	:te=\Ev  \001\177p\Ep\r\n:tc=c108-4p:
+	:te=\Ev  \001\177p\Ep\r\n:\
+	:tc=c108-4p:
 c108-4p|concept108-4p|concept 108 w/4 pages:\
 	:es:hs:xo:\
 	:pb@:\
@@ -6245,13 +6533,15 @@ c108-4p|concept108-4p|concept 108 w/4 pages:\
 	:..cm=\Ea%p1%?%p1%{95}%>%t\001%{96}%-%;%{32}%+%c%p2%?%p2%{95}%>%t\001%{96}%-%;%{32}%+%c:\
 	:cr=^M:dc=\E 1:ds=\E ;\177:fs=\Ee\E z :i1=\EK\E!\E F:\
 	:i2=\EU\E z"\Ev\177 !p\E ;"\E z \Ev  \001 p\Ep\n:\
-	:sf=^J:te=\Ev  \001 p\Ep\r\n:\
-	:ti=\EU\Ev  8p\Ep\r\E\025:\
-	:ts=\E z"\E?\E\005\EE\Ea %+ :ve=\Ew:vs=\EW:tc=c100:
+	:sf=^J:te=\Ev  \001 p\Ep\r\n:ti=\EU\Ev  8p\Ep\r\E\025:\
+	:ts=\E z"\E?\E\005\EE\Ea %+ :ve=\Ew:vs=\EW:\
+	:tc=c100:
 c108-rv|c108-rv-8p|concept 108 w/8 pages in reverse video:\
-	:te=\Ev  \002 p\Ep\r\n:ti=\EU\Ev  8p\Ep\r:tc=c108-rv-4p:
+	:te=\Ev  \002 p\Ep\r\n:ti=\EU\Ev  8p\Ep\r:\
+	:tc=c108-rv-4p:
 c108-rv-4p|concept108rv4p|concept 108 w/4 pages in reverse video:\
-	:i1=\Ek:se=\Ee:so=\EE:vb=\EK\Ek:tc=c108-4p:
+	:i1=\Ek:se=\Ee:so=\EE:vb=\EK\Ek:\
+	:tc=c108-4p:
 c108-w|c108-w-8p|concept108-w-8|concept108-w8p|concept 108 w/8 pages in wide mode:\
 	:co#132:\
 	:i1=\E F\E":te=\Ev  ^A0\001D\Ep\r\n:\
@@ -6275,7 +6565,7 @@ c108-w|c108-w-8p|concept108-w-8|concept108-w8p|concept 108 w/8 pages in wide mod
 # 9600 baud and up.  One or the other is commented out depending on 
 # local conventions.
 # 
-# 2 ms padding on <rmcup> isn't always enough. 6 works fine. Maybe 
+# 2 ms padding on :te: isn't always enough. 6 works fine. Maybe 
 # less than 6 but more than 2 will work.
 # 
 # Note: can't use function keys f7-f10 because they are 
@@ -6299,32 +6589,32 @@ c100|concept100|concept|c104|c100-4p|hds concept 100:\
 	:am:eo:mi:ul:xn:\
 	:co#80:li#24:pb#9600:vt#8:\
 	:al=\E\022:bl=^G:cd=\E\005:ce=\E\025:cl=\E?\E\005:\
-	:cm=\Ea%+ %+ :cr=\r:dc=\E\021:dl=\E\002:do=^J:\
-	:ei=\E  :i1=\EK:i2=\Ev    \Ep\n:im=\E^P:ip=:\
+	:cm=\Ea%+ %+ :cr=\r:dc=\E\021:dl=\E\002:do=^J:ei=\E  :\
+	:i1=\EK:i2=\Ev    \Ep\n:im=\E^P:ip=:\
 	:is=\EU\Ef\E7\E5\E8\El\ENH\E\200\Eo&\200\Eo'\E\Eo!\200\E\007!\E\010A@ \E4#\072"\E\072a\E4#;"\E\072b\E4#<"\E\072c:\
-	:k1=\E5:k2=\E6:k3=\E7:k4=\E8:k5=\E9:k6=\E\072a:\
-	:k7=\E\072b:k8=\E\072c:kA=\E^R:kB=\E':kD=\E^Q:\
-	:kE=\E^S:kF=\E[:kI=\E^P:kL=\E^B:kM=\E\200:kN=\E-:\
-	:kP=\E.:kR=\E\\:kS=\E^C:kT=\E]:kb=^H:kd=\E<:ke=\Ex:\
-	:kh=\E?:kl=\E>:kr=\E=:ks=\EX:kt=\E_:ku=\E;:le=^H:\
-	:mb=\EC:me=\EN@:mh=\EE:mk=\EH:mp=\EI:mr=\ED:nd=\E=:\
-	:pf=\036o \E\EQ!\EYP\027:po=\EQ"\EY(\027\EYD\Eo \036:\
-	:rp=\Er%.%+ :se=\Ed:sf=^J:so=\ED:ta=\011:\
-	:te=\Ev    \Ep\r\n:ti=\EU\Ev  8p\Ep\r\E\025:ue=\Eg:\
-	:up=\E;:us=\EG:vb=\Ek\EK:
+	:k1=\E5:k2=\E6:k3=\E7:k4=\E8:k5=\E9:k6=\E\072a:k7=\E\072b:\
+	:k8=\E\072c:kA=\E^R:kB=\E':kD=\E^Q:kE=\E^S:kF=\E[:kI=\E^P:\
+	:kL=\E^B:kM=\E\200:kN=\E-:kP=\E.:kR=\E\\:kS=\E^C:kT=\E]:\
+	:kb=^H:kd=\E<:ke=\Ex:kh=\E?:kl=\E>:kr=\E=:ks=\EX:kt=\E_:\
+	:ku=\E;:le=^H:mb=\EC:me=\EN@:mh=\EE:mk=\EH:mp=\EI:mr=\ED:\
+	:nd=\E=:pf=\036o \E\EQ!\EYP\027:\
+	:po=\EQ"\EY(\027\EYD\Eo \036:rp=\Er%.%+ :se=\Ed:sf=^J:\
+	:so=\ED:ta=\011:te=\Ev    \Ep\r\n:\
+	:ti=\EU\Ev  8p\Ep\r\E\025:ue=\Eg:up=\E;:us=\EG:vb=\Ek\EK:
 c100-rv|c100-rv-4p|concept100-rv|c100 rev video:\
 	:i1=\Ek:se=\Ee:so=\EE:vb=\EK\Ek:ve@:vs@:tc=c100:
 oc100|oconcept|c100-1p|old 1 page concept 100:\
 	:in:\
 	:i3@:tc=c100:
 
-# <ht> through <el> included to specify padding needed in raw mode.
+# :ta: through :ce: included to specify padding needed in raw mode.
+# (avt-ns: added empty <acsc> to suppress a tic warning --esr)
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 avt-ns|concept avt no status line:\
 	:am:eo:mi:ul:xn:xo:\
 	:co#80:it#8:li#24:lm#192:\
 	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=\016:al=\E[L:as=\017:bl=^G:\
+	:RI=\E[%dC:UP=\E[%dA:ac=:ae=\016:al=\E[L:as=\017:bl=^G:\
 	:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%+^AG:cl=\E[H\E[J:\
 	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[2g:\
 	:cv=\E[%+^Ad:dc=\E[P:dl=\E[M:do=^J:ei=\E4l:ho=\E[H:\
@@ -6332,18 +6622,19 @@ avt-ns|concept avt no status line:\
 	:is=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1\E[1Q\EW\E[!y\E[!z\E>\E[0\0720\07232!r\E[0*w\E[w\E2\r\n\E[2;27!t:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kA=\E^C\r:kD=\E^B\r:\
 	:kI=\E^A\r:kS=\E^D\r:kb=^H:kd=\E[B:ke=\E[!z\E[0;2u:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[1!z\E[0;3u:ku=\E[A:\
-	:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:me=\E[m:mh=\E[1!{:\
-	:mk=\E8m:mp=\E[99m:mr=\E[7m:nd=\E[C:pf=\E[4i:\
-	:pl=\E[%d;0u#%s#:po=\E[5i:ps=\E[0i:px=\E[%d;1u#%s#:\
-	:rc=\E8:sc=\E7:se=\E[7!{:sf=\n:so=\E[7m:sr=\EM:\
-	:st=\EH:ta=\011:te=\E[w\E2\r\n:\
-	:ti=\E[=4l\E[1;24w\E2\r:ue=\E[4!{:up=\E[A:us=\E[4m:\
-	:ve=\E[=119l:vs=\E[=119h:
+	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[1!z\E[0;3u:ku=\E[A:le=^H:\
+	:ll=\E[24H:mb=\E[5m:md=\E[1m:me=\E[m:mh=\E[1!{:mk=\E8m:\
+	:mp=\E[99m:mr=\E[7m:nd=\E[C:pf=\E[4i:pl=\E[%d;0u#%s#:\
+	:po=\E[5i:ps=\E[0i:px=\E[%d;1u#%s#:rc=\E8:sc=\E7:\
+	:se=\E[7!{:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=\011:\
+	:te=\E[w\E2\r\n:ti=\E[=4l\E[1;24w\E2\r:ue=\E[4!{:\
+	:up=\E[A:us=\E[4m:ve=\E[=119l:vs=\E[=119h:
 avt-rv-ns|concept avt in reverse video mode/no status line:\
-	:i1=\E[=103l\E[=205h:vb=\E[=205l\E[=205h:tc=avt-ns:
+	:i1=\E[=103l\E[=205h:vb=\E[=205l\E[=205h:\
+	:tc=avt-ns:
 avt-w-ns|concept avt in 132 column mode/no status line:\
-	:i1=\E[=103h\E[=205l:ti=\E[H\E[1;24;1;132w:tc=avt-ns:
+	:i1=\E[=103h\E[=205l:ti=\E[H\E[1;24;1;132w:\
+	:tc=avt-ns:
 avt-w-rv-ns|concept avt in 132 column mode/no status line/reverse video:\
 	:i1=\E[=103h\E[=205h:ti=\E[H\E[1;24;1;132w:\
 	:vb=\E[=205l\E[=205h:tc=avt-ns:
@@ -6371,7 +6662,8 @@ avt-w|avt-w-s|concept avt 132 cols+status:\
 	:i1=\E[=103h\E[=205l:ti=\E[H\E[1;24;1;132w:tc=avt+s:tc=avt-ns:
 avt-w-rv|avt-w-rv-s|avt wide+status+rv:\
 	:i1=\E[=103h\E[=205h:ti=\E[H\E[1;24;1;132w:\
-	:vb=\E[=205l\E[=205h:tc=avt+s:tc=avt-ns:
+	:vb=\E[=205l\E[=205h:tc=avt+s:\
+	:tc=avt-ns:
 
 #### Contel Business Systems. 
 #
@@ -6380,15 +6672,16 @@ avt-w-rv|avt-w-rv-s|avt wide+status+rv:\
 contel300|contel320|c300|Contel Business Systems C-300 or C-320:\
 	:am:in:xo:\
 	:co#80:li#24:sg#1:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :\
-	:cr=^M:ct=\E3:dc=\EO:dl=\EM:do=^J:ei=:ho=\EH:ic=\EN:\
-	:im=:ip=:k0=\ERJ:k1=\ERA:k2=\ERB:k3=\ERC:k4=\ERD:\
-	:k5=\ERE:k6=\ERF:k7=\ERG:k8=\ERH:k9=\ERI:kb=^H:le=^H:\
-	:ll=\EH\EA:nd=\EC:se=\E!\200:sf=^J:so=\E!\r:st=\E1:\
-	:up=\EA:vb=\020\002\020\003:
+	:al=\EL:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :cr=^M:\
+	:ct=\E3:dc=\EO:dl=\EM:do=^J:ei=:ho=\EH:ic=\EN:im=:ip=:k0=\ERJ:\
+	:k1=\ERA:k2=\ERB:k3=\ERC:k4=\ERD:k5=\ERE:k6=\ERF:k7=\ERG:\
+	:k8=\ERH:k9=\ERI:kb=^H:le=^H:ll=\EH\EA:me=\E!\200:nd=\EC:\
+	:se=\E!\200:sf=^J:so=\E!\r:st=\E1:up=\EA:\
+	:vb=\020\002\020\003:
 # Contel c301 and c321 terminals.
 contel301|contel321|c301|c321|Contel Business Systems C-301 or C-321:\
-	:ei=:ic@:im=:ip@:se=\E!\200:so=\E!\r:vb@:tc=contel300:
+	:ei=:ic@:im=:ip@:se=\E!\200:so=\E!\r:vb@:\
+	:tc=contel300:
 
 #### Data General (dg)
 #
@@ -6397,27 +6690,26 @@ contel301|contel321|c301|c321|Contel Business Systems C-301 or C-321:\
 # terminals have thus been discontinued.
 #
 
-# According to the 4.4BSD termcap file, the dg200 <cup> should be the
+# According to the 4.4BSD termcap file, the dg200 :cm: should be the
 # termcap equivalent of \020%p2%{128}%+%c%p1%{128}%+%c (in termcap
 # notation that's "^P%r%+\200%+\200").  Those \200s are suspicious,
 # maybe they were originally nuls (which would fit).
 dg200|data general dasher 200:\
 	:NL:am:bw:\
 	:co#80:li#24:\
-	:bl=^G:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:\
-	:k0=^^z:k1=^^q:k2=^^r:k3=^^s:k4=^^t:k5=^^u:k6=^^v:\
-	:k7=^^w:k8=^^x:k9=^^y:kd=^Z:kh=^H:kl=^Y:kr=^X:ku=^W:\
-	:l0=f10:le=^Y:nd=^X:nw=^J:se=^^E:sf=^J:so=^^D:ue=^U:\
-	:up=^W:us=^T:
+	:bl=^G:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:k0=^^z:\
+	:k1=^^q:k2=^^r:k3=^^s:k4=^^t:k5=^^u:k6=^^v:k7=^^w:k8=^^x:\
+	:k9=^^y:kd=^Z:kh=^H:kl=^Y:kr=^X:ku=^W:l0=f10:le=^Y:nd=^X:\
+	:nw=^J:se=^^E:sf=^J:so=^^D:ue=^U:up=^W:us=^T:
 # From: Peter N. Wan <ihnp4!gatech!gacsr!wan>
 # courtesy of Carlos Rucalde of Vantage Software, Inc.
-# (dg211: this had <cup>=\020%r%.%., which was an ancient termcap hangover.
+# (dg211: this had :cm=\020%r%.%:., which was an ancient termcap hangover.
 # I suspect the d200 function keys actually work on the dg211, check it out.)
 dg211|Data General d211:\
-	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb=^Y:l0@:\
-	:nw=^M^Z:se=00\036E\200/>:sf@:\
-	:so=00\036D\200\200\200\200\200/>:ta=^I:te=^L:\
-	:ti=^L^R:ve=^L:vs=^L^R:tc=dg200:
+	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb=^Y:l0@:nw=^M^Z:\
+	:se=00\036E\200/>:sf@:so=5\036D:ta=^I:te=^L:ti=^L^R:ve=^L:\
+	:vs=^L^R:\
+	:tc=dg200:
 
 # dg450 from cornell
 dg450|dg6134|data general 6134:\
@@ -6435,30 +6727,29 @@ dg450|dg6134|data general 6134:\
 dg460-ansi|Data General Dasher 460 in ANSI-mode:\
 	:am:ms:ul:\
 	:co#80:it#8:li#24:\
-	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%2;%2H:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:\
-	:is=^^F@:k0=\E[001z:k1=\E[002z:k2=\E[003z:k3=\E[004z:\
-	:k4=\E[005z:k5=\E[006z:k6=\E[007z:k7=\E[008z:\
-	:k8=\E[009z:k9=\E[010z:kb=\E[D:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:l0=f1:l1=f2:l2=f3:l3=f4:\
-	:l4=f5:l5=f6:l6=f7:l7=f8:l9=f10:le=^H:mb=\E[5m:\
-	:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:nl=\ED:se=\E[m:\
-	:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:ue=\E[05:up=\E[A:\
-	:us=\E[4m:
+	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%2;%2H:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:is=^^F@:k0=\E[001z:\
+	:k1=\E[002z:k2=\E[003z:k3=\E[004z:k4=\E[005z:k5=\E[006z:\
+	:k6=\E[007z:k7=\E[008z:k8=\E[009z:k9=\E[010z:kb=\E[D:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:l0=f1:l1=f2:l2=f3:\
+	:l3=f4:l4=f5:l5=f6:l6=f7:l7=f8:l9=f10:le=^H:mb=\E[5m:me=\E[m:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:nl=\ED:se=\E[m:sf=\E[S:so=\E[7m:\
+	:sr=\E[T:ta=^I:ue=\E[05:up=\E[A:us=\E[4m:
 # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw>
 # Data General 605x     
 # Ought to work for a Model 6242, Type D210 as well as a 605x.
 # Note that the cursor-down key transmits ^Z.  Job control users, beware!
-# (dg6053: the 4.4BSD file had <cub1>=^H, <cud1>=^J, <cuf1>=^S. -- esr) 
-dg6053|data general 6053:\
+# This also matches a posted description of something called A `Dasher 100'
+# so there's a dg100 alias here. 
+# (dg6053: the 4.4BSD file had :le=^H:, :do=^J:, :nd=^S:. -- esr) 
+dg6053|dg100|data general 6053:\
 	:am:bs:bw:ul:\
 	:co#80:li#24:\
-	:bl=^G:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:\
-	:is=^R:k0=^^q:k1=^^r:k2=^^s:k3=^^t:k4=^^u:k5=^^v:\
-	:k6=^^w:k7=^^x:k8=^^y:kb=^Y:kd=^Z:kh=^H:kl=^Y:kr=^X:\
-	:ku=^W:le=^Y:nd=^X:nw=^M^Z:se=\200^^E:\
-	:so=\200\200\200\200\200\036D:ta=^I:te=^L:ti=^L^R:\
-	:ue=^U:up=^W:us=^T:ve=^L:vs=^L^R:
+	:bl=^G:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:is=^R:\
+	:k0=^^q:k1=^^r:k2=^^s:k3=^^t:k4=^^u:k5=^^v:k6=^^w:k7=^^x:\
+	:k8=^^y:kb=^Y:kd=^Z:kh=^H:kl=^Y:kr=^X:ku=^W:le=^Y:nd=^X:\
+	:nw=^M^Z:se=\200^^E:so=\200\200\200\200\200\036D:ta=^I:\
+	:te=^L:ti=^L^R:ue=^U:up=^W:us=^T:ve=^L:vs=^L^R:
 
 #### Datamedia (dm)
 #
@@ -6466,9 +6757,9 @@ dg6053|data general 6053:\
 cs10|colorscan|Datamedia Color Scan 10:\
 	:ms:\
 	:co#80:li#24:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%02;%02H:\
-	:cr=^M:do=^J:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[m:sf=^J:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%02;%02H:cr=^M:\
+	:do=^J:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=^J:\
 	:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
 cs10-w|Datamedia Color Scan 10 with 132 columns:\
 	:co#132:\
@@ -6478,9 +6769,8 @@ cs10-w|Datamedia Color Scan 10 with 132 columns:\
 dm1520|dm1521|datamedia 1520:\
 	:am:xn:\
 	:co#80:it#8:li#24:\
-	:bl=^G:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :cr=^M:do=^J:\
-	:ho=^Y:kd=^J:kh=^Y:kl=^H:kr=^\:ku=^_:le=^H:nd=^\:\
-	:sf=^J:ta=^I:up=^_:
+	:bl=^G:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :cr=^M:do=^J:ho=^Y:\
+	:kd=^J:kh=^Y:kl=^H:kr=^\:ku=^_:le=^H:nd=^\:sf=^J:ta=^I:up=^_:
 dm2500|datamedia2500|datamedia 2500:\
 	:nc:\
 	:co#80:li#24:\
@@ -6500,16 +6790,16 @@ dmchat|dmchat version of datamedia 2500:\
 dm3025|datamedia 3025a:\
 	:km:\
 	:co#80:it#8:li#24:\
-	:al=\EP\n\EQ:bl=^G:cd=\EJ:ce=\EK:cl=\EM:\
-	:cm=\EY%r%+ %+ :cr=^M:dc=\010:dl=\EP\EA\EQ:dm=\EP:\
-	:do=^J:ed=\EQ:ei=\EQ:ho=\EH:im=\EP:ip=:is=\EQ\EU\EV:\
-	:le=^H:nd=\EC:se=\EO0:sf=^J:so=\EO1:ta=^I:up=\EA:
+	:al=\EP\n\EQ:bl=^G:cd=\EJ:ce=\EK:cl=\EM:cm=\EY%r%+ %+ :\
+	:cr=^M:dc=\010:dl=\EP\EA\EQ:dm=\EP:do=^J:ed=\EQ:ei=\EQ:\
+	:ho=\EH:im=\EP:ip=:is=\EQ\EU\EV:le=^H:nd=\EC:se=\EO0:sf=^J:\
+	:so=\EO1:ta=^I:up=\EA:
 dm3045|datamedia 3045a:\
 	:am:eo:km@:ul:xn:\
-	:al@:dc=\EB:dl@:dm@:ed@:ei=\EP:is=\EU\EV:k0=\Ey\r:\
-	:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:\
-	:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:k9=\Ex\r:kh=\EH:kr=\EC:\
-	:ku=\EA:pc=\177:se@:so@:tc=dm3025:
+	:al@:dc=\EB:dl@:dm@:ed@:ei=\EP:is=\EU\EV:k0=\Ey\r:k1=\Ep\r:\
+	:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:\
+	:k8=\Ew\r:k9=\Ex\r:kh=\EH:kr=\EC:ku=\EA:pc=\177:se@:so@:\
+	:tc=dm3025:
 # Datamedia DT80 soft switches:
 # 1	0=Jump  1=Smooth
 # 	Autorepeat 	0=off  1=on
@@ -6543,28 +6833,51 @@ dm3045|datamedia 3045a:\
 # dm80/1 is a vt100 lookalike, but it doesn't seem to need any padding.
 dm80|dmdt80|dt80|datamedia dt80/1:\
 	:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=%i\E[%d;%dH:do=^J:\
-	:ho=\E[H:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[0i:se=\E[m:\
-	:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:tc=vt100:
+	:ho=\E[H:me=\E[m:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[0i:\
+	:se=\E[m:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:\
+	:tc=vt100:
 # except in 132 column mode, where it needs a little padding.
 # This is still less padding than the vt100, and you can always turn on
 # the ^S/^Q handshaking, so you can use vt100 flavors for things like
 # reverse video.
 dm80w|dmdt80w|dt80w|datamedia dt80/1 in 132 char mode:\
 	:co#132:\
-	:cd=20\E[0J:ce=20\E[0K:cl=50\E[H\E[2J:\
-	:cm=5\E[%i%d;%dH:do=^J:up=5\E[A:tc=dm80:
+	:cd=20\E[0J:ce=20\E[0K:cl=50\E[H\E[2J:cm=5\E[%i%d;%dH:\
+	:do=^J:up=5\E[A:\
+	:tc=dm80:
 # From: Adam Thompson <thompson@xanth.magic.mb.ca> Sept 10 1995
-dtx-sas|dt80-sas|Datamedia DT803/DTX for SAS usage:\
+dt80-sas|Datamedia DT803/DTX for SAS usage:\
 	:am:bw:\
 	:co#80:li#24:\
+	:ac=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~:\
 	:ae=\EG:al=\EL:as=\EF:bl=^G:cd=^K:ce=^]:cl=^L:\
 	:cm=\E=%r%+ %+ :cr=^M:\
 	:..cs=\E=%p1%' '%+%c%' '%c\E#1\E=%p2%' '%+%c%' '%c\E#2:\
-	:ct=\E'0:dl=\EM:do=\EB:ff=^L:ho=^Y:\
-	:is=\E)0\E<\EP\E'0\E$2:kC=^L:kE=^]:kS=^K:kd=^J:kh=^Y:\
-	:kl=^H:kr=^\:ku=^_:le=^H:me=^X:mr=\E$2\004:nd=^\:\
-	:pf=^O:po=^N:se=^X:sf=\EB:so=\E$2\004:sr=\EI:st=\E'1:\
-	:ta=^I:up=^_:
+	:ct=\E'0:dl=\EM:do=\EB:ff=^L:ho=^Y:is=\E)0\E<\EP\E'0\E$2:\
+	:kC=^L:kE=^]:kS=^K:kd=^J:kh=^Y:kl=^H:kr=^\:ku=^_:le=^H:me=^X:\
+	:mr=\E$2\004:nd=^\:pf=^O:po=^N:se=^X:sf=\EB:so=\E$2\004:\
+	:sr=\EI:st=\E'1:ta=^I:up=^_:
+
+# Datamedia Excel 62, 64 from Gould/SEL UTX/32 via BRL
+# These aren't end-all Excel termcaps; but do insert/delete char/line
+# and name some of the extra function keys.  (Mike Feldman ccvaxa!feldman)
+# The naming convention has been bent somewhat, with the use of E? (where
+# E is for 'Excel') as # a name.  This was done to distinguish the entries
+# from the other Datamedias in use here, and yet to associate a model of
+# the Excel terminals with the regular datamedia terminals that share
+# major characteristics.
+excel62|excel64|datamedia Excel 62:\
+	:dc=\E[P:ei=\E[4l:im=\E[4h:k5=\EOu:k6=\EOv:k7=\EOw:k8=\EOx:\
+	:k9=\EOy:kb=^H:kd=^J:kl=^H:\
+	:tc=dt80:
+excel62-w|excel64-w|datamedia Excel 62 in 132 char mode:\
+	:dc=\E[P:ei=\E[4l:im=\E[4h:k5=\EOu:k6=\EOv:k7=\EOw:k8=\EOx:\
+	:k9=\EOy:kb=^H:kd=^J:kl=^H:\
+	:tc=dt80w:
+excel62-rv|excel64-rv|datamedia Excel 62 in reverse video mode:\
+	:dc=\E[P:ei=\E[4l:im=\E[4h:k5=\EOu:k6=\EOv:k7=\EOw:k8=\EOx:\
+	:k9=\EOy:kb=^H:kd=^J:kl=^H:vb=\E[?5l\E[?5h:\
+	:tc=dt80:
 
 #### Falco
 #
@@ -6580,39 +6893,37 @@ dtx-sas|dt80-sas|Datamedia DT803/DTX for SAS usage:\
 
 # Test version for Falco ts-1. See <arpavax.hickman@ucb> for info
 # This terminal was released around 1983 and was discontinued long ago.
+# The standout and underline highlights are the same.
 falco|ts1|ts-1|falco ts-1:\
 	:am:\
 	:co#80:it#8:li#24:\
-	:al=\EE:bl=^G:cd=\EY:ce=\ET\EG0\010:cl=\E*:\
-	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:\
-	:im=\Eq:is=\Eu\E3:k0=^A0\r:kd=^J:kl=^H:kr=^L:ku=^K:\
-	:le=^H:nd=^L:se=\Eg0:sf=^J:so=\Eg1:ta=^I:ue=\Eg0:\
-	:up=^K:us=\Eg1:
+	:al=\EE:bl=^G:cd=\EY:ce=\ET\EG0\010:cl=\E*:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:is=\Eu\E3:\
+	:k0=^A0\r:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:me=\Eg0:nd=^L:\
+	:se=\Eg0:sf=^J:so=\Eg1:ta=^I:ue=\Eg0:up=^K:us=\Eg1:
 falco-p|ts1p|ts-1p|falco ts-1 with paging option:\
 	:am:da:db:mi:ms:ul:\
 	:co#80:it#8:li#24:\
-	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET\EG0\010\Eg0:\
-	:cl=\E*:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=\E[B:\
-	:ei=\Er:im=\Eq:is=\EZ\E3\E_c:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\Eg0:sf=^J:so=\Eg4:\
-	:ta=^I:te=\E_b:ti=\E_d:ue=\Eg0:up=\E[A:us=\Eg1:
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET\EG0\010\Eg0:cl=\E*:\
+	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=\E[B:ei=\Er:im=\Eq:\
+	:is=\EZ\E3\E_c:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:me=\Eg0:nd=\E[C:se=\Eg0:sf=^J:so=\Eg4:ta=^I:te=\E_b:\
+	:ti=\E_d:ue=\Eg0:up=\E[A:us=\Eg1:
 # (ts100: I added <rmam>/<smam> based on the init string -- esr)
 ts100|ts100-sp|falco ts100-sp:\
 	:am:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:vt#3:\
-	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:\
-	:K5=\EOn:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
-	:UP=\E[%dA:\
+	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
 	:ae=^O:al=\E~E:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E~W:dl=\E~R:do=^J:eA=\E(B\E)0:ei=:\
-	:ho=\E[H:i1=\E~)\E~ea:ic=\E~Q:im=:k0=\EOy:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:\
-	:k8=\EOl:k9=\EOw:k;=\EOx:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:\
-	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:ct=\E[3g:dc=\E~W:dl=\E~R:do=^J:eA=\E(B\E)0:ei=:ho=\E[H:\
+	:i1=\E~)\E~ea:ic=\E~Q:im=:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\
+	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
 	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
 	:sc=\E7:se=\E[m:sf=^J:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:
@@ -6624,7 +6935,7 @@ ts100-ctxt|falco ts-100 saving context:\
 
 # Florida Computer Graphics Beacon System, using terminal emulator program
 # "host.com", as provided by FCG.  This description is for an early release
-# of the "host" program.  Known bug: <ed> clears the whole screen, so it's
+# of the "host" program.  Known bug: :cd: clears the whole screen, so it's
 # commented out.
 
 # From: David Bryant <cbosg!djb> 1/7/83
@@ -6632,8 +6943,8 @@ beacon|FCG Beacon System:\
 	:am:da:db:\
 	:co#80:li#32:\
 	:al=\EE:bl=\ESTART\r\E37\r\EEND\r:ce=\ET:cl=\EZ:\
-	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=\EH:\
-	:ic=\EQ:im=:le=^H:mb=\ESTART\r\E61\0541\r\EEND\r:\
+	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=\EH:ic=\EQ:\
+	:im=:le=^H:mb=\ESTART\r\E61\0541\r\EEND\r:\
 	:me=\ESTART\r\E78\r\E70\0540\r\EEND\r:\
 	:mr=\ESTART\r\E59\0541\r\EEND\r:nd=\EV:\
 	:se=\ESTART\r\E70\0540\r\EEND\r:sf=^J:\
@@ -6650,10 +6961,10 @@ beacon|FCG Beacon System:\
 f1720|f1720a|fluke 1720A:\
 	:xt:\
 	:co#80:li#16:sg#1:ug#1:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
-	:cr=^M:do=\E[B:is=\E[H\E[2J:kd=^]:kl=^_:kr=^^:ku=^\:\
-	:le=^H:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:do=\E[B:is=\E[H\E[2J:kd=^]:kl=^_:kr=^^:ku=^\:le=^H:me=\E[m:\
+	:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 
 #### Liberty Electronics (Freedom)
 #
@@ -6664,18 +6975,20 @@ f1720|f1720a|fluke 1720A:\
 #	Fax: (510)-623-7021
 
 # From: <faletti@berkeley.edu>
+# (f100: added empty <acsc> to suppress a tic warning;
+# made this relative to adm+sgr -- note that <invis> isn't
+# known to work for f100 but does on the f110. --esr)
 f100|freedom|freedom100|freedom model 100:\
 	:am:bw:hs:mi:ms:xo:\
 	:co#80:li#24:\
-	:ae=\E$:al=\EE:as=\E%:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
+	:ac=:ae=\E$:al=\EE:as=\E%:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
 	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:cv=\E[%+ :\
-	:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:\
-	:im=\Eq:ip=:is=\Eg\Ef\r\Ed:k1=^A@\r:k2=^AA\r:\
-	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
-	:k8=^AG\r:k9=^AH\r:k;=^AI\r:kB=\EI:kb=^H:kd=^V:kh=^^:\
-	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:sf=^J:so=\EG4:\
-	:sr=\Ej:st=\E1:ta=^I:ts=\Eg\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eb\Ed:
+	:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:im=\Eq:\
+	:ip=:is=\Eg\Ef\r\Ed:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:\
+	:kB=\EI:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:\
+	:sr=\Ej:st=\E1:ta=^I:ts=\Eg\Ef:up=^K:vb=\Eb\Ed:\
+	:tc=adm+sgr:
 f100-rv|freedom-rv|freedom 100 in reverse video:\
 	:is=\Eg\Ef\r\Eb:vb=\Ed\Eb:tc=f100:
 # The f110 and f200 have problems with vi(1).  They use the ^V
@@ -6684,30 +6997,19 @@ f100-rv|freedom-rv|freedom 100 in reverse video:\
 # is lost! It cannot be remapped in vi because it is necessary to enter
 # a ^V to to quote the ^V that is being remapped!!!
 # 
-# f110 users will have to decide whether
+# f110/f200 users will have to decide whether
 # to lose the down cursor key or the quoting capability. We will opt
 # initially for leaving the quoting capability out, since use of VI
 # is not generally applicable to most interactive applications
-# 
-# The same applies to f200 users, except that another option exists.
-# This option has been chosen locally. It will not be distributed unless
-# a user runs into this problem and requests assistance.  Very few users,
-# if any, should run into this problem. The local solution is in
-# vifix.local.ti.  The f200 has the ability to reprogram the down cursor
-# key. The key is reprogrammed to ^J (linefeed). This value is remembered
-# in non-volatile RAM, so powering the terminal off and on will not cause
-# the change to be lost. The terminfo definition for the f200 is changed
-# to identify <kcud1> as ^J instead of ^V.
-# (f110: added <ht>, <khome> & <kcbt> from f100 -- esr)
+# (f110: added :ta:, :kh: & <kcbt> from f100 -- esr)
 f110|freedom110|Liberty Freedom 110:\
 	:bw@:es:\
 	:it#8:ws#80:\
-	:ae=\E%%:al=\EE:as=\E$:dl=\ER:do=^V:ds=\Ef\r:\
-	:ei=\Er\EO:im=\EO\Eq:ip@:is@:k0=^AI\r:k;@:kA=\EE:\
-	:kC=^^:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:mb=\EG2:\
-	:md=\EG0:me=\EG0:mh=\EG@:mk=\EG1:mr=\EG4:pf=\Ea:\
-	:po=\E`:so=\EG<:sr=\EJ:ts=\Ef:vb=\Eb\Ed:ve=\E.2:\
-	:vi=\E.1:vs=\E.2:tc=f100:
+	:ae=\E%%:al=\EE:as=\E$:dl=\ER:do=^V:ds=\Ef\r:ei=\Er\EO:\
+	:im=\EO\Eq:ip@:is@:k0=^AI\r:k;@:kA=\EE:kC=^^:kD=\EW:kE=\ET:\
+	:kI=\EQ:kL=\ER:kS=\EY:mb=\EG2:md=\EG0:mh=\EG@:pf=\Ea:po=\E`:\
+	:so=\EG<:sr=\EJ:ts=\Ef:vb=\Eb\Ed:ve=\E.2:vi=\E.1:vs=\E.2:\
+	:tc=f100:
 f110-14|Liberty Freedom 110 14inch:\
 	:dc@:tc=f110:
 f110-w|Liberty Freedom 110 - 132 cols:\
@@ -6715,22 +7017,25 @@ f110-w|Liberty Freedom 110 - 132 cols:\
 f110-14w|Liberty Freedom 110 14in/132 cols:\
 	:co#132:\
 	:dc@:tc=f110:
+# (f200: added <acsc> to suppress tic warnings re :as:/:ae: --esr)
 f200|freedom200|Liberty Freedom 200:\
 	:am:es:hs:mi:ms:xo:\
 	:co#80:it#8:li#24:ws#80:\
-	:ae=\E%%:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:cs=\Em0%+ %+ :\
-	:ct=\E3:cv=\E[%+ :dc=\EW:dl=\ER:do=^V:ds=\Ef\r:\
-	:ei=\Er:fs=^M:ho=^^:im=\Eq:k0=^AI\r:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:kC=^^:kD=\EW:\
-	:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^V:kl=^H:kr=^L:\
-	:ku=^K:le=^H:mb=\EG2:md=\EG0:me=\EG0:mh=\EG@:mk=\EG1:\
-	:mr=\EG4:nd=^L:pf=\Ea:po=\E`:se=\EG0:sf=^J:so=\EG<:\
-	:sr=\EJ:st=\E1:ts=\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eo\En:ve=\E.1:vi=\E.0:vs=\E.1:
+	:ac=:ae=\E%%:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
+	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:cs=\Em0%+ %+ :ct=\E3:\
+	:cv=\E[%+ :dc=\EW:dl=\ER:do=^V:ds=\Ef\r:ei=\Er:fs=^M:ho=^^:\
+	:im=\Eq:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:kC=^^:\
+	:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^V:kl=^H:kr=^L:\
+	:ku=^K:le=^H:mb=\EG2:md=\EG0:mh=\EG@:nd=^L:pf=\Ea:po=\E`:\
+	:sf=^J:so=\EG<:sr=\EJ:st=\E1:ts=\Ef:up=^K:vb=\Eo\En:ve=\E.1:\
+	:vi=\E.0:vs=\E.1:\
+	:tc=adm+sgr:
 f200-w|Liberty Freedom 200 - 132 cols:\
 	:co#132:tc=f200:
+# The f200 has the ability to reprogram the down cursor key. The key is
+# reprogrammed to ^J (linefeed). This value is remembered in non-volatile RAM,
+# so powering the terminal off and on will not cause the change to be lost.
 f200vi|Liberty Freedom 200 for vi:\
 	:kd=^J:vb=\Eb\Ed:tc=f200:
 f200vi-w|Liberty Freedom 200 - 132 cols for vi:\
@@ -6754,13 +7059,13 @@ f200vi-w|Liberty Freedom 200 - 132 cols for vi:\
 go140|graphon go-140:\
 	:co#80:it#8:li#24:\
 	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=10\E[J:ce=\E[K:\
-	:cl=10\E[H\E[2J:cm=\E[%i%2;%2H:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:cl=10\E[H\E[2J:cm=\E[%i%2;%2H:dc=\E[P:dl=\E[M:ei=\E[4l:\
+	:if=/usr/share/tabset/vt100:im=\E[4h:\
 	:is=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:\
-	:ke=\E[?1l\E>:kh=\E[H:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:le=^H:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:ke=\E[?1l\E>:\
+	:kh=\E[H:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
+	:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
 go140w|graphon go-140 in 132 column mode:\
 	:am:\
 	:co#132:\
@@ -6771,14 +7076,13 @@ go140w|graphon go-140 in 132 column mode:\
 go225|go-225|Graphon 225:\
 	:am:mi:xn:\
 	:co#80:it#8:li#25:vt#3:\
-	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:dc=\E[P:\
-	:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:ke=\E>:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:\
-	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:r1=\E[!p\E[?7h\E[2;1;1#w:rc=\E8:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:\
+	:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:r1=\E[!p\E[?7h\E[2;1;1#w:rc=\E8:\
 	:rf=/usr/share/tabset/vt100:sc=\E7:se=\E[27m:sf=\ED:\
 	:so=\E[7m:sr=\EM:ta=^I:te=\E[!p\E[?7h\E[2;1;1#w:\
 	:ti=\E[2;0#w\E[1;25r:ue=\E[24m:up=\E[A:us=\E[4m:
@@ -6795,12 +7099,12 @@ go225|go-225|Graphon 225:\
 # with mfr.). It has proved reliable except for some missing padding
 # (notably after \EK and <nl> at bottom of screen).
 # 
-# The key idea is that AEP mode is poison for <cup> & that US's in 
+# The key idea is that AEP mode is poison for :cm: & that US's in 
 # the local memory should be avoided like the plague. That means 
 # that the 2048 character local buffer is used as 25 lines of 80 
 # characters, period. No scrolling local memory, folks. It also 
 # appears that we cannot use naked INS LINE feature since it uses
-# US. The sbi fakes <il1> with an 80-space insert that may be too 
+# US. The sbi fakes :al: with an 80-space insert that may be too 
 # slow at low speeds; also spaces get converted to \040 which is 
 # too long for some programs (not vi).  DEL LINE is ok but slow.
 # 
@@ -6808,13 +7112,13 @@ go225|go-225|Graphon 225:\
 # 25th line corrects the motion inherent in scrolling to Page 1.
 # 
 # There is one understood bug. It is that the screen appears to
-# pop to a new (blank) page after a <nel>, or leave a half-line 
+# pop to a new (blank) page after a :nw:, or leave a half-line 
 # ellipsis to a quad that is the extra 48 memory locations. The 
 # data received is dumped into memory but not displayed.  Not to 
-# worry if <cup> is being used; the lines not displayed will be, 
-# whenever the cursor is moved up there. Since <cup> is addressed 
+# worry if :cm: is being used; the lines not displayed will be, 
+# whenever the cursor is moved up there. Since :cm: is addressed 
 # relative to MEMORY of window, nothing is lost; but beware of 
-# relative cursor motion (<cuu1>,<cud1>,<cuf1>,<cub1>). Recommended,
+# relative cursor motion (:up:,:do:,:nd:,:le:). Recommended,
 # therefore, is setenv MORE -c .
 # 
 # WARNING: Not all features tested.
@@ -6852,14 +7156,14 @@ sb1|beehive superbee:\
 	:am:bw:da:db:mi:ul:xb:\
 	:co#80:li#25:sg#1:ug#1:\
 	:al=\EN\EL\EQ                                                                                \EP \EO\ER\EA:\
-	:bl=^G:bt=\E`:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EF%r%03%03:\
-	:cr=\r:ct=\E3:dc=\EP:dl=\EM:do=^J:ei=\ER:ho=\EH:\
-	:im=\EQ\EO:is=\EE\EX\EZ\EO\Eb\Eg\ER:k0=\E2:k1=\Ep:\
-	:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\
-	:k9=\E1:kE=\EK:kI=\EQ\EO:kL=\EM:kM=\ER:kS=\EJ:kb=^_:\
-	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:l0=TAB CLEAR:\
-	:l9=TAB SET:le=^H:nd=\EC:se=\E_3:sf=^J:so=\E_1:\
-	:st=\E1:ta=^I:ti=\EO:ue=\E_3:up=\EA:us=\E_0:
+	:bl=^G:bt=\E`:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EF%r%03%03:cr=\r:\
+	:ct=\E3:dc=\EP:dl=\EM:do=^J:ei=\ER:ho=\EH:im=\EQ\EO:\
+	:is=\EE\EX\EZ\EO\Eb\Eg\ER:k0=\E2:k1=\Ep:k2=\Eq:k3=\Er:\
+	:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:k9=\E1:kE=\EK:kI=\EQ\EO:\
+	:kL=\EM:kM=\ER:kS=\EJ:kb=^_:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
+	:ku=\EA:l0=TAB CLEAR:l9=TAB SET:le=^H:me=\E_3:nd=\EC:\
+	:se=\E_3:sf=^J:so=\E_1:st=\E1:ta=^I:ti=\EO:ue=\E_3:up=\EA:\
+	:us=\E_0:
 sbi|superbee|beehive superbee at Indiana U.:\
 	:xb:\
 	:al=1\EN\EL\EQ \EP \EO\ER\EA:cr=\r:tc=sb1:
@@ -6869,17 +7173,17 @@ sbi|superbee|beehive superbee at Indiana U.:\
 # The sb3 puts garbage on the bottom of the screen when you scroll with
 # the switch in the back set to CRLF instead of AEP.  This description
 # is tested on the sb2 but should work on all with either switch setting.
-# The f1/f2 business is for the sb1 and the <xsb> can be taken out for
+# The f1/f2 business is for the sb1 and the :xb: can be taken out for
 # the other two if you want to try to hit that tiny escape key.
 # This description is tricky: being able to use cup depends on there being
 # 2048 bytes of memory and the hairy <nl> string.
 superbee-xsb|beehive super bee:\
 	:am:da:db:xb:\
 	:co#80:it#8:li#25:\
-	:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EF%r%3%3:cr=\r:ct=\E3:\
-	:dc=\EP:dl=\EM:do=^J:ho=\EH:is=\EH\EJ:k1=\Ep:k2=\Eq:\
-	:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kd=\EB:\
-	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E_3:\
+	:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EF%r%3%3:cr=\r:ct=\E3:dc=\EP:\
+	:dl=\EM:do=^J:ho=\EH:is=\EH\EJ:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:\
+	:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:me=\E_3:nd=\EC:se=\E_3:\
 	:sf=\n\200\200\200\n\200\200\200\EA\EK\200\200\200\ET\ET:\
 	:so=\E_1:st=\E1:ta=^I:up=\EA:ve=^J:
 # This loses on lines > 80 chars long, use at your own risk
@@ -6889,46 +7193,47 @@ sb2|sb3|fixed superbee:\
 	:xb@:tc=superbee:
 
 # Reports are that most of these Beehive entries (except superbee) have not
-# been tested and do not work right.  <rmso> is a trouble spot.  Be warned.
+# been tested and do not work right.  :se: is a trouble spot.  Be warned.
 
-# (bee: <ich1> was empty, which is obviously bogus -- esr)
+# (bee: :ic: was empty, which is obviously bogus -- esr)
 beehive|bee|harris beehive:\
 	:am:mi:\
 	:co#80:li#24:\
-	:al=\EL:bt=\E>:cd=\EJ:ce=\EK:cl=\EE:cm=\EF%+ %+ :\
-	:dc=\EP:dl=\EM:do=\EB:ei=\E@:ho=\EH:im=\EQ:kA=\EL:\
-	:kB=\E>:kC=\EE:kD=\EP:kE=\EK:kI=\EQ:kL=\EM:kM=\E@:\
-	:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:\
-	:nd=\EC:se=\Ed@:so=\EdP:ue=\Ed@:up=\EA:us=\Ed`:
+	:al=\EL:bt=\E>:cd=\EJ:ce=\EK:cl=\EE:cm=\EF%+ %+ :dc=\EP:\
+	:dl=\EM:do=\EB:ei=\E@:ho=\EH:im=\EQ:kA=\EL:kB=\E>:kC=\EE:\
+	:kD=\EP:kE=\EK:kI=\EQ:kL=\EM:kM=\E@:kb=^H:kd=\EB:kh=\EH:\
+	:kl=\ED:kr=\EC:ku=\EA:le=^H:me=\Ed@:nd=\EC:se=\Ed@:so=\EdP:\
+	:ue=\Ed@:up=\EA:us=\Ed`:
 # set tab is ^F, clear (one) tab is ^V, no way to clear all tabs.
 # good grief - does this entry make :sg:/:ug: when it doesn't have to?
-# look at those spaces in <rmso>/<smso>.  Seems strange to me...
+# look at those spaces in :se:/:so:.  Seems strange to me...
+# (beehive: :if=/usr/share/tabset/beehive: removed, no such file.  If you
+# really care, cook up one using ^F -- esr)
 beehive3|bh3m|beehiveIIIm|harris beehive 3m:\
 	:am:\
 	:co#80:it#8:li#20:\
-	:al=\023:bl=^G:cd=^R:ce=^P:cl=^E^R:cr=^M:dl=\021:\
-	:do=^J:ho=^E:if=/usr/share/tabset/beehive:le=^H:\
-	:ll=^E^K:nd=^L:se= ^_:sf=^J:so=^] :ta=^I:up=^K:
+	:al=\023:bl=^G:cd=^R:ce=^P:cl=^E^R:cr=^M:dl=\021:do=^J:ho=^E:\
+	:le=^H:ll=^E^K:nd=^L:se= ^_:sf=^J:so=^] :st=^F:ta=^I:up=^K:
 beehive4|bh4|beehive 4:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cr=^M:do=^J:ho=\EH:\
-	:le=\ED:nd=\EC:sf=^J:up=\EA:
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cr=^M:do=^J:ho=\EH:le=\ED:nd=\EC:\
+	:sf=^J:up=\EA:
 microb|microbee|micro bee series:\
 	:am:\
 	:co#80:it#8:li#24:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EF%+ %+ :cr=^M:do=^J:\
-	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:\
-	:k8=\Ew:k9=\Ex:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:\
-	:le=^H:nd=\EC:se=\Ed@ :sf=^J:so= \EdP:ta=^I:ue=\Ed@:\
-	:up=\EA:us=\Ed`:
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EF%+ %+ :cr=^M:do=^J:k1=\Ep:\
+	:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:k9=\Ex:\
+	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:me=\Ed@:nd=\EC:\
+	:se=\Ed@:sf=^J:so= \EdP:ta=^I:ue=\Ed@:up=\EA:us=\Ed`:
 
 # 8675, 8686, and bee from Cyrus Rahman
 # (8675: changed k10, k11...k16 to k;, F1...F6 -- esr)
 ha8675|harris 8675:\
 	:F1=^W:F2=\ER:F3=\EE:F4=\EI:F5=\Ei:F6=\Eg:\
-	:is=\ES\E#\E*\Eh\Em\E?\E1\E9\E@\EX\EU:k1=^F:k2=^P:\
-	:k3=^N:k4=^V:k5=^J:k6=^T:k7=^H:k8=\177:k9=\Ee:k;=\Ed:tc=bee:
+	:is=\ES\E#\E*\Eh\Em\E?\E1\E9\E@\EX\EU:k1=^F:k2=^P:k3=^N:\
+	:k4=^V:k5=^J:k6=^T:k7=^H:k8=\177:k9=\Ee:k;=\Ed:\
+	:tc=bee:
 # (8686: changed k10, k11...k16 to k;, F1...F6; fixed broken continuation
 # in :is: -- esr)
 ha8686|harris 8686:\
@@ -6936,8 +7241,7 @@ ha8686|harris 8686:\
 	:F5=\002\E~\003:F6=\002\E\177\003:\
 	:is=\ES\E#\E*\Eh\Em\E?\E1\E9\E@\EX\EU\E"*Z01\E"8F35021B7C83#\E"8F45021B7D83#\E"8F55021B7E83#\E"8F65021B7F83#\E"8F75021B7383#\E"8F851BD7#\E"8F95021B7083#\E"8FA5021B7183#\E"8FB5021B7283#:\
 	:k1=\002\Ep\003:k2=\002\Eq\003:k3=\002\Er\003:\
-	:k4=\002\Es\003:k5=\E3:k6=\EI:k7=\ER:k8=\EJ:k9=\E(:\
-	:k;=\Ej:tc=bee:
+	:k4=\002\Es\003:k5=\E3:k6=\EI:k7=\ER:k8=\EJ:k9=\E(:k;=\Ej:tc=bee:
 
 #### Hazeltine
 #
@@ -6958,7 +7262,7 @@ ha8686|harris 8686:\
 #	Fairfield, NJ 07007-2078
 #
 
-# Since <cuf1> is blank, when you want to erase something you
+# Since :nd: is blank, when you want to erase something you
 # are out of luck.  You will have to do ^L's a lot to
 # redraw the screen.  h1000 is untested.  It doesn't work in
 # vi - this terminal is too dumb for even vi.  (The code is
@@ -6970,9 +7274,9 @@ hz1000|hazeltine 1000:\
 hz1420|hazeltine 1420:\
 	:am:\
 	:co#80:li#24:\
-	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:\
-	:cm=\E\021%r%.%+ :cr=^M:dl=\E^S:do=^J:le=^H:nd=^P:\
-	:se=\E^Y:sf=^J:so=\E^_:ta=^N:up=\E^L:
+	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:cm=\E\021%r%.%+ :\
+	:cr=^M:dl=\E^S:do=^J:le=^H:nd=^P:se=\E^Y:sf=^J:so=\E^_:ta=^N:\
+	:up=\E^L:
 # New "safe" cursor movement (11/87) from <cgs@umd5.umd.edu>.  Prevents
 # freakout with out-of-range args and tn3270.  No hz since it needs to
 # receive tildes.
@@ -6980,40 +7284,39 @@ hz1500|hazeltine 1500:\
 	:am:hz:\
 	:co#80:li#24:\
 	:al=~\032:bl=^G:cd=~\030:ce=~^O:cl=~^\:\
-	:cm=~\021%r%>^^ %+`%+`:cr=^M:dl=~\023:do=~^K:ho=~^R:\
-	:kd=^J:kh=~^R:kl=^H:kr=^P:ku=~^L:le=^H:nd=^P:se=~^Y:\
-	:sf=^J:so=~^_:up=~^L:
+	:cm=~\021%r%>^^ %+`%+`:cr=^M:dl=~\023:do=~^K:ho=~^R:kd=^J:\
+	:kh=~^R:kl=^H:kr=^P:ku=~^L:le=^H:nd=^P:se=~^Y:sf=^J:so=~^_:\
+	:up=~^L:
 # h1510 assumed to be in sane escape mode.  Else use h1500.
-# (h1510: early versions of this entry apparently had "<rmso>=\E^_, 
-# <smso>=\E^Y, but these caps were commented out in 8.3; also,
+# (h1510: early versions of this entry apparently had ":se=\E^_:, 
+# :so=\E^Y:, but these caps were commented out in 8.3; also,
 # removed incorrect and overridden ":do=^J:" -- esr)
 hz1510|hazeltine 1510:\
 	:am:\
 	:co#80:li#24:\
-	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:\
-	:cm=\E\021%r%.%.:cr=^M:dl=\E^S:do=\E^K:le=^H:nd=^P:\
-	:sf=^J:up=\E^L:
+	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:cm=\E\021%r%.%.:\
+	:cr=^M:dl=\E^S:do=\E^K:le=^H:nd=^P:sf=^J:up=\E^L:
 # (h1520: removed incorrect and overridden ":do=^J:" -- esr)
 hz1520|hazeltine 1520:\
 	:am:hz:\
 	:co#80:li#24:\
-	:al=~^Z:bl=^G:cd=~^X:ce=~^O:cl=~^\:cm=~\021%r%.%.:\
-	:cr=^M:dl=~^S:do=~^K:ho=~^R:le=^H:nd=^P:se=~^Y:sf=^J:\
-	:so=~^_:up=~^L:
+	:al=~^Z:bl=^G:cd=~^X:ce=~^O:cl=~^\:cm=~\021%r%.%.:cr=^M:\
+	:dl=~^S:do=~^K:ho=~^R:le=^H:nd=^P:se=~^Y:sf=^J:so=~^_:up=~^L:
 # Note: the h1552 appears to be the first Hazeltine terminal which
 # is not braindamaged.  It has tildes and backprimes and everything!
 # Be sure the auto lf/cr switch is set to cr.
 hz1552|hazeltine 1552:\
-	:al=\EE:dl=\EO:do=^J:k1=\EP:k2=\EQ:k3=\ER:l1=blue:\
-	:l2=red:l3=green:tc=vt52:
+	:al=\EE:dl=\EO:do=^J:k1=\EP:k2=\EQ:k3=\ER:l1=blue:l2=red:\
+	:l3=green:\
+	:tc=vt52:
 hz1552-rv|hazeltine 1552 reverse video:\
 	:do=^J:se=\ET:so=\ES:tc=hz1552:
 # Note: h2000 won't work well because of a clash between upper case and ~'s.
 hz2000|hazeltine 2000:\
 	:am:nc:\
 	:co#74:li#27:\
-	:al=~\032:bl=^G:cl=~\034:cm=~\021%r%.%.:dl=~\023:\
-	:do=^J:ho=~^R:le=^H:pc=\177:sf=^J:
+	:al=~\032:bl=^G:cl=~\034:cm=~\021%r%.%.:dl=~\023:do=^J:\
+	:ho=~^R:le=^H:pc=\177:sf=^J:
 # Date: Fri Jul 23 10:27:53 1982.  Some unknown person wrote:
 # I tested this termcap entry for the Hazeltine Esprit with vi. It seems
 # to work ok. There is one problem though if one types a lot of garbage
@@ -7026,12 +7329,12 @@ esprit|Hazeltine Esprit I:\
 	:am:bw:\
 	:co#80:li#24:\
 	:al=\E^Z:bl=^G:bt=\E^T:cd=\E^W:ce=\E^O:cl=\E^\:\
-	:cm=\E\021%r%.%.:cr=^M:dl=\E^S:do=\E^K:ho=\E^R:\
-	:is=\E?:k0=^B0^J:k1=^B1^J:k2=^B2^J:k3=^B3^J:k4=^B4^J:\
-	:k5=^B5^J:k6=^B6^J:k7=^B7^J:k8=^B8^J:k9=^B9^J:kb=^H:\
-	:kd=\E^K:ke=\E>:kh=\E^R:kl=^H:kr=^P:ks=\E<:ku=\E^L:\
-	:l0=0:l1=1:l2=2:l3=3:l4=4:l5=5:l6=6:l7=7:l8=8:l9=9:\
-	:le=^H:nd=^P:se=\E^Y:sf=^J:so=\E^_:up=\E^L:
+	:cm=\E\021%r%.%.:cr=^M:dl=\E^S:do=\E^K:ho=\E^R:is=\E?:\
+	:k0=^B0^J:k1=^B1^J:k2=^B2^J:k3=^B3^J:k4=^B4^J:k5=^B5^J:\
+	:k6=^B6^J:k7=^B7^J:k8=^B8^J:k9=^B9^J:kb=^H:kd=\E^K:ke=\E>:\
+	:kh=\E^R:kl=^H:kr=^P:ks=\E<:ku=\E^L:l0=0:l1=1:l2=2:l3=3:l4=4:\
+	:l5=5:l6=6:l7=7:l8=8:l9=9:le=^H:nd=^P:se=\E^Y:sf=^J:so=\E^_:\
+	:up=\E^L:
 esprit-am|hazeltine esprit auto-margin:\
 	:am:tc=esprit:
 
@@ -7044,19 +7347,20 @@ ibm327x|line mode IBM 3270 style:\
 
 # Beware! The 3101 entry IBM shipped with AIX 3 is *wrong*.  Losers...
 # From: J.B. Nicholson-Owens <jeffo@uiuc.edu> 8 Mar 94
+# (ibm3101: :if=/usr/share/tabset/ibm3101: removed, no such file -- esr)
 ibm3101|i3101|IBM 3101-10:\
 	:am:xo:\
 	:co#80:li#24:\
-	:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EY%+ %+ :cr=^M:\
-	:ct=\E1:do=^J:ho=\EH:if=/usr/share/tabset/ibm3101:\
-	:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
+	:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EY%+ %+ :cr=^M:ct=\E1:do=^J:\
+	:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
 	:nw=^M^J:sf=^J:st=\E0:ta=^I:up=\EA:
 #   Received from the IBM terminals division (given to DRB)
 #   June 1988 for PS/2 OS 2.2.3 cut
 ibm3151|i3151|IBM 3151:\
 	:me=\E4@:\
 	:..sa=\E4%{64}%?%p1%{0}%>%p1%{4}%<%&%t%{8}%|%;%?%p1%{7}%=%t%{16}%|%;%?%p2%t%{1}%|%;%?%p3%t%{4}%|%;%?%p4%t%{2}%|%;%c:\
-	:se=\E4@:so=\E4A:ue=\E4@:us=\E4B:tc=ibm3163:
+	:se=\E4@:so=\E4A:ue=\E4@:us=\E4B:\
+	:tc=ibm3163:
 # From: Mark Easter <marke@fsi-ssd.csg.ssd.fsi.com> 29 Oct 1992 
 # I've commented out or translated some IBM extensions.
 ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display:\
@@ -7066,17 +7370,16 @@ ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display:\
 	:F6=\E!d\r:F7=\E!e\r:F8=\E!f\r:F9=\E!g\r:FA=\E!h\r:\
 	:FB=\E!i\r:FC=\E!j\r:FD=\E!k\r:FE=\E!l\r:\
 	:ac=l\354q\361k\353x\370j\352m\355w\367u\365v\366t\364n\356:\
-	:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
-	:dc=\EQ:dl=\EO:do=\EB:ho=\EH:k1=\Ea\r:k2=\Eb\r:\
-	:k3=\Ec\r:k4=\Ed\r:k5=\Ee\r:k6=\Ef\r:k7=\Eg\r:\
-	:k8=\Eh\r:k9=\Ei\r:k;=\Ej\r:kA=\EN:kB=\E2:kC=\EL\r:\
-	:kD=\EQ:kE=\EI:kI=\EP \010:kL=\EO:kS=\EJ:kT=\E0:\
-	:ka=\E 1:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:kt=\E1:\
-	:ku=\EA:le=\ED:mb=\E4D:md=\E4H:me=\E4@\E<@:mk=\E4P:\
+	:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:dc=\EQ:\
+	:dl=\EO:do=\EB:ho=\EH:k1=\Ea\r:k2=\Eb\r:k3=\Ec\r:k4=\Ed\r:\
+	:k5=\Ee\r:k6=\Ef\r:k7=\Eg\r:k8=\Eh\r:k9=\Ei\r:k;=\Ej\r:\
+	:kA=\EN:kB=\E2:kC=\EL\r:kD=\EQ:kE=\EI:kI=\EP \010:kL=\EO:\
+	:kS=\EJ:kT=\E0:ka=\E 1:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
+	:kt=\E1:ku=\EA:le=\ED:mb=\E4D:md=\E4H:me=\E4@\E<@:mk=\E4P:\
 	:mr=\E4A:nd=\EC:\
 	:..sa=\E4%'@'%?%p1%t%'A'%|%;\n%?%p2%t%'B'%|%;\n%?%p3%t%'A'%|%;\n%?%p4%t%'D'%|%;\n%?%p5%t%'@'%|%;\n%?%p6%t%'H'%|%;\n%?%p7%t%'P'%|%;%c\n%?%p9%t\E>A%e\E<@%;:\
-	:se=\E4@:sf=^J:so=\E4A:te=\E>A:ti=\E>A:ue=\E4@:\
-	:up=\EA:us=\E4B:
+	:se=\E4@:sf=^J:so=\E4A:te=\E>A:ti=\E>A:ue=\E4@:up=\EA:\
+	:us=\E4B:
 
 # How the 3164 sgr string works:
 #	%{32}	        # push space for no special video characteristics
@@ -7095,22 +7398,22 @@ ibm3164|i3164|IBM 3164:\
 ibmaed|IBM Experimental display:\
 	:am:eo:ms:\
 	:co#80:it#8:li#52:\
-	:al=\EN:cd=\EJ:ce=\EI:cl=\EH\EK:cm=\EY%+ %+ :dc=\EQ:\
-	:dl=\EO:do=\EB:ei=:ho=\EH:ic=\EP:im=:kb=^H:kd=\EB:\
-	:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E0:so=\E0:\
-	:ta=^I:up=\EA:vb=\EG:
+	:al=\EN:cd=\EJ:ce=\EI:cl=\EH\EK:cm=\EY%+ %+ :dc=\EQ:dl=\EO:\
+	:do=\EB:ei=:ho=\EH:ic=\EP:im=:kb=^H:kd=\EB:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:me=\E0:nd=\EC:se=\E0:so=\E0:ta=^I:up=\EA:\
+	:vb=\EG:
 ibm-apl|apl|IBM apl terminal simulator:\
 	:li#25:tc=dm1520:
 # (ibmmono: this had an unknown `sb' boolean, I changed it to `bs'.  
 # Also it had ":I0=f10:" which pretty obviously should be "l0=f10" -- esr)
 ibmmono|ibm5151|IBM workstation monochrome:\
 	:es:hs:\
-	:al=\EL:dl=\EM:ds=\Ej\EY8 \EI\Ek:fs=\Ek:k0=\E<:\
-	:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:\
-	:k8=\ER:k9=\EY:kF=\EE:kI=\200:kN=\EE:kP=\Eg:kR=\EG:\
-	:kb=^H:kh=\EH:l0=f10:md=\EZ:me=\Ew\Eq\Ez\EB:\
-	:mk=\EF\Ef0;\Eb0;:mr=\Ep:se=\Ez:so=\EZ:sr=\EA:\
-	:ts=\Ej\EY8%+ \Eo:ue=\Ew:us=\EW:tc=ibm3101:
+	:al=\EL:dl=\EM:ds=\Ej\EY8 \EI\Ek:fs=\Ek:k0=\E<:k1=\ES:\
+	:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:k9=\EY:\
+	:kF=\EE:kI=\200:kN=\EE:kP=\Eg:kR=\EG:kb=^H:kh=\EH:l0=f10:\
+	:md=\EZ:me=\Ew\Eq\Ez\EB:mk=\EF\Ef0;\Eb0;:mr=\Ep:se=\Ez:\
+	:so=\EZ:sr=\EA:ts=\Ej\EY8%+ \Eo:ue=\Ew:us=\EW:\
+	:tc=ibm3101:
 ibmega|ibm5154|IBM Enhanced Color Display:\
 	:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ibmmono:
 ibmega-c|ibm5154-c|IBM Enhanced Color Display:\
@@ -7136,40 +7439,37 @@ ibmapa8c-c|ibm6154-c|IBM 6154 Advanced Color Graphics Display:\
 # pretty obviously mislabeled for :le: and :nd:; also ":ul=\E[4m:" was clearly
 # a typo for ":us=\E[4m:"; also ":el=\E[K:" was a typo for ":ce=\E[K:".
 # I also added <rmam>/<smam> based on the terminal reset string.
-# There was an unknown boolean ":ht:" which I assume was meant to set 
-# hardware tabs, so I have inserted it#8. Finally, "ac=^N" paired with the
-# ae looked like a typo for ":as=^N:" -- esr)
+# There was an unknown boolean ":ht:" which I assume was meant to set hardware
+# tabs, so I have inserted it#8. Finally, :ac=^N: paired with the :ae: looked
+# like a typo for :as=^N:; finally, added empty <acsc> to quiet tic -- esr)
 ibm8512|ibm8513|hft-c|IBM High Function Terminal:\
 	:am:mi:ms:\
 	:co#80:it#8:li#25:\
-	:AL=\E[%dL:DL=\E[%dM:RA=\E[?7l:SA=\E[?7h:ae=^O:\
-	:al=\E[L:as=^N:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:dl=\E[M:dm=\E[4h:do=^J:ec=\E[%dX:\
-	:ed=\E[4l:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\Eb\E[m\017\E[?7h:k0=\E[010q:k1=\E[001q:\
-	:k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:\
-	:k6=\E[006q:k7=\E[007q:k8=\E[008q:k9=\E[009q:kd=\E[B:\
-	:kh=\E[H:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:r1=\Eb\E[m\017\E[?7h\E[H\E[J:\
-	:rc=\E[u:sc=\E[s:se=\E[m:so=\E[7m:te=\E[20h:\
-	:ti=\E[20;4l\E[?7h\Eb:ue=\E[m:up=\E[A:us=\E[4m:
+	:AL=\E[%dL:DL=\E[%dM:RA=\E[?7l:SA=\E[?7h:ac=:ae=^O:al=\E[L:\
+	:as=^N:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:dl=\E[M:\
+	:dm=\E[4h:do=^J:ec=\E[%dX:ed=\E[4l:ei=\E[4l:ho=\E[H:\
+	:im=\E[4h:is=\Eb\E[m\017\E[?7h:k0=\E[010q:k1=\E[001q:\
+	:k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:k6=\E[006q:\
+	:k7=\E[007q:k8=\E[008q:k9=\E[009q:kd=\E[B:kh=\E[H:ku=\E[A:\
+	:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r1=\Eb\E[m\017\E[?7h\E[H\E[J:rc=\E[u:sc=\E[s:se=\E[m:\
+	:so=\E[7m:te=\E[20h:ti=\E[20;4l\E[?7h\Eb:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 hft|AIWS High Function Terminal:\
 	:am:xo:\
 	:co#80:li#25:\
 	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=\E6:\
-	:ho=\E[H:ic=\E[@:im=\E6:k1=\E[001q:k2=\E[002q:\
-	:k3=\E[003q:k4=\E[004q:k5=\E[005q:k6=\E[006q:\
-	:k7=\E[007q:k8=\E[008q:k9=\E[009q:kN=\E[153q:\
-	:kP=\E[159q:ka=\E[010q:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mk=\E[8m:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:\
-	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=\E6:ho=\E[H:\
+	:ic=\E[@:im=\E6:k1=\E[001q:k2=\E[002q:k3=\E[003q:\
+	:k4=\E[004q:k5=\E[005q:k6=\E[006q:k7=\E[007q:k8=\E[008q:\
+	:k9=\E[009q:kN=\E[153q:kP=\E[159q:ka=\E[010q:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mk=\E[8m:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:\
+	:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 ibm-system1|system1|ibm system/1 computer:\
 	:am:xt:\
 	:co#80:li#24:\
-	:bl=^G:cl=^Z:cm=\005%+ %+ :ho=^K:le=^H:nd=^\:sf=^J:\
-	:up=^^:
+	:bl=^G:cl=^Z:cm=\005%+ %+ :ho=^K:le=^H:nd=^\:sf=^J:up=^^:
 
 # From: <pryor@math.berkeley.edu>
 ibm5081|ibmmpel|IBM 5081 1024x1024 256/4096 color display:\
@@ -7183,13 +7483,15 @@ ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 enhanced color display:\
 ibm8514|IBM 8514 color display:\
 	:es:hs:\
 	:li#41:\
-	:cr=^M:do=^J:ds=\Ej\EYI \EI\Ek:fs=\Ek:kb=^H:kd=^J:\
-	:kl=^H:nw=^M^J:sf=^J:ta=^I:ts=\Ej\EYI%+ \Eo:tc=ibmega:
+	:cr=^M:do=^J:ds=\Ej\EYI \EI\Ek:fs=\Ek:kb=^H:kd=^J:kl=^H:\
+	:nw=^M^J:sf=^J:ta=^I:ts=\Ej\EYI%+ \Eo:\
+	:tc=ibmega:
 ibm8514-c|IBM 8514 color display:\
 	:es:hs:\
 	:li#41:\
-	:cr=^M:do=^J:ds=\Ej\EYI \EI\Ek:fs=\Ek:kb=^H:kd=^J:\
-	:kl=^H:nw=^M^J:sf=^J:ta=^I:ts=\Ej\EYI%+ \Eo:tc=ibmega-c:
+	:cr=^M:do=^J:ds=\Ej\EYI \EI\Ek:fs=\Ek:kb=^H:kd=^J:kl=^H:\
+	:nw=^M^J:sf=^J:ta=^I:ts=\Ej\EYI%+ \Eo:\
+	:tc=ibmega-c:
 
 #
 # AIX entries.  IBM ships these with AIX 3. 
@@ -7198,17 +7500,20 @@ ibm8514-c|IBM 8514 color display:\
 #
 aixterm-m|IBM AIXterm Monochrome Terminal Emulator:\
 	:es:hs:\
-	:ac=llqqkkxxjjmmwwuuvvttnn:ds=\E[?E:fs=\E[?F:\
-	:md=\E[1m:me=\E[0;10m\E(B:s0=\E(B:s1=\E(0:\
+	:ac=llqqkkxxjjmmwwuuvvttnn:ds=\E[?E:fs=\E[?F:md=\E[1m:\
+	:me=\E[0;10m\E(B:s0=\E(B:s1=\E(0:\
 	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
-	:sr@:ts=\E[?%p1%dT:tc=ibm6153:
+	:sr@:ts=\E[?%p1%dT:\
+	:tc=ibm6153:
 aixterm-m-old|IBM AIXterm Monochrome Terminal Emulator:\
 	:es:hs:\
 	:ds=\E[?E:fs=\E[?F:md=\E[1m:\
 	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
-	:sr@:ts=\E[?%p1%dT:tc=ibm6153:
+	:sr@:ts=\E[?%p1%dT:\
+	:tc=ibm6153:
 jaixterm-m|IBM Kanji AIXterm Monochrome Terminal Emulator:\
-	:ac@:tc=aixterm-m:
+	:ac@:\
+	:tc=aixterm-m:
 
 #### Infoton/General Terminal Corp.
 #
@@ -7217,28 +7522,27 @@ jaixterm-m|IBM Kanji AIXterm Monochrome Terminal Emulator:\
 i100|gt100|gt100a|General Terminal 100A (formerly Infoton 100):\
 	:am:\
 	:co#80:li#24:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\Ef%r%+ %+ :\
-	:cr=^M:dl=\EM:do=^J:ho=\EH:le=^H:nd=\EC:se=\Ea:sf=^J:\
-	:so=\Eb:up=\EA:vb=\Eb\Ea:
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\Ef%r%+ %+ :cr=^M:\
+	:dl=\EM:do=^J:ho=\EH:le=^H:nd=\EC:se=\Ea:sf=^J:so=\Eb:up=\EA:\
+	:vb=\Eb\Ea:
 i400|infoton 400:\
 	:am:\
 	:co#80:li#25:\
 	:al=\E[L:bl=^G:ce=\E[N:cl=\E[2J:cm=%i\E[%3;%3H:cr=^M:\
 	:dc=\E[4h\E[2Q\E[P\E[4l\E[0Q:dl=\E[M:do=^J:\
-	:ei=\E[4l\E[0Q:im=\E[4h\E[2Q:le=^H:nd=\E[C:sf=^J:\
-	:up=\E[A:
+	:ei=\E[4l\E[0Q:im=\E[4h\E[2Q:le=^H:nd=\E[C:sf=^J:up=\E[A:
 # (addrinfo: removed obsolete ":bc=^Z:" -- esr)
 addrinfo:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=^K:cl=^L:..cm=\037%p1%{1}%-%c%p2%{1}%-%c:\
-	:cr=^M:do=^J:ho=^H:le=^Z:ll=^H^\:nd=^Y:sf=^J:up=^\:
-# (infoton: used to have the no-ops <lh>#0, <lw>#0, <nlab>#0 -- esr)
+	:bl=^G:cd=^K:cl=^L:..cm=\037%p1%{1}%-%c%p2%{1}%-%c:cr=^M:\
+	:do=^J:ho=^H:le=^Z:ll=^H^\:nd=^Y:sf=^J:up=^\:
+# (infoton: used to have the no-ops <lh#0>, <lw#0>, <nlab#0> -- esr)
 infoton:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=^K:cl=^L:cr=^M:do=^J:le=^Z:ll=^H^\:nd=^Y:\
-	:sf=^J:up=^\:
+	:bl=^G:cd=^K:cl=^L:cr=^M:do=^J:le=^Z:ll=^H^\:nd=^Y:sf=^J:\
+	:up=^\:
 
 #### Interactive Systems Corp
 #
@@ -7254,24 +7558,23 @@ intext|Interactive Systems Corporation modified owl 1200:\
 	:am:\
 	:co#80:it#8:li#24:sg#1:\
 	:al=\020:bl=^G:bt=^Y:cd=\026J:ce=^Kp^R:cl=\014:\
-	:cm=\017%+ %+ :cr=^M:dc=\022:dl=\021:do=^J:ei=^V<:\
-	:im=^V;:ip=:k0=^VJ\r:k1=^VA\r:k2=^VB\r:k3=^VC\r:\
-	:k4=^VD\r:k5=^VE\r:k6=^VF\r:k7=^VG\r:k8=^VH\r:\
-	:k9=^VI\r:kb=^H:kd=^J:ke=^V9:kh=^Z:kl=^_:kr=^^:\
-	:ks=\036\072\264\026%:ku=^\:le=^H:nd=^^:se=^V# :\
-	:sf=^J:so=^V$\054:ta=^I:up=^\:
+	:cm=\017%+ %+ :cr=^M:dc=\022:dl=\021:do=^J:ei=^V<:im=^V;:\
+	:ip=:k0=^VJ\r:k1=^VA\r:k2=^VB\r:k3=^VC\r:k4=^VD\r:k5=^VE\r:\
+	:k6=^VF\r:k7=^VG\r:k8=^VH\r:k9=^VI\r:kb=^H:kd=^J:ke=^V9:\
+	:kh=^Z:kl=^_:kr=^^:ks=\036\072\264\026%:ku=^\:le=^H:nd=^^:\
+	:se=^V# :sf=^J:so=^V$\054:ta=^I:up=^\:
 intext2|intextii|INTERACTIVE modified owl 1251:\
 	:am:bw:ul:\
 	:co#80:li#24:sg#0:\
 	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%+^AG:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
 	:do=\E[B:ei=:ic=\E[@:im=:k0=\E@\r:k1=\EP\r:k2=\EQ\r:\
-	:k3=\ES\r:k4=\ET\r:k5=\EU\r:k6=\EV\r:k7=\EW\r:\
-	:k8=\EX\r:k9=\EY\r:kb=^H:kd=\EB\r:kh=\ER\r:kl=\ED\r:\
-	:kr=\EC\r:ku=\EA\r:l0=REFRSH:l1=DEL CH:l2=TABSET:\
-	:l3=GOTO:l4=+PAGE:l5=+SRCH:l6=-PAGE:l7=-SRCH:l8=LEFT:\
-	:l9=RIGHT:nd=\E[C:se=\E[2 D:sf=\E[S:so=\E[6 D:\
-	:sr=\E[T:ta=^I:ue=\E[2 D:up=\E[A:us=\E[18 D:\
+	:k3=\ES\r:k4=\ET\r:k5=\EU\r:k6=\EV\r:k7=\EW\r:k8=\EX\r:\
+	:k9=\EY\r:kb=^H:kd=\EB\r:kh=\ER\r:kl=\ED\r:kr=\EC\r:\
+	:ku=\EA\r:l0=REFRSH:l1=DEL CH:l2=TABSET:l3=GOTO:l4=+PAGE:\
+	:l5=+SRCH:l6=-PAGE:l7=-SRCH:l8=LEFT:l9=RIGHT:nd=\E[C:\
+	:se=\E[2 D:sf=\E[S:so=\E[6 D:sr=\E[T:ta=^I:ue=\E[2 D:\
+	:up=\E[A:us=\E[18 D:\
 	:vb=\E[;;;;;;;;;2;;u\E[;;;;;;;;;1;;u:
 
 #### Kimtron (abm, kt)
@@ -7285,29 +7588,28 @@ intext2|intextii|INTERACTIVE modified owl 1251:\
 abm85|Kimtron ABM 85:\
 	:am:bw:ms:\
 	:co#80:it#8:li#24:sg#1:ug#1:\
-	:al=\EE:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :\
-	:dc=\EW:dl=\ER:do=^J:ei=\Er:\
-	:if=/usr/share/tabset/stdcrt:im=\EQ:\
+	:al=\EE:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :dc=\EW:\
+	:dl=\ER:do=^J:ei=\Er:if=/usr/share/tabset/stdcrt:im=\EQ:\
 	:is=\EC\EX\Eg\En\E%\Er\E(\Ek\Em\Eq:kb=^H:kd=^J:kh=^^:\
-	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\Ek:so=\Ej:ta=^I:\
-	:ue=\Em:up=^K:us=\El:
+	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\Ek:so=\Ej:ta=^I:ue=\Em:\
+	:up=^K:us=\El:
 # Kimtron ABM 85H added by Dual Systems.
 # Some notes about the 85h entries:
 # 1) there are several firmware revs of 85H in the world. Use abm85h-old for
 #    firmware revs prior to SP51
 # 2) Make sure to use 85h entry if the terminal is in 85H mode and the
 #    85e entry if it is in 920 emulation mode. They are incompatible in
-#    some places and NOT software settable i.e., <is2> can't fix it)
+#    some places and NOT software settable i.e., :is: can't fix it)
 # 3) In 85h mode, the arrow keys and special functions transmit when
 #    the terminal is in dup-edit, and work only locally in local-edit.
-#    Vi won't swallow `del char' for instance, but <smcup> turns on
+#    Vi won't swallow `del char' for instance, but :ti: turns on
 #    dup-edit anyway so that the arrow keys will work right. If the
-#    arrow keys don't work the way you like, change <smcup>, <rmcup>, and
-#    <is2>.  Note that 920E mode does not have software commands to toggle
+#    arrow keys don't work the way you like, change :ti:, :te:, and
+#    :is:.  Note that 920E mode does not have software commands to toggle
 #    between dup and local edit, so you get whatever was set last on the
 #    terminal.
-# 4) <flash> attribute is nice, but seems too slow to work correctly
-#    (\Eb<pad>\Ed)
+# 4) :vb: attribute is nice, but seems too slow to work correctly
+#    (\Eb:pc:\Ed)
 # 5) Make sure `hidden' attributes are selected. If `embedded' attributes
 #    are selected, the <xmc@> entry should be removed.
 # 6) auto new-line should be on (selectable from setup mode only)
@@ -7315,34 +7617,36 @@ abm85|Kimtron ABM 85:\
 # From: Erik Fair <fair@ucbarpa>  Sun Oct 27 07:21:05 1985
 abm85h|Kimtron ABM 85H native mode:\
 	:hs:\
-	:sg@:ug@:\
+	:sg@:\
 	:bl=^G:ds=\Ee:fs=^M:im=\EZ:\
 	:is=\EC\EN\EX\024\016\EA\Ea\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\EG0\Ed\E.4\El:\
-	:kd=^V:me=\E(\EG0:mh=\E):mr=\EG4:se=\EG0:so=\EG4:\
-	:ts=\Eg\Ef:ue=\EG0:us=\EG8:vb@:ve=\E.4:vs=\E.2:tc=abm85:
+	:kd=^V:me=\E(\EG0:mh=\E):mk@:ts=\Eg\Ef:vb@:ve=\E.4:vs=\E.2:\
+	:tc=adm+sgr:tc=abm85:
 abm85e|Kimtron ABM 85H in 920E mode:\
 	:sg@:\
 	:bl=^G:im=\EZ:\
 	:is=\EC\EX\EA\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\Ek\Eq\Em:\
-	:me=\E(\Ek:mh=\E):mr=\Ej:vb@:tc=abm85:
+	:me=\E(\Ek:mh=\E):mr=\Ej:vb@:\
+	:tc=abm85:
 abm85h-old|oabm85h|o85h|Kimtron ABM 85H with old firmware rev.:\
 	:sg@:\
 	:bl=^G:im=\EZ:\
 	:is=\E}\EC\EX\Ee\En\E%\Er\E(\Ek\Em\Eq\Ed\ET\EC\E9\EF:\
-	:me=\E(\Ek:mh=\E):mr=\Ej:tc=abm85:
+	:me=\E(\Ek:mh=\E):mr=\Ej:\
+	:tc=abm85:
 # From: <malman@bbn-vax.arpa>
 # (kt7: removed obsolete :ma=^V^J^L :" -- esr)
 kt7|kimtron model kt-7:\
 	:am:\
 	:co#80:it#8:li#24:\
-	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :\
-	:dc=\EW:dl=\ER:do=^V:ei=:fs=\Eg:ho=^^:ic=\EQ:\
+	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :dc=\EW:\
+	:dl=\ER:do=^V:ei=:fs=\Eg:ho=^^:ic=\EQ:\
 	:if=/usr/share/tabset/stdcrt:im=:is=\El\E":k0=^AI\r:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:kB=\EI:\
-	:kC=^Z:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:\
-	:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:\
-	:so=\EG4:ta=^I:ts=\Ef:ue=\EG0:up=^K:us=\EG8:
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:kB=\EI:kC=^Z:kD=\EW:\
+	:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:mk@:nd=^L:ta=^I:ts=\Ef:up=^K:\
+	:tc=adm+sgr:
 
 #### Microterm (act, mime)
 #
@@ -7351,8 +7655,8 @@ kt7|kimtron model kt-7:\
 #
 
 # New "safe" cursor movement (5/87) from <reuss@umd5.umd.edu>.  Prevents
-# freakout with out-of-range args on Sytek multiplexors.  No <smso>=^N and
-# <rmso>=^N since  it gets confused and it's too dim anyway.  No <ich1>
+# freakout with out-of-range args on Sytek multiplexors.  No :so=^N: and
+# :se=^N: since  it gets confused and it's too dim anyway.  No :ic:
 # since Sytek insists ^S means xoff.
 # (act4: found ":ic=2^S:ei=:im=:ip=.1*^V:" commented out in 8.3 -- esr)
 act4|microterm|microterm act iv:\
@@ -7360,8 +7664,8 @@ act4|microterm|microterm act iv:\
 	:co#80:li#24:\
 	:al=2.3*\001<2.3*/>:bl=^G:cd=2.2*\037:ce=.1*\036:\
 	:cl=12\014:cm=\024%+^X%>/0%+P:cr=^M:dc=.1*\004:\
-	:dl=2.3*\027:do=^K:ho=^]:kd=^K:kl=^H:kr=^X:ku=^Z:\
-	:le=^H:nd=^X:sf=^J:up=^Z:
+	:dl=2.3*\027:do=^K:ho=^]:kd=^K:kl=^H:kr=^X:ku=^Z:le=^H:nd=^X:\
+	:sf=^J:up=^Z:
 # The padding on :sr: and :ta: for act5 and mime is a guess and not final.
 # The act 5 has hardware tabs, but they are in columns 8, 16, 24, 32, 41 (!)...
 # (microterm5: removed obsolete ":ma==^Z^P^Xl^Kj:" -- esr)
@@ -7379,27 +7683,25 @@ mime-hb|half bright mime1:\
 mime|mime1|mime2|mimei|mimeii|microterm mime1:\
 	:am:\
 	:co#80:it#8:li#24:vt#9:\
-	:al=\001:bl=^G:cd=^_:ce=^^:cl=^]^C:\
-	:cm=\024%+^X%> 0%+P:cr=^M:dl=\027:do=^J:ho=^]:\
-	:is=^S\E^Q:kd=^K:kl=^H:kr=^X:ku=^Z:le=^H:nd=^X:sf=^J:\
-	:sr=\022:ta=\011:uc=^U:up=^Z:
+	:al=\001:bl=^G:cd=^_:ce=^^:cl=^]^C:cm=\024%+^X%> 0%+P:\
+	:cr=^M:dl=\027:do=^J:ho=^]:is=^S\E^Q:kd=^K:kl=^H:kr=^X:ku=^Z:\
+	:le=^H:nd=^X:sf=^J:sr=\022:ta=\011:uc=^U:up=^Z:
 # These termcaps (for mime 2a) put the terminal in low intensity mode
 # since high intensity mode is so obnoxious.
 mime2a-s|microterm mime2a (emulating an enhanced soroc iq120):\
 	:am:\
 	:co#80:li#24:\
-	:al=\001:bl=^G:cd=\EJ:ce=\EK:cl=\EL:cm=\E=%+ %+ :\
-	:cr=^M:dc=\ED:dl=\027:do=^J:ei=^Z:ho=^^:im=\EE:ip=:\
-	:is=\E):kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\E;:\
-	:sf=^J:so=\E\072:sr=\EI:ue=\E7:up=\EI:us=\E6:
+	:al=\001:bl=^G:cd=\EJ:ce=\EK:cl=\EL:cm=\E=%+ %+ :cr=^M:\
+	:dc=\ED:dl=\027:do=^J:ei=^Z:ho=^^:im=\EE:ip=:is=\E):kd=^J:\
+	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\E;:sf=^J:so=\E\072:sr=\EI:\
+	:ue=\E7:up=\EI:us=\E6:
 # This is the preferred mode (but ^X can't be used as a kill character)
 mime2a|mime2a-v|microterm mime2a (emulating an enhanced vt52):\
 	:co#80:it#8:li#24:\
-	:al=\001:bl=^G:cd=\EQ:ce=\EP:cl=\EL:cm=\EY%+ %+ :\
-	:cr=^M:dc=^N:dl=\027:do=^J:ei=^Z:ho=\EH:im=^O:ip=:\
-	:is=^Y:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
-	:se=\E9:sf=^J:so=\E8:sr=\EA:ta=^I:ue=\E5:up=\EA:\
-	:us=\E4:
+	:al=\001:bl=^G:cd=\EQ:ce=\EP:cl=\EL:cm=\EY%+ %+ :cr=^M:\
+	:dc=^N:dl=\027:do=^J:ei=^Z:ho=\EH:im=^O:ip=:is=^Y:kd=\EB:\
+	:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E9:sf=^J:so=\E8:\
+	:sr=\EA:ta=^I:ue=\E5:up=\EA:us=\E4:
 # (mime3a: removed obsolete ":ma=^X ^K^J^Z^P:" -- esr)
 mime3a|mime1 emulating 3a:\
 	:am@:\
@@ -7418,16 +7720,14 @@ mime3ax|mime-3ax|mime1 emulating enhanced 3a:\
 mime314|mm314|mime 314:\
 	:am:\
 	:co#80:li#24:\
-	:al=^A:cd=^_:ce=^^:cl=^L:cm=\024%.%.:dc=^D:dl=^W:\
-	:ei=^V:ho=^]:im=^S:kd=^K:kl=^H:kr=^X:ku=^Z:le=^H:\
-	:nd=^X:ta=^I:up=^Z:
+	:al=^A:cd=^_:ce=^^:cl=^L:cm=\024%.%.:dc=^D:dl=^W:ei=^V:ho=^]:\
+	:im=^S:kd=^K:kl=^H:kr=^X:ku=^Z:le=^H:nd=^X:ta=^I:up=^Z:
 # Microterm mime 340 from University of Wisconsin
 mm340|mime340|mime 340:\
 	:co#80:li#24:\
 	:al=46\EU:cd=2*\037:ce=2.1\EL:cl=12\032:cm=\E=%+ %+ :\
-	:cr=^M:dc=2.1*\E#:dl=49.6\EV:do=^J:is=\E\054:kb=^H:\
-	:kd=^J:kl=^H:ku=^K:le=^H:nd=^L:nw=^M^J:sf=^J:ta=^I:\
-	:up=^K:
+	:cr=^M:dc=2.1*\E#:dl=49.6\EV:do=^J:is=\E\054:kb=^H:kd=^J:\
+	:kl=^H:ku=^K:le=^H:nd=^L:nw=^M^J:sf=^J:ta=^I:up=^K:
 # This came from University of Wisconsin marked "astro termcap for jooss".
 # (mt4520-rv: removed obsolete ":kn#4:" and incorrect ":ri=\E[C:";
 # also added <rmam>/<smam> based  on the init string -- esr)
@@ -7436,19 +7736,18 @@ mt4520-rv|micro-term 4520 reverse video:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
-	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[g:dc=\E[P:\
-	:dl=\E[M:do=\E[B:ei=:fs=\E[?5l\E[?5h:ho=\E[H:ic=\E[@:\
-	:im=:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[g:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
+	:fs=\E[?5l\E[?5h:ho=\E[H:ic=\E[@:im=:\
 	:is=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H\E[J:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:ll=\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:ll=\E[24;1H:me=\E[m:\
 	:nd=\E[C:nw=\EE:\
 	:r1=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[H\E[J:\
-	:rc=\E8:rf=/usr/lib/tabset/vt100:sc=\E7:se=\E[0m:\
-	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:ts=\E[25;1H:\
-	:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5l\E[?5h:\
-	:ve=\E[0V\E8:vs=\E7\E[0U:
+	:rc=\E8:rf=/usr/share/tabset/vt100:sc=\E7:se=\E[0m:\
+	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:ts=\E[25;1H:ue=\E[24m:\
+	:up=\E[A:us=\E[4m:vb=\E[?5l\E[?5h:ve=\E[0V\E8:\
+	:vs=\E7\E[0U:
 
 # Fri Aug  5 08:11:57 1983
 # This entry works for the ergo 4000 with the following setups:
@@ -7462,20 +7761,21 @@ mt4520-rv|micro-term 4520 reverse video:\
 ergo4000|microterm ergo 4000:\
 	:da:db:ms:\
 	:co#80:li#66:\
-	:AL=\E[1L:RA=\E[?7l:SA=\E[?7m:bl=^G:cd=\E[0J:\
-	:ce=\E[0K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[1P:\
-	:dl=\E[1M:do=\E[B:ei=\E[4l:im=\E[4h:\
+	:AL=\E[1L:RA=\E[?7l:SA=\E[?7m:bl=^G:cd=\E[0J:ce=\E[0K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[1P:dl=\E[1M:\
+	:do=\E[B:ei=\E[4l:im=\E[4h:\
 	:is=\E<\E=\E[?1l\E[?4l\E[?5l\E[?7h\E[?8h:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:ke=\E=:kl=\E[D:\
-	:kr=\E[C:ks=\E=:ku=\E[A:l1=pf1:l2=pf2:l3=pf3:l4=pf4:\
-	:le=^H:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
-	:up=\E[A:
+	:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:ke=\E=:kl=\E[D:kr=\E[C:\
+	:ks=\E=:ku=\E[A:l1=pf1:l2=pf2:l3=pf3:l4=pf4:le=^H:me=\E[m:\
+	:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:up=\E[A:
 
 #### NCR 
 #
 # NCR's terminal group was merged with AT&T's when AT&T bought the company.
 # For what happened to that group, see the ADDS section.
 #
+# There is an NCR4103 terminal that's just a re-badged Wyse-50.
+#
 
 # NCR7900 DIP switches:
 #
@@ -7519,30 +7819,28 @@ ncr7900i|7900i|ncr7900|7900|ncr 7900 model 1:\
 	:am:bw:ul:\
 	:co#80:li#24:sg#1:ug#1:\
 	:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\E1%r%.%.:cr=^M:do=^J:\
-	:is=\E0@\010\E3\E4\E7:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:\
-	:le=^H:ll=^A:mb=\E0B:me=\E0@:mh=\E0A:mr=\E0P:nd=^F:\
-	:pf=^T:po=^R:\
+	:is=\E0@\010\E3\E4\E7:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:le=^H:\
+	:ll=^A:mb=\E0B:me=\E0@:mh=\E0A:mr=\E0P:nd=^F:pf=^T:po=^R:\
 	:..sa=\E0%p5%'@'%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}%*%+%c:\
 	:se=\E0@:sf=^J:so=\E0Q:ue=\E0@:up=^Z:us=\E0`:
 ncr7900iv|ncr 7900 model 4:\
 	:am:bw:es:hs:\
 	:co#80:li#24:\
-	:al=\E^N:bl=^G:cl=^L:cm=\013%+@\E\005%02:cr=^M:\
-	:dl=\E^O:do=^J:ds=\Ey1:fs=\Ek\Ey5:ho=\013@\E^E00:\
-	:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:\
-	:k8=\ER:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:\
-	:l6=blue:l7=red:l8=white:le=^H:nw=^M^J:sf=^J:\
-	:ts=\Ej\Ex5\Ex1\EY8%p1%{32}%+%c\Eo:
+	:al=\E^N:bl=^G:cl=^L:cm=\013%+@\E\005%02:cr=^M:dl=\E^O:\
+	:do=^J:ds=\Ey1:fs=\Ek\Ey5:ho=\013@\E^E00:k1=\ES:k2=\ET:\
+	:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:kb=^H:kd=\EB:\
+	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:l6=blue:l7=red:l8=white:le=^H:\
+	:nw=^M^J:sf=^J:ts=\Ej\Ex5\Ex1\EY8%p1%{32}%+%c\Eo:
 ncr7901|7901|ncr 7901 model:\
 	:am:bw:ul:\
 	:co#80:li#24:\
-	:bl=^G:cd=\Ek:ce=\EK:ch=\020%+^J:cl=^L:cm=\EY%+ %+ :\
-	:cr=^M:cv=\013%+@:do=^J:is=\E4^O:kC=^L:kd=^J:kh=^H:\
-	:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A:mb=\E0B:me=^O:mh=\E0A:\
-	:mr=\E0P:nd=^F:pf=^T:po=^R:\
+	:bl=^G:cd=\Ek:ce=\EK:ch=\020%+^J:cl=^L:cm=\EY%+ %+ :cr=^M:\
+	:cv=\013%+@:do=^J:is=\E4^O:kC=^L:kd=^J:kh=^H:kl=^U:kr=^F:\
+	:ku=^Z:le=^H:ll=^A:mb=\E0B:me=^O:mh=\E0A:mr=\E0P:nd=^F:pf=^T:\
+	:po=^R:\
 	:..sa=\E0%p5%'@'%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}%*%+%c\016:\
-	:se=^O:sf=^J:so=\E0Q\016:ue=^O:up=^Z:us=\E0`\016:\
-	:ve=^X:vi=^W:
+	:se=^O:sf=^J:so=\E0Q\016:ue=^O:up=^Z:us=\E0`\016:ve=^X:\
+	:vi=^W:
 
 #### Perkin-Elmer (Owl)
 #
@@ -7551,45 +7849,46 @@ ncr7901|7901|ncr 7901 model:\
 
 bantam|pe550|pe6100|perkin elmer 550:\
 	:co#80:li#24:\
-	:bl=^G:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :cr=^M:do=^J:\
-	:ho=\EH:le=^H:ll=\EH\EA:nd=\EC:sf=^J:up=\EA:
+	:bl=^G:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :cr=^M:do=^J:ho=\EH:\
+	:le=^H:ll=\EH\EA:nd=\EC:sf=^J:up=\EA:
 fox|pe1100|perkin elmer 1100:\
 	:am:\
 	:co#80:li#24:\
 	:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EX%+ \EY%+ :cr=^M:\
-	:ct=\E3:do=^J:ho=\EH:le=^H:ll=\EH\EA:nd=\EC:sf=^J:\
-	:st=\E1:up=\EA:vb=\020\002\020\003:
+	:ct=\E3:do=^J:ho=\EH:le=^H:ll=\EH\EA:nd=\EC:sf=^J:st=\E1:\
+	:up=\EA:vb=\020\002\020\003:
 owl|pe1200|perkin elmer 1200:\
 	:am:in:\
 	:co#80:li#24:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:\
-	:cm=\EX%+ \EY%+ :cr=^M:ct=\E3:dc=\EO:dl=\EM:do=^J:\
-	:ei=:ho=\EH:ic=\EN:im=:ip=:k0=\ERJ:k1=\ERA:k2=\ERB:\
-	:k3=\ERC:k4=\ERD:k5=\ERE:k6=\ERF:k7=\ERG:k8=\ERH:\
-	:k9=\ERI:kb=^H:le=^H:ll=\EH\EA:nd=\EC:se=\E!\200:\
-	:sf=^J:so=\E!^H:st=\E1:up=\EA:vb=\020\002\020\003:
+	:al=\EL:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EX%+ \EY%+ :\
+	:cr=^M:ct=\E3:dc=\EO:dl=\EM:do=^J:ei=:ho=\EH:ic=\EN:im=:ip=:\
+	:k0=\ERJ:k1=\ERA:k2=\ERB:k3=\ERC:k4=\ERD:k5=\ERE:k6=\ERF:\
+	:k7=\ERG:k8=\ERH:k9=\ERI:kb=^H:le=^H:ll=\EH\EA:me=\E!\200:\
+	:nd=\EC:se=\E!\200:sf=^J:so=\E!^H:st=\E1:up=\EA:\
+	:vb=\020\002\020\003:
 pe1251|pe6300|pe6312|perkin elmer 1251:\
 	:am:\
 	:co#80:it#8:li#24:pb#300:sg#1:vt#8:\
-	:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :cr=^M:\
-	:ct=\E3:do=\EB:ho=\EH:k0=\ERA:k1=\ERB:k2=\ERC:\
-	:k3=\ERD:k4=\ERE:k5=\ERF:k6=\ERG:k7=\ERH:k8=\ERI:\
-	:k9=\ERJ:k;=\ERK:le=\ED:nd=\EC:sf=^J:st=\E1:up=\EA:
+	:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :cr=^M:ct=\E3:\
+	:do=\EB:ho=\EH:k0=\ERA:k1=\ERB:k2=\ERC:k3=\ERD:k4=\ERE:\
+	:k5=\ERF:k6=\ERG:k7=\ERH:k8=\ERI:k9=\ERJ:k;=\ERK:le=\ED:\
+	:nd=\EC:sf=^J:st=\E1:up=\EA:
 # (pe7000m: this had
 # 	rmul=\E!\0, smul=\E!\040, 
 # which is probably wrong, it collides with kf0
 pe7000m|perkin elmer 7000 series monochrome monitor:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:bt=\E!Y:cd=\EJ:ce=\EI:cl=\EK:cm=\ES%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:i1=\E!\200\EW  7o\Egf\ES7 :\
-	:k0=\E!\200:k1=\E!^A:k2=\E!^B:k3=\E!^C:k4=\E!^D:\
-	:k5=\E!^E:k6=\E!^F:k7=\E!^G:k8=\E!^H:k9=\E!^I:\
-	:k;=\E!^J:kb=^H:kd=\E!U:kh=\E!S:kl=\E!V:kr=\E!W:\
-	:ku=\E!T:le=\ED:ll=\ES7 :nd=\EC:sf=^J:sr=\ER:up=\EA:
+	:bl=^G:bt=\E!Y:cd=\EJ:ce=\EI:cl=\EK:cm=\ES%+ %+ :cr=^M:\
+	:do=\EB:ho=\EH:i1=\E!\200\EW  7o\Egf\ES7 :k0=\E!\200:\
+	:k1=\E!^A:k2=\E!^B:k3=\E!^C:k4=\E!^D:k5=\E!^E:k6=\E!^F:\
+	:k7=\E!^G:k8=\E!^H:k9=\E!^I:k;=\E!^J:kb=^H:kd=\E!U:kh=\E!S:\
+	:kl=\E!V:kr=\E!W:ku=\E!T:le=\ED:ll=\ES7 :nd=\EC:sf=^J:\
+	:sr=\ER:up=\EA:
 pe7000c|perkin elmer 7000 series colour monitor:\
 	:i1=\E!\200\EW  7o\Egf\Eb0\Ec7\ES7 :se=\Eb0:so=\Eb2:\
-	:ue=\E!\200:us=\E! :tc=pe7000m:
+	:ue=\E!\200:us=\E! :\
+	:tc=pe7000m:
 
 #### Sperry Univac
 #
@@ -7605,16 +7904,17 @@ uts30|sperry uts30 with cp/m@1R1:\
 	:co#80:li#24:ws#40:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7m:SF=\E[%dB:\
-	:SR=\E[%dA:UP=\E[%dA:ae=\Ed:al=\EN:as=\EF:bl=^G:\
-	:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\EU%+ %+ :dc=\EM:dl=\EL:do=\EB:ei=:fs=^M:ho=\E[H:\
-	:ic=\EO:im=:is=\E[U 7\E[24;1H:kb=^H:kd=\EOB:kh=\E[H:\
-	:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m:mr=\E[7m:nd=\EC:\
+	:SR=\E[%dA:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\Ed:al=\EN:as=\EF:bl=^G:cd=\E[J:ce=\E[K:cl=^L:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\EU%+ %+ :dc=\EM:dl=\EL:do=\EB:\
+	:ei=:fs=^M:ho=\E[H:ic=\EO:im=:is=\E[U 7\E[24;1H:kb=^H:\
+	:kd=\EOB:kh=\E[H:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\EC:\
 	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\EX:\
-	:rf=/usr/lib/tabset/vt100:sc=\EW:se=\E[m:sf=^J:\
-	:so=\E[7m:sr=\EI:ta=^I:ts=\E]:uc=\EPB:ue=\E[m:\
-	:up=\E[A:us=\E[4m:ve=\ES:vi=\ER:
+	:rf=/usr/share/tabset/vt100:sc=\EW:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EI:ta=^I:ts=\E]:uc=\EPB:ue=\E[m:up=\E[A:\
+	:us=\E[4m:ve=\ES:vi=\ER:
 
 #### Tandem
 #
@@ -7630,14 +7930,14 @@ tandem6510|adm3a repackaged by Tandem:\
 # have a fourth digit after 653 that designates minor variants.  These are
 # natively block-mode and rather ugly, but they have a character mode which
 # this doubtless(?) exploits.  There is a 6520 that is slightly dumber.
-# (tandem653: had ":sb=\ES:", probably someone's mistake for sf -- esr)
+# (tandem653: had ":sb=\ES:", probably someone's mistake for sf; also,
+# removed :if=/usr/share/tabset/tandem653:, no such file -- esr)
 tandem653|t653x|Tandem 653x multipage terminal:\
 	:am:da:db:hs:\
 	:co#80:li#24:sg#1:ug#1:ws#64:\
-	:cd=\EJ:ce=\EK:cl=\EI:cm=\023%+ %+ :do=^J:ds=\Eo\r:\
-	:fs=^M:ho=\EH:if=/usr/share/tabset/tandem653:le=^H:\
-	:nd=\EC:se=\E6 :sf=\ES:so=\E6$:sr=\ET:ts=\Eo:ue=\E6 :\
-	:up=\EA:us=\E60:
+	:cd=\EJ:ce=\EK:cl=\EI:cm=\023%+ %+ :do=^J:ds=\Eo\r:fs=^M:\
+	:ho=\EH:le=^H:me=\E6 :nd=\EC:se=\E6 :sf=\ES:so=\E6$:sr=\ET:\
+	:ts=\Eo:ue=\E6 :up=\EA:us=\E60:
 
 #### Tandy/Radio Shack
 #
@@ -7647,41 +7947,39 @@ tandem653|t653x|Tandem 653x multipage terminal:\
 dmterm|deskmate terminal:\
 	:am:bw:\
 	:co#80:li#24:\
-	:al=\EP:bl=^G:cd=\EJ:ce=\EK:cl=\Ej:cm=\EY%+ %+ :\
-	:cr=^M:dc=\ES:dl=\ER:do=\EB:ei=:ho=\EH:ic=\EQ:im=:\
-	:k0=\E1:k1=\E2:k2=\E3:k3=\E4:k4=\E5:k5=\E6:k6=\E7:\
-	:k7=\E8:k8=\E9:k9=\E0:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
-	:ku=\EA:l0=f1:l1=f2:l2=f3:l3=f4:l4=f5:l5=f6:l6=f7:\
-	:l7=f8:l8=f9:l9=f10:le=^H:ll=\EE:nd=\EC:se=\EG0:\
-	:sf=\EX:so=\EG4:ta=^I:up=\EA:ve=\EG6:vi=\EG5:
+	:al=\EP:bl=^G:cd=\EJ:ce=\EK:cl=\Ej:cm=\EY%+ %+ :cr=^M:\
+	:dc=\ES:dl=\ER:do=\EB:ei=:ho=\EH:ic=\EQ:im=:k0=\E1:k1=\E2:\
+	:k2=\E3:k3=\E4:k4=\E5:k5=\E6:k6=\E7:k7=\E8:k8=\E9:k9=\E0:\
+	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:l0=f1:l1=f2:l2=f3:l3=f4:\
+	:l4=f5:l5=f6:l6=f7:l7=f8:l8=f9:l9=f10:le=^H:ll=\EE:mk@:nd=\EC:\
+	:sf=\EX:ta=^I:ue@:up=\EA:us@:ve=\EG6:vi=\EG5:\
+	:tc=adm+sgr:
 dt100|dt-100|Tandy DT-100 terminal:\
 	:xo:\
 	:co#80:li#24:sg#1:ug#1:\
 	:ac=kkllmmjjnnwwvvttuuqqxx:ae=^O:al=\E[L:as=^N:bl=^G:\
-	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\010\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%2;%2r:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
-	:ho=\E[H:ic=\E[@:im=:is=\E[?3l\E)0\E(B:k1=\E[?3i:\
-	:k2=\E[2i:k3=\E[@:k4=\E[M:k5=\E[17~:k6=\E[18~:\
-	:k7=\E[19~:k8=\E[20~:k9=\E[21~:k;=\E[?5i:kN=\E[29~:\
-	:kP=\E[28~:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:l1=f1:l2=f2:l3=f3:l4=f4:l5=f5:l6=f6:l7=f7:l8=f8:\
-	:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\010\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%2;%2r:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:\
+	:im=:is=\E[?3l\E)0\E(B:k1=\E[?3i:k2=\E[2i:k3=\E[@:k4=\E[M:\
+	:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:k9=\E[21~:\
+	:k;=\E[?5i:kN=\E[29~:kP=\E[28~:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:l1=f1:l2=f2:l3=f3:l4=f4:l5=f5:l6=f6:l7=f7:\
+	:l8=f8:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
+	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
 dt100w|dt-100w|Tandy DT-100 terminal (wide mode):\
 	:co#132:tc=dt100:
 dt110|Tandy DT-110 emulating ansi:\
 	:xo:\
 	:co#80:li#24:\
-	:@7=\E[K:ac=kkllmmjjnnwwvvuuttqqxx:ae=^O:al=\E[0L:\
-	:as=^N:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:\
-	:cm=\010\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[0P:\
-	:dl=\E[0M:do=\E[0B:eA=\E(B\E)0:ei=:ho=\E[H:ic=\E[0@:\
-	:im=:is=\E[?3l\E)0\E(B:k1=\E[1~:k2=\E[2~:k3=\E[3~:\
-	:k4=\E[4~:k5=\E[5~:k6=\E[6~:k7=\E[7~:k8=\E[8~:\
-	:k9=\E[9~:k;=\E[10~:kI=\E[@:kN=\E[26~:kP=\E[25~:\
-	:kd=\E[B:kh=\E[G:kl=\E[D:kr=\E[C:ku=\E[A:l0=f1:l1=f2:\
-	:l2=f3:l3=f4:l4=f5:l5=f6:l6=f7:l7=f8:l8=f9:l9=f10:\
-	:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
+	:@7=\E[K:ac=kkllmmjjnnwwvvuuttqqxx:ae=^O:al=\E[0L:as=^N:\
+	:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:cm=\010\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:dc=\E[0P:dl=\E[0M:do=\E[0B:\
+	:eA=\E(B\E)0:ei=:ho=\E[H:ic=\E[0@:im=:is=\E[?3l\E)0\E(B:\
+	:k1=\E[1~:k2=\E[2~:k3=\E[3~:k4=\E[4~:k5=\E[5~:k6=\E[6~:\
+	:k7=\E[7~:k8=\E[8~:k9=\E[9~:k;=\E[10~:kI=\E[@:kN=\E[26~:\
+	:kP=\E[25~:kd=\E[B:kh=\E[G:kl=\E[D:kr=\E[C:ku=\E[A:l0=f1:\
+	:l1=f2:l2=f3:l3=f4:l4=f5:l5=f6:l6=f7:l7=f8:l8=f9:l9=f10:le=^H:\
+	:me=\E[m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
 	:ue=\E[m:up=\E[0A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
 pt210|TRS-80 PT-210 printing terminal:\
 	:hc:os:\
@@ -7700,23 +7998,27 @@ tek|tek4012|4012|tektronix 4012:\
 	:os:\
 	:co#75:li#35:\
 	:bl=^G:cl=\E\014:cr=^M:do=^J:ff=\014:is=\E^O:le=^H:
+# (tek4013: added <acsc> to suppress tic warnings re :as:/:ae: --esr)
 tek4013|4013|tektronix 4013:\
-	:ae=\E^O:as=\E^N:tc=tek4012:
+	:ac=:ae=\E^O:as=\E^N:tc=tek4012:
 tek4014|4014|tektronix 4014:\
 	:co#81:li#38:\
 	:is=\E\017\E9:tc=tek4012:
+# (tek4015: added <acsc> to suppress tic warnings re :as:/:ae: --esr)
 tek4015|4015|tektronix 4015:\
-	:ae=\E^O:as=\E^N:tc=tek4014:
+	:ac=:ae=\E^O:as=\E^N:tc=tek4014:
 tek4014-sm|4014-sm|tektronix 4014 in small font:\
 	:co#121:li#58:\
 	:is=\E\017\E\072:tc=tek4014:
+# (tek4015-sm: added <acsc> to suppress tic warnings re :as:/:ae: --esr)
 tek4015-sm|4015-sm|tektronix 4015 in small font:\
-	:ae=\E^O:as=\E^N:tc=tek4014-sm:
+	:ac=:ae=\E^O:as=\E^N:\
+	:tc=tek4014-sm:
 tek4023|4023|tex|tektronix 4023:\
 	:am:\
 	:co#80:li#24:vt#4:\
-	:bl=^G:cl=\E\014:cm=\034%r%+ %+ :cr=^M:do=^J:le=^H:\
-	:nd=^I:se=^_@:sf=^J:so=^_P:
+	:bl=^G:cl=\E\014:cm=\034%r%+ %+ :cr=^M:do=^J:le=^H:nd=^I:\
+	:se=^_@:sf=^J:so=^_P:
 # It is recommended that you run the 4025 at 4800 baud or less;
 # various bugs in the terminal appear at 9600.  It wedges at the
 # bottom of memory (try "cat /usr/dict/words"); ^S and ^Q typed
@@ -7726,10 +8028,10 @@ tek4023|4023|tex|tektronix 4023:\
 # because it only works in the workspace, not the monitor.  
 # Same for home. Likewise, standout only works in the workspace.
 # 
-# <el> was commented out since vi and rogue seem to work better 
+# :ce: was commented out since vi and rogue seem to work better 
 # simulating it with lots of spaces!
 # 
-# <il1> and <il> had 145ms of padding, but that slowed down vi's ^U 
+# :al: and :AL: had 145ms of padding, but that slowed down vi's ^U 
 # and didn't seem necessary.
 #
 tek4024|tek4025|tek4027|tektronix 4024/4025/4027:\
@@ -7749,10 +8051,12 @@ tek4025-17|4025-17|4027-17|tek 4025 17 line window:\
 tek4025-17-ws|4025-17-ws|4025-17ws|4027-17ws|4027-17-ws|tek 4025 17 line window in workspace:\
 	:is=!com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r\037wor 17\r\037mon 17\r:\
 	:se=\037att s\r:so=\037att e\r:te=\037mon h\r:\
-	:ti=\037wor h\r:tc=tek4025-17:
+	:ti=\037wor h\r:\
+	:tc=tek4025-17:
 tek4025-ex|tek4027-ex|tek 4025/4027 w/!:\
 	:is=\037com 33\r\n!sto 9 17 25 33 41 49 57 65 73\r:\
-	:te=\037com 33\r:ti=!com 31\r:tc=tek4025:
+	:te=\037com 33\r:ti=!com 31\r:\
+	:tc=tek4025:
 # Tektronix 4025a
 # From: Doug Gwyn <gwyn@brl-smoke.ARPA>
 # The following status modes are assumed for normal operation (replace the
@@ -7779,9 +8083,9 @@ tek4025a|4025a|Tektronix 4025A:\
 	:CC=^]:DC=\035dch %d;:DL=\035dli %d;:DO=\035dow %d;:\
 	:LE=\035lef %d;:RI=\035rig %d;:SF=\035dow %d;:\
 	:UP=\035up %d;:al=\013\035ili;:bl=^G:bt=\035bac;:\
-	:ce=\035dch 80;:ch=\r\035rig %d;:\
-	:cl=\035era;\n\035rup;:cr=^M:ct=\035sto;:dc=\035dch;:\
-	:dl=\035dli;:do=^J:le=^H:nd=\035rig;:\
+	:ce=\035dch 80;:ch=\r\035rig %d;:cl=\035era;\n\035rup;:\
+	:cr=^M:ct=\035sto;:dc=\035dch;:dl=\035dli;:do=^J:le=^H:\
+	:nd=\035rig;:\
 	:rs=!com 29\035del 0\035rss t\035buf\035buf n\035cle\035dis\035dup\035ech r\035eol\035era g\035for n\035pad 203\035pad 209\035sno n\035sto 9 17 25 33 41 49 57 65 73\035wor 0;:\
 	:sf=^J:ta=^I:up=^K:
 # From: cbosg!teklabs!davem Wed Sep 16 21:11:41 1981
@@ -7802,36 +8106,34 @@ tek4025-cr|4025-cr|tek 4025 for curses and rogue:\
 #	:te=\037lea p1\037lea p2\037lea p3\037lea p4\037lea pt\037lea p5\037lea p6\037lea p7\037lea p8\037lea p9/la/13\037lea p.\037lea p0\037wor 0:
 tek4025ex|4025ex|4027ex|tek 4025 w/!:\
 	:is=\037com 33\r\n!sto 9\05417\05425\05433\05441\05449\05457\05465\05473\r:\
-	:te=\037com 33\r:ti=!com 31\r:tc=tek4025:
+	:te=\037com 33\r:ti=!com 31\r:\
+	:tc=tek4025:
 tek4105|4105|tektronix 4105:\
 	:am:mi:ms:ul:xn:xt:\
 	:co#79:it#8:li#29:\
-	:ae=\E[m:al=\E[1L:as=\E[1m:bl=^G:bt=\E[Z:cd=\E[J:\
+	:ac=:ae=\E[m:al=\E[1L:as=\E[1m:bl=^G:bt=\E[Z:cd=\E[J:\
 	:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%2;%2H:cr=^M:ct=\E[1g:\
-	:dc=\E[1P:dl=\E[1M:do=\E[1B:ei=\E[4l:ho=\E[H:\
-	:i1=\E%!1\E[m:im=\E[4h:is=\E%!1\E[?6141\E[m:kb=^H:\
-	:kd=\E[1B:kl=\E[1D:kr=\E[1C:ku=\E[1A:mb=\E[=3;<7m:\
-	:md=\E[=7;<4m:me=\E[=0;<1m:mh=\E[=1;<6m:mk=\E[=6;<5:\
-	:mr=\E[=1;<3m:nd=\E[1C:se=\E[=0;<1m:sf=\E[S:\
-	:so=\E[=2;<3m:sr=\E[T:ta=^I:ti=\E%!1\E[?6l\E[2J:\
-	:ue=\E[=0;<1m:up=\E[1A:us=\E[=5;<2m:
+	:dc=\E[1P:dl=\E[1M:do=\E[1B:ei=\E[4l:ho=\E[H:i1=\E%!1\E[m:\
+	:im=\E[4h:is=\E%!1\E[?6141\E[m:kb=^H:kd=\E[1B:kl=\E[1D:\
+	:kr=\E[1C:ku=\E[1A:mb=\E[=3;<7m:md=\E[=7;<4m:\
+	:me=\E[=0;<1m:mh=\E[=1;<6m:mk=\E[=6;<5:mr=\E[=1;<3m:\
+	:nd=\E[1C:se=\E[=0;<1m:sf=\E[S:so=\E[=2;<3m:sr=\E[T:ta=^I:\
+	:ti=\E%!1\E[?6l\E[2J:ue=\E[=0;<1m:up=\E[1A:us=\E[=5;<2m:
 
 # (tek4105-30: I added <rmam>/<smam> based on the init string -- esr)
 tek4105-30|4105-30|4015 emulating 30 line vt100:\
 	:am:mi:ms:xn:xo:\
 	:co#80:it#8:li#30:vt#3:\
-	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:\
-	:K5=\EOn:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
-	:UP=\E[%dA:\
+	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=^O:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:do=^J:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:\
-	:k8=\EOl:k9=\EOw:k;=\EOx:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:\
-	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:ae=^O:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:\
+	:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\
+	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
 	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
 	:sc=\E7:se=\E[m:sf=^J:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:
@@ -7839,11 +8141,10 @@ tek4105-30|4105-30|4015 emulating 30 line vt100:\
 tek4107|tek4109|4107|4109|tektronix terminals 4107 4109:\
 	:am:mi:ms:ul:xn:xt:\
 	:co#79:it#8:li#29:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\ELZ:cm=\EY%+ %+ :cr=^M:\
-	:do=^J:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:\
-	:mb=\E%!1\E[5m\E%!0:md=\E%!1\E[1m\E%!0:\
-	:me=\E%!1\E[m\E%!0:mh=\E%!1\E[<0m\E%!0:\
-	:mr=\E%!1\E[7m\E%0:nd=\EC:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\ELZ:cm=\EY%+ %+ :cr=^M:do=^J:kb=^H:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:mb=\E%!1\E[5m\E%!0:\
+	:md=\E%!1\E[1m\E%!0:me=\E%!1\E[m\E%!0:\
+	:mh=\E%!1\E[<0m\E%!0:mr=\E%!1\E[7m\E%0:nd=\EC:\
 	:..sa=\E%%!1\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m\E%%!0:\
 	:se=\E%!1\E[m\E%!0:sf=^J:so=\E%!1\E[7;5m\E%!0:sr=\EI:\
 	:ta=^I:ue=\E%!1\E[m\E%!0:up=\EA:us=\E%!1\E[4m\E%!0:\
@@ -7881,18 +8182,17 @@ tek4112|tek4114|tektronix 4110 series:\
 	:am:db:\
 	:co#80:li#34:\
 	:al=\E[L:bt=\E[Z:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[0;0H:\
-	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=:ic=\E[@:im=:\
-	:is=\E3!1:le=^H:nd=\E[C:se=\E[m:sf=\E7\E[0;0H\E[M\E8:\
-	:so=\E[7m:sr=\E7\E[0;0H\E[L\E8:ue=\E[m:up=\EM:\
-	:us=\E[4m:
+	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=:ic=\E[@:im=:is=\E3!1:\
+	:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=\E7\E[0;0H\E[M\E8:\
+	:so=\E[7m:sr=\E7\E[0;0H\E[L\E8:ue=\E[m:up=\EM:us=\E[4m:
 tek4112-nd|4112-nd|4112 not in dialog area:\
 	:ns:\
 	:up=^K:tc=tek4112:
 tek4112-5|4112-5|4112 in 5 line dialog area:\
 	:li#5:tc=tek4112:
-# (tek4113: this used to have "<cuf1>=\LM1\s\LM0:", someone's mistake;
-# removed "<smacs>=\E^N, <rmacs>=\E^O:", which had been commented out in 8.3.
-# Note, the !0 and !1 sequences in <rmcup>/<smcup>/<cnorm>/<civis> were
+# (tek4113: this used to have ":nd=\LM1\s\LM0:", someone's mistake;
+# removed ":as=\E^N:, :ae=\E^O:", which had been commented out in 8.3.
+# Note, the !0 and !1 sequences in :te:/:ti:/:ve:/:vi: were
 # previously \0410 and \0411 sequences...I don't *think* they were supposed
 # to be 4-digit octal -- esr)
 tek4113|tektronix 4113 color graphics with 5 line dialog area:\
@@ -7910,9 +8210,9 @@ tek4113-34|4113-34|tektronix 4113 color graphics with 34 line dialog area:\
 tek4113-nd|4113-nd|tektronix 4113 color graphics with no dialog area:\
 	:am:eo:\
 	:co#80:it#8:li#34:\
-	:cl=\E^L:do=^J:ho=\ELF7l\177 @:\
-	:is=\ELZ\EKA0\ELF7l\177 @:le=^H:ll=\ELF hl @:nd=^I:\
-	:se=\EMT1:so=\EMT2:ta=^I:uc=\010\EMG1_\EMG0:up=^K:\
+	:cl=\E^L:do=^J:ho=\ELF7l\177 @:is=\ELZ\EKA0\ELF7l\177 @:\
+	:le=^H:ll=\ELF hl @:nd=^I:se=\EMT1:so=\EMT2:ta=^I:\
+	:uc=\010\EMG1_\EMG0:up=^K:\
 	:vb=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERB0:\
 	:vs=\ELZ\EKA0:
 # This entry is from Tek. Inc.  (Brian Biehl)
@@ -7922,31 +8222,28 @@ otek4115|Tektronix 4115:\
 	:co#80:it#8:li#34:\
 	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bt=\E[Z:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:\
-	:ei=\E[4l:ho=\E[H:if=/usr/share/tabset/vt100:\
-	:im=\E[4h:\
+	:ei=\E[4l:ho=\E[H:if=/usr/share/tabset/vt100:im=\E[4h:\
 	:is=\E%!0\E%\014\ELV0\EKA1\ELBB2\ENU@=\ELLB2\ELM0\ELV1\EKYA?\E%!1\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[m:\
-	:kb=^H:ke=\E>:ks=\E=:le=\E[D:nd=\E[C:se=\E[m:\
-	:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E%!0\ELBG8\E%!1\E[34;1H\E[J:ti=\E%!0\ELBB2\E%!1:\
-	:ue=\E[m:up=\E[A:us=\E[4m:\
+	:kb=^H:ke=\E>:ks=\E=:le=\E[D:me=\E[m:nd=\E[C:se=\E[m:\
+	:so=\E[7m:sr=\EM:ta=^I:te=\E%!0\ELBG8\E%!1\E[34;1H\E[J:\
+	:ti=\E%!0\ELBB2\E%!1:ue=\E[m:up=\E[A:us=\E[4m:\
 	:ve=\E%!0\ELBG8\E%!1\E[34;1H:vs=\E%!0\ELBB2\E%!1:
 tek4115|newer tektronix 4115 entry with more ANSI capabilities:\
 	:am:xo:\
 	:co#80:li#34:\
 	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
-	:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:al=\E[L:\
-	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%+^AG:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:\
-	:cv=\E[%+^Ad:dc=\E[P:dl=\E[M:do=^J:ei=:ho=\E[H:\
-	:ic=\E[@:im=:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mk=\E[8m:\
-	:mr=\E[7m:nd=\E[C:..rp=%p1%c\E[%p2%{1}%-%db:\
+	:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:al=\E[L:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%+^AG:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:cv=\E[%+^Ad:dc=\E[P:\
+	:dl=\E[M:do=^J:ei=:ho=\E[H:ic=\E[@:im=:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mk=\E[8m:mr=\E[7m:nd=\E[C:..rp=%p1%c\E[%p2%{1}%-%db:\
 	:..sa=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m:\
 	:se=\E[m:sf=^J:so=\E[7m:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
 	:us=\E[4m:
 # The tek4125 emulates a vt100 incorrectly - the scrolling region
-# command is ignored.  The following entry replaces <csr> with the needed
-# <il>, <il>, and <smir>; removes some cursor pad commands that the tek4125
+# command is ignored.  The following entry replaces :cs: with the needed
+# :AL:, :AL:, and :im:; removes some cursor pad commands that the tek4125
 # chokes on; and adds a lot of initialization for the tek dialog area.
 # Note that this entry uses all 34 lines and sets the cursor color to green.
 # Steve Jacobson 8/85
@@ -7955,7 +8252,8 @@ tek4125|tektronix 4125:\
 	:li#34:\
 	:al=\E[1L:cs@:dl=\E[1M:im=\E1:\
 	:is=\E%\E!0\EQD1\EUX03\EKA\ELBB2\ELCE0\ELI100\ELJ2\ELLB2\ELM0\ELS1\ELX00\ELV1\E%\E!1\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
-	:ks=\E=:rc@:sc@:tc=vt100:
+	:ks=\E=:rc@:sc@:\
+	:tc=vt100:
 
 # From: <jcoker@ucbic>
 # (tek4207: This was the termcap file's entry for the 4107/4207, but SCO
@@ -7968,24 +8266,23 @@ tek4207|Tektronix 4207 graphics terminal with memory:\
 	:cm=\E[%i%d;%dH:dc=4\E[P:dl=3\E[M:do=^J:ei=:ho=\E[H:\
 	:ic=4\E[@:im=:\
 	:is=\E%!0\ELBP0\E%!1\E[H\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J:\
-	:kd=\ED:kh=\E[H:kl=\E[D:kr=\E[C:ku=\EM:le=^H:\
-	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:se=\E[m:\
-	:so=\E[7m:ta=^I:te=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f:\
-	:ti=\E[?6l\E[H\E[J:ue=\E[m:up=\EM:us=\E[4m:
+	:kd=\ED:kh=\E[H:kl=\E[D:kr=\E[C:ku=\EM:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:se=\E[m:so=\E[7m:ta=^I:\
+	:te=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f:ti=\E[?6l\E[H\E[J:\
+	:ue=\E[m:up=\EM:us=\E[4m:
 
 # From: <carolyn@dali.berkeley.edu>  Thu Oct 31 12:54:27 1985
-# (tek4404: There was a "\!" in <smcup> that I replaced with "\E!".
+# (tek4404: There was a "\!" in :ti: that I replaced with "\E!".
 # Tab had been given as \E2I,that must be the tab-set capability -- esr)
 tek4404|tektronix 4404:\
 	:co#80:it#8:li#32:\
-	:al=\E[1L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
-	:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[1M:\
-	:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:kd=\E[B:ke=\E[?1h:\
-	:kl=\E[D:kr=\E[C:ks=\E[?1l:ku=\E[A:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\
-	:so=\E[7m:st=\E[2I:ta=^I:te=\E[1;1H\E[0J\E[?6h\E[?1l:\
-	:ti=\E%\E!1\E[1;32r\E[?6l\E>:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
+	:al=\E[1L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[1M:do=^J:ei=\E[4l:ho=\E[H:\
+	:im=\E[4h:kd=\E[B:ke=\E[?1h:kl=\E[D:kr=\E[C:ks=\E[?1l:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:nd=\E[C:rc=\E8:\
+	:sc=\E7:se=\E[27m:so=\E[7m:st=\E[2I:ta=^I:\
+	:te=\E[1;1H\E[0J\E[?6h\E[?1l:\
+	:ti=\E%\E!1\E[1;32r\E[?6l\E>:ue=\E[m:up=\E[A:us=\E[4m:
 # Some unknown person wrote:
 # I added the is string - straight Unix has ESC ; in the login 
 # string which sets a ct8500 into monitor mode (aka 4025 snoopy 
@@ -7995,10 +8292,9 @@ ct8500|tektronix ct8500:\
 	:am:bw:da:db:\
 	:co#80:li#25:\
 	:al=\E^L:bl=^G:bt=\E^I:cd=\E^U:ce=\E^T:cl=\E^E:\
-	:cm=\E|%+ %+ :cr=^M:dc=\E^]:dl=\E^M:do=^J:ei=:\
-	:ic=\E^\:im=:is=\037\EZ\Ek:le=^H:me=\E :nd=\ES:\
-	:se=\E :sf=^J:so=\E$:sr=\E^A:ta=^I:ue=\E :up=\ER:\
-	:us=\E!:
+	:cm=\E|%+ %+ :cr=^M:dc=\E^]:dl=\E^M:do=^J:ei=:ic=\E^\:im=:\
+	:is=\037\EZ\Ek:le=^H:me=\E :nd=\ES:se=\E :sf=^J:so=\E$:\
+	:sr=\E^A:ta=^I:ue=\E :up=\ER:us=\E!:
 
 # Tektronix 4205 terminal.
 #
@@ -8023,15 +8319,14 @@ tek4205|4205|tektronix 4205:\
 	:ae=^O:al=\E[1L:as=^N:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[J:\
 	:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:ct=\E[1g:\
 	:dc=\E[1P:dl=\E[1M:do=\E[B:eA=\E)0:ec=\E%dX:ei=\E[4l:\
-	:ho=\E[H:i1=\E%!0\ETM1\E%!1\E[m:im=\E[4h:k0=\EOA:\
-	:k1=\EOB:k2=\EOC:k3=\EOD:k4=\EP:k5=\EQ:k6=\ER:k7=\ES:\
-	:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:\
-	:mb=\E[5m:md=\E[=7;<4m:me=\E[=0;<1m\E[24;25;27m\017:\
-	:mh=\E[=1;<6m:mk=\E[=6;<5:mr=\E[7m:nd=\E[C:\
+	:ho=\E[H:i1=\E%!0\ETM1\E%!1\E[m:im=\E[4h:k0=\EOA:k1=\EOB:\
+	:k2=\EOC:k3=\EOD:k4=\EP:k5=\EQ:k6=\ER:k7=\ES:kb=^H:kd=\E[B:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[=7;<4m:\
+	:me=\E[=0;<1m\E[24;25;27m\017:mh=\E[=1;<6m:mk=\E[=6;<5:\
+	:mr=\E[7m:nd=\E[C:\
 	:oc=\E%!0\n\ETFB0\n0000\n1F4F4F4\n2F400\n30F40\n4A4C<F4\n50F4F4\n6F40F4\n7F4F40\n\E%!1:\
-	:op=\E[39;40m:se=\E[=0;<1m:sf=\ED:so=\E[=2;<3m:\
-	:sr=\EM:ta=^I:ti=\E%%!1\E[?6l\E[2J:ue=\E[24m:up=\E[A:\
-	:us=\E[4m:
+	:op=\E[39;40m:se=\E[=0;<1m:sf=\ED:so=\E[=2;<3m:sr=\EM:\
+	:ta=^I:ti=\E%%!1\E[?6l\E[2J:ue=\E[24m:up=\E[A:us=\E[4m:
 
 #### Teletype (tty)
 #
@@ -8061,15 +8356,15 @@ tty37|model 37 teletype:\
 # it - it's null here to prevent it from showing the BL character.
 # There is an \EG in <nl> because of a bug in old vi (if stty says you have
 # a "newline" style terminal (-crmode) vi figures all it needs is nl
-# to get crlf, even if <cr> is not ^M.)
+# to get crlf, even if :cr: is not ^M.)
 # (tty40: removed obsolete ":nl=\EG\EB:", it's just do+cr -- esr)
 tty40|ds40|ds40-2|dataspeed40|teletype dataspeed 40/2:\
 	:xo:\
 	:co#80:li#24:\
-	:al=\EL:cd=\EJ:cl=\EH\EJ:cr=\EG:ct=\EH\E2:dc=\EP:\
-	:dl=\EM:do=\EB:ei=:ho=\EH:ic=\E^:im=:kb=^]:kl=^H:\
-	:le=^H:nd=\EC:pf=^T:po=\022:r2=\023\ER:se=\E4:sf=\ES:\
-	:so=\E3:sr=\ET:st=\E1:ta=\E@:up=\E7:
+	:al=\EL:cd=\EJ:cl=\EH\EJ:cr=\EG:ct=\EH\E2:dc=\EP:dl=\EM:\
+	:do=\EB:ei=:ho=\EH:ic=\E^:im=:kb=^]:kl=^H:le=^H:nd=\EC:pf=^T:\
+	:po=\022:r2=\023\ER:se=\E4:sf=\ES:so=\E3:sr=\ET:st=\E1:\
+	:ta=\E@:up=\E7:
 tty43|model 43 teletype:\
 	:am:hc:os:xo:\
 	:co#132:\
@@ -8078,36 +8373,39 @@ tty43|model 43 teletype:\
 #### Tymshare
 #
 
-# You can add <is2>=\E< to put this 40-column mode, though I can't
+# You can add :is=\E<: to put this 40-column mode, though I can't
 # for the life of me think why anyone would want to.
 scanset|sc410|sc415|Tymshare Scan Set:\
 	:am:bw:ms:\
 	:co#80:li#24:\
-	:ac=l<m-k4j%q\\\054x5:ae=^O:as=^N:bl=^G:cd=\EJ:\
-	:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:do=^J:ho=\EH:\
-	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=^I:pf=\E;0:\
-	:po=\E;0:ps=\E;3:r1=\E>:rc=^C:sc=^B:sf=^J:up=^K:
+	:ac=l<m-k4j%q\\\054x5:ae=^O:as=^N:bl=^G:cd=\EJ:ce=\EK:\
+	:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:do=^J:ho=\EH:kd=\EB:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:nd=^I:pf=\E;0:po=\E;0:ps=\E;3:r1=\E>:\
+	:rc=^C:sc=^B:sf=^J:up=^K:
 
 #### Volker-Craig (vc)
 #
+# If you saw a Byte Magazine cover with a terminal on it during the early
+# 1980s, it was probably one of these.  Carl Helmers liked them because
+# they could crank 19.2 and were cheap (that is, until he tried to program
+# one...)
+#
 
 # Missing in vc303a and vc303 descriptions:  they scroll 2 lines at a time
 # every other linefeed.
 vc303|vc103|vc203|volker-craig 303:\
 	:am:ns:\
 	:co#80:li#24:\
-	:bl=^G:cl=\014:cr=^M:do=^J:ho=\013:kd=^J:kl=^H:kr=^I:\
-	:ku=^N:le=^H:ll=\017W:nd=^I:up=^N:
+	:bl=^G:cl=\014:cr=^M:do=^J:ho=\013:kd=^J:kl=^H:kr=^I:ku=^N:\
+	:le=^H:ll=\017W:nd=^I:up=^N:
 vc303a|vc403a|volker-craig 303a:\
-	:ce=\026:cl=\030:ho=\031:kr=^U:ku=^Z:ll=^P:nd=^U:\
-	:up=^Z:tc=vc303:
+	:ce=\026:cl=\030:ho=\031:kr=^U:ku=^Z:ll=^P:nd=^U:up=^Z:tc=vc303:
 # (vc404: removed obsolete ":ma=^Z^P^U :" -- esr)
 vc404|volker-craig 404:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=\027:ce=\026:cl=\030:cm=\020%+ %+ :cr=^M:\
-	:do=^J:ho=\031:kd=^J:kl=^H:kr=^U:ku=^Z:le=^H:nd=^U:\
-	:sf=^J:up=^Z:
+	:bl=^G:cd=\027:ce=\026:cl=\030:cm=\020%+ %+ :cr=^M:do=^J:\
+	:ho=\031:kd=^J:kl=^H:kr=^U:ku=^Z:le=^H:nd=^U:sf=^J:up=^Z:
 vc404-s|volker-craig 404 w/standout mode:\
 	:do=^J:se=^O:so=^N:tc=vc404:
 # From: <wolfgang@cs.sfu.ca>
@@ -8115,12 +8413,11 @@ vc404-s|volker-craig 404 w/standout mode:\
 vc414|vc414h|Volker-Craig 414H in sane escape mode.:\
 	:am:bs:\
 	:co#80:li#24:\
-	:al=\E\032:cd=\E^X:ce=10\E\017:cl=\E\034:\
-	:cm=\E\021%r%.%.:dc=\E3:dl=\E\023:do=\E^K:ei=:\
-	:ho=\E^R:ic=\E\072:im=:k0=\EA:k1=\EB:k2=\EC:k3=\ED:\
-	:k4=\EE:k5=\EF:k6=\EG:k7=\EH:kd=\E^K:kh=\E^R:kl=^H:\
-	:kr=^P:ku=\E^L:l0=PF1:l1=PF2:l2=PF3:l3=PF4:l4=PF5:\
-	:l5=PF6:l6=PF7:l7=PF8:nd=^P:se=\E^_:so=\E^Y:up=\E^L:
+	:al=\E\032:cd=\E^X:ce=10\E\017:cl=\E\034:cm=\E\021%r%.%.:\
+	:dc=\E3:dl=\E\023:do=\E^K:ei=:ho=\E^R:ic=\E\072:im=:k0=\EA:\
+	:k1=\EB:k2=\EC:k3=\ED:k4=\EE:k5=\EF:k6=\EG:k7=\EH:kd=\E^K:\
+	:kh=\E^R:kl=^H:kr=^P:ku=\E^L:l0=PF1:l1=PF2:l2=PF3:l3=PF4:\
+	:l4=PF5:l5=PF6:l6=PF7:l7=PF8:nd=^P:se=\E^_:so=\E^Y:up=\E^L:
 vc415|volker-craig 415:\
 	:cl=^L:tc=vc404:
 
@@ -8143,15 +8440,15 @@ pcplot|pc-plot terminal emulation program:\
 kaypro|kaypro2|kaypro II:\
 	:am:\
 	:co#80:li#24:\
-	:cl=1\032:cm=\E=%+ %+ :ho=^^:kd=^J:kl=^H:kr=^L:ku=^K:\
-	:le=^H:nd=^L:up=^K:
+	:cl=1\032:cm=\E=%+ %+ :ho=^^:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:\
+	:nd=^L:up=^K:
 
 # From IBM, Thu May  5 19:35:27 1983
 ibmpc|ibm-pc|ibm5051|5051|IBM Personal Computer (no ANSI.SYS):\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cl=^L^K:cr=^M^^:do=^J:ho=^K:im=\200R:kd=^_:\
-	:le=^]:nd=^\:sf=\n:up=^^:
+	:bl=^G:cl=^L^K:cr=^M^^:do=^J:ho=^K:im=\200R:kd=^_:le=^]:\
+	:nd=^\:sf=\n:up=^^:
 
 #### Apple
 #
@@ -8160,43 +8457,41 @@ appleII|apple ii plus:\
 	:am:\
 	:co#80:it#8:li#24:\
 	:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :do=^J:ho=\E^Y:\
-	:is=\024T1\016:kd=^J:kr=^U:le=^H:nd=^\:se=^N:so=^O:\
+	:is=\024T1\016:kd=^J:kr=^U:le=^H:me=^N:nd=^\:se=^N:so=^O:\
 	:ta=^I:up=^_:vb=\024G1\024T1:ve=^TC2:vs=^TC6:
 # Originally by Gary Ford 21NOV83
 # From: <ee178aci%sdcc7@SDCSVAX.ARPA>  Fri Oct 11 21:27:00 1985
 apple-80|apple II with smarterm 80 col:\
 	:am:bw:\
 	:co#80:li#24:\
-	:bt=^R:cd=10*\013:ce=10\035:cl=10*\014:\
-	:cm=\036%r%+ %+ :cr=10*\r:do=^J:ho=^Y:le=^H:nd=^\:\
-	:up=^_:
+	:bt=^R:cd=10*\013:ce=10\035:cl=10*\014:cm=\036%r%+ %+ :\
+	:cr=10*\r:do=^J:ho=^Y:le=^H:nd=^\:up=^_:
 apple-soroc|apple emulating soroc 120:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:do=^J:\
-	:ho=^^:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:\
-	:up=^K:
+	:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:\
+	:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:up=^K:
 # From Peter Harrison, Computer Graphics Lab, San Francisco
 #   ucbvax!ucsfmis!harrison  .....uucp
 #   ucbvax!ucsfmis!harrison@BERKELEY   .......ARPA
 # "These two work.  If you don't have the inverse video chip for the
-# Apple with videx then remove the so and se fields."
+# Apple with videx then remove the :so: and :se: fields."
 # (apple-videx: this used to be called DaleApple -- esr)
 apple-videx|Apple with videx videoterm 80 column board with inverse video:\
 	:am:xn:\
 	:co#80:it#8:li#24:\
-	:cd=^K:ce=^]:cl=300\014:cm=\036%r%+ %+ :do=^J:ho=^Y:\
-	:kd=^J:kh=^Y:kl=^H:kr=^U:le=^H:nd=^\:se=^Z2:so=^Z3:\
-	:ta=^I:up=^_:
+	:cd=^K:ce=^]:cl=300\014:cm=\036%r%+ %+ :do=^J:ho=^Y:kd=^J:\
+	:kh=^Y:kl=^H:kr=^U:le=^H:me=^Z2:nd=^\:se=^Z2:so=^Z3:ta=^I:\
+	:up=^_:
 lisa|apple lisa console display (black on white):\
 	:am:eo:ms:\
 	:co#88:it#8:li#32:\
-	:ac=lfmekcjdttuvvuwsqax`nb:ae=\E[10m:al=\E[L:\
-	:as=\E[11m:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:\
-	:is=\E>\E[m\014:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:nd=\E[C:se=\E[m:so=\E[7m:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:vi=\E[5h:vs=\E[5l:
+	:ac=lfmekcjdttuvvuwsqax`nb:ae=\E[10m:al=\E[L:as=\E[11m:\
+	:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:is=\E>\E[m\014:kb=^H:\
+	:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[C:\
+	:se=\E[m:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:vi=\E[5h:\
+	:vs=\E[5l:
 liswb|apple lisa console display (white on black):\
 	:is=\E>\E[0;7m\014:se=\E[0;7m:so=\E[m:ue=\E[0;7m:\
 	:us=\E[4m:tc=lisa:
@@ -8215,16 +8510,16 @@ coco3|os9LII|Tandy CoCo3 24*80 OS9 Level II:\
 	:am:\
 	:co#80:it#8:li#24:\
 	:al=^_0:bl=^G:cd=^K:ce=^D:cl=5*\014:cm=2\002%r%+ %+ :\
-	:dl=^_1:do=^J:ho=^A:kd=^J:kl=^H:kr=^I:ku=^L:le=^H:\
-	:mb=^_":md=\E\072^A:me=\037!\E\072\200:mr=^_ :nd=^F:\
-	:se=^_!:so=^_ :ue=^_#:up=^I:us=^_":ve=^E!:vi=^E :
+	:dl=^_1:do=^J:ho=^A:kd=^J:kl=^H:kr=^I:ku=^L:le=^H:mb=^_":\
+	:md=\E\072^A:me=\037!\E\072\200:mr=^_ :nd=^F:se=^_!:\
+	:so=^_ :ue=^_#:up=^I:us=^_":ve=^E!:vi=^E :
 # (trs2: removed obsolete ":nl=^_:" -- esr)
 trs2|trsII|trs80II|Radio Shack Model II using P&T CP/M:\
 	:am:ms:\
 	:co#80:it#8:li#24:\
-	:al=^D:bl=^G:cd=^B:ce=^A:cl=^L:cm=\EY%+ %+ :cr=^M:\
-	:dl=^K:do=^_:ho=^F:kb=^H:kd=^_:kl=^\:kr=^]:ku=^^:\
-	:le=^H:nd=^]:se=^O:sf=^J:so=^N:ta=^I:up=^^:
+	:al=^D:bl=^G:cd=^B:ce=^A:cl=^L:cm=\EY%+ %+ :cr=^M:dl=^K:\
+	:do=^_:ho=^F:kb=^H:kd=^_:kl=^\:kr=^]:ku=^^:le=^H:me=^O:nd=^]:\
+	:se=^O:sf=^J:so=^N:ta=^I:up=^^:
 # From: Kevin Braunsdorf <ksb@mentor.cc.purdue.edu>
 # (This had extension capabilities
 #	:BN=\E[?33h:BF=\E[?33l:UC=\E[_ q:BC=\E[\177 q:\
@@ -8233,13 +8528,12 @@ trs2|trsII|trs80II|Radio Shack Model II using P&T CP/M:\
 trs16|trs-80 model 16 console:\
 	:am:\
 	:co#80:it#8:li#24:\
-	:ac=l_mbk`javewcquxs:ae=\ERg:al=\EL:as=\ERG:bl=^G:\
-	:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dc=\EQ:\
-	:dl=\EM:do=\EB:ei=:ho=\EH:ic=\EP:im=:k0=^A:k1=^B:\
-	:k2=^D:k3=^L:k4=^U:k5=^P:k6=^N:k7=^S:kb=^H:kd=\EB:\
-	:kh=^W:kl=\ED:kr=\EC:ku=\EA:l0=f1:l1=f2:l2=f3:l3=f4:\
-	:l4=f5:l5=f6:l6=f7:l7=f8:le=^H:nd=\EC:pf=\E]+:\
-	:po=\E]=:se=\ER@:sf=^J:so=\ERD:ta=^I:up=\EA:ve=\ERC:\
+	:ac=l_mbk`javewcquxs:ae=\ERg:al=\EL:as=\ERG:bl=^G:cd=\EJ:\
+	:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dc=\EQ:dl=\EM:do=\EB:ei=:\
+	:ho=\EH:ic=\EP:im=:k0=^A:k1=^B:k2=^D:k3=^L:k4=^U:k5=^P:k6=^N:\
+	:k7=^S:kb=^H:kd=\EB:kh=^W:kl=\ED:kr=\EC:ku=\EA:l0=f1:l1=f2:\
+	:l2=f3:l3=f4:l4=f5:l5=f6:l6=f7:l7=f8:le=^H:me=\ER@:nd=\EC:\
+	:pf=\E]+:po=\E]=:se=\ER@:sf=^J:so=\ERD:ta=^I:up=\EA:ve=\ERC:\
 	:vi=\ERc:
 
 #### Atari ST
@@ -8249,15 +8543,31 @@ trs16|trs-80 model 16 console:\
 atari|atari st:\
 	:am:\
 	:co#80:it#8:li#25:\
-	:al=\EL:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :dl=\EM:\
-	:do=\EB:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:nd=\EC:\
-	:se=\Eq:so=\Ep:sr=\EI:ta=^I:up=\EA:
+	:al=\EL:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :dl=\EM:do=\EB:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:me=\Eq:nd=\EC:se=\Eq:\
+	:so=\Ep:sr=\EI:ta=^I:up=\EA:
 # UniTerm terminal program for the Atari ST:  49-line VT220 emulation mode
 # From: Paul M. Aoki <aoki@ucbvax.berkeley.edu>
 uniterm|uniterm49|UniTerm VT220 emulator with 49 lines:\
 	:li#49:\
 	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;49r\E[49;1H:tc=vt220:
-
+# MiNT VT52 emulation. 80 columns, 25 rows.
+# MiNT is Now TOS, the operating system which comes with all Ataris now
+# (mainly Atari Falcon). This termcap is for the VT52 emulation you get
+# under tcsh/zsh/bash/sh/ksh/ash/csh when you run MiNT in `console' mode
+# From: Per Persson <pp@pfawww.pp.se>, 27 Feb 1996
+st52|Atari ST with VT52 emulation:\
+	:am:km:\
+	:co#80:li#25:\
+	:K1=\E#7:K2=\E#9:K3=\E#5:K4=\E#1:K5=\E#3:al=\EL:bl=^G:\
+	:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:dl=\EM:do=\EB:\
+	:ho=\EH:k0=\E#D:k1=\E#;:k2=\E#<:k3=\E#=:k4=\E#>:k5=\E#?:\
+	:k6=\E#@:k7=\E#A:k8=\E#B:k9=\E#C:kA=\E#R:kC=\E#7:kF=\E#2:\
+	:kR=\E#8:kb=^H:kd=\E#P:kh=\E#G:kl=\E#K:kr=\E#M:ku=\E#H:\
+	:l0=f10:le=\ED:me=\Eq:nd=\EC:nw=^M^J:r1=\Ez_\Eb@\EcA:\
+	:rc=\Ek:sc=\Ej:se=\Eq:sf=^J:so=\Ep:sr=\EI:ta=^I:ti=\Ee:\
+	:up=\EA:ve=\Ee:vi=\Ef:
+ 
 #### Commodore Business Machines
 #
 # Formerly located in West Chester, PA; went spectacularly bust in 1994
@@ -8282,39 +8592,68 @@ uniterm|uniterm49|UniTerm VT220 emulator with 49 lines:\
 #     something like a Dnet Fterm with the window sized to some peculiar
 #     dimension larger than 80 columns.
 # :k0=\E9~:	map F10 to k0 - could have F0-9 -> k0-9, but ... F10 was 'k;'
-# (amiga: removed obsolete ":kn#10:" -- esr)
+# (amiga: removed obsolete :kn#10:,
+# also added empty <acsc> to suppress a warning --esr)
 amiga-old|Amiga ANSI:\
 	:am:bs:bw:xn:\
 	:co#80:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ac=:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:\
-	:ei=:ho=\E[H:ic=\E[@:im=:is=\E[20l:k0=\E9~:k1=\E0~:\
-	:k2=\E1~:k3=\E2~:k4=\E3~:k5=\E4~:k6=\E5~:k7=\E6~:\
-	:k8=\E7~:k9=\E8~:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\E[D:mb=\E[7;2m:md=\E[1m:me=\E[m:mh=\E[2m:\
-	:mk=\E[8m:mr=\E[7m:nd=\E[C:r1=\Ec:se=\E[m:sf=\E[S:\
-	:so=\E[7m:sr=\E[T:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[ p:\
-	:vi=\E[0 p:
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
+	:ho=\E[H:ic=\E[@:im=:is=\E[20l:k0=\E9~:k1=\E0~:k2=\E1~:\
+	:k3=\E2~:k4=\E3~:k5=\E4~:k6=\E5~:k7=\E6~:k8=\E7~:k9=\E8~:\
+	:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\E[D:mb=\E[7;2m:\
+	:md=\E[1m:me=\E[m:mh=\E[2m:mk=\E[8m:mr=\E[7m:nd=\E[C:\
+	:r1=\Ec:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:ue=\E[m:up=\E[A:\
+	:us=\E[4m:ve=\E[ p:vi=\E[0 p:
 
 # From: Hans Verkuil <hans@wyst.hobby.nl>, 4 Dec 1995
+# (amiga: added empty <acsc> to suppress a warning --esr)
 amiga|Amiga ANSI:\
 	:bw:ms:\
 	:co#80:li#24:\
-	:DC=\233%dP:DO=\233%dB:IC=\233%d@:LE=\233%dD:\
-	:RI=\233%dC:SF=\233%dS:SR=\233%dT:UP=\233%dA:ae=^O:\
-	:as=^N:bl=^G:bt=\233Z:cd=\233J:ce=\233K:\
-	:cl=\233H\233J:cm=\233%i%d;%dH:cr=^M:dc=\233P:\
-	:do=\233B:ec=\233%dP:ei=:ho=\233H:ic=\233@:im=:\
-	:is=\23320l:k0=\2339~:k1=\2330~:k2=\2331~:k3=\2332~:\
-	:k4=\2333~:k5=\2334~:k6=\2335~:k7=\2336~:k8=\2337~:\
-	:k9=\2338~:kD=\177:kb=^H:kd=\233B:kl=\233D:kr=\233C:\
-	:ku=\233A:le=\233D:mb=\2337;2m:md=\2331m:me=\2330m:\
-	:mh=\2332m:mk=\2338m:mr=\2337m:nd=\233C:nw=\233B\r:\
-	:r1=\Ec:se=\2330m:sf=\233S:so=\2337m:sr=\233T:ta=^I:\
-	:te=\233?7h:ti=\233?7l:ue=\2330m:up=\233A:us=\2334m:\
-	:vb=^G:ve=\233 p:vi=\2330 p:
+	:DC=\233%dP:DO=\233%dB:IC=\233%d@:LE=\233%dD:RI=\233%dC:\
+	:SF=\233%dS:SR=\233%dT:UP=\233%dA:ac=:ae=^O:as=^N:bl=^G:\
+	:bt=\233Z:cd=\233J:ce=\233K:cl=\233H\233J:\
+	:cm=\233%i%d;%dH:cr=^M:dc=\233P:do=\233B:ec=\233%dP:ei=:\
+	:ho=\233H:ic=\233@:im=:is=\23320l:k0=\2339~:k1=\2330~:\
+	:k2=\2331~:k3=\2332~:k4=\2333~:k5=\2334~:k6=\2335~:\
+	:k7=\2336~:k8=\2337~:k9=\2338~:kD=\177:kb=^H:kd=\233B:\
+	:kl=\233D:kr=\233C:ku=\233A:le=\233D:mb=\2337;2m:\
+	:md=\2331m:me=\2330m:mh=\2332m:mk=\2338m:mr=\2337m:\
+	:nd=\233C:nw=\233B\r:r1=\Ec:se=\2330m:sf=\233S:so=\2337m:\
+	:sr=\233T:ta=^I:te=\233?7h:ti=\233?7l:ue=\2330m:up=\233A:\
+	:us=\2334m:vb=^G:ve=\233 p:vi=\2330 p:
+
+# Commodore B-128 microcomputer from Doug Tyrol <det@HEL-ACE.ARPA>
+# 	I'm trying to write a termcap for a commodore b-128, and I'm
+# having a little trouble. I've had to map most of my control characters
+# to something that unix will accept (my delete-char is a ctrl-t, etc),
+# and create some functions (like cm), but thats life.
+# 	The problem is with the arrow keys - right, and up work fine, but
+# left deletes the previous character and down I just can't figure out.
+# Jove knows what I want, but I don't know what it's sending to me (it
+# isn't thats bound to next-line in jove).
+# 	Anybody got any ideas? Here's my termcap.
+# DAG -- I changed his "^n" entries to "\n"; see if that works.
+#
+commodore|b-128|Commodore B-128 micro:\
+	:am:bw:\
+	:co#80:li#24:pb#150:\
+	:al=10\Ei:bl=^G:ce=10\Eq:cl=10\E\006:\
+	:cm=20\E\013%2\054%2\054:cr=^M:dc=10*\177:dl=10*\Ed:\
+	:do=^M:ei=:ho=\E^E:ic=5\E\n:im=:kb=^H:kd=^J:kh=\E^E:kl=^B:\
+	:kr=^F:ku=^P:le=^H:nd=^F:nw=^M^M:ta=5\011:up=^P:
+
+#### North Star
+#
+# North Star Advantage from Lt. Fickie <brl-ibd!fickie> via BRL
+northstar|North Star Advantage:\
+	:co#80:li#24:\
+	:bl=^G:cd=200\017:ce=200\016:cl=200\004:cm=1\E=%+ %+ :\
+	:cr=^M:do=^J:ho=200\034\032:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
+	:sf=^J:ta=^I:
 
 #### Osborne
 #
@@ -8333,33 +8672,51 @@ amiga|Amiga ANSI:\
 ozzie|osborne|osborne1|osborne 1:\
 	:ms:ul:xt:\
 	:co#104:li#24:\
-	:al=\EE:bl=^G:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:dc=\EW:\
-	:dl=\ER:do=^J:ei=:ic=\EQ:im=:kd=^J:kl=^H:kr=^L:ku=^K:\
-	:le=^H:nd=^L:se=\E(:sf=^J:so=\E):ue=\Em:up=^K:us=\El:
+	:al=\EE:bl=^G:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:\
+	:do=^J:ei=:ic=\EQ:im=:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
+	:se=\E(:sf=^J:so=\E):ue=\Em:up=^K:us=\El:
+
+#
+# Osborne Executive definition from BRL
+# Similar to tvi920
+# Added by David Milligan and Tom Smith (SMU)
+osexec|Osborne executive:\
+	:am:\
+	:co#80:li#24:sg#1:ug#1:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:\
+	:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:\
+	:is=\Eq\Ek\Em\EA\Ex0:k0=^A@\r:k1=^AA\r:k2=^AB\r:k3=^AC\r:\
+	:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:k8=^AH\r:k9=^AI\r:\
+	:kb=^H:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:nw=^M^J:se=\Ek:\
+	:so=\Ej:st=\E1:ta=^I:ue=\Em:up=^K:us=\El:
 
 #### Console types for obsolete UNIX clones
 #
 # Coherent, Minix, Venix, and several lesser-known kin were OSs for 8088
 # machines that tried to emulate the UNIX look'n'feel.  Coherent and Venix
-# were commercial, Minix an educational tool sold in conjuction with a book.
+# were commercial, Minix an educational tool sold in conjunction with a book.
 # Memory-segmentation limits and a strong tendency to look like V7 long after
 # it was obsolete made all three pretty lame.  Venix croaked early.  Coherent
 # and Minix were ported to 32-bit Intel boxes, only to be run over by a
 # steamroller named `Linux' (which, to be fair, traces some lineage to Minix). 
-# Coherent's vendor, the Mark Williams Company, went belly-up in 1994.
+# Coherent's vendor, the Mark Williams Company, went belly-up in 1994.  There
+# are also, I'm told, Minix ports that ran on Amiga and Atari machines and
+# even as single processes under SunOS and the Macintosh OS.
 #
 
 minix|minix console:\
 	:co#80:it#8:li#25:\
-	:AL=\E[%dLce=\E[K:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
-	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:\
-	:cd=\E[0J:cl=\E[H\E[0J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
-	:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k0=\E[Y:\
-	:k1=\E[V:k2=\E[U:k3=\E[T:k4=\E[S:k5=\E[G:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:mb=\E[5m:md=\E[1m:me=\E[0m:mr=\E[7m:nd=\E[C:nw=^M^J:\
-	:se=\E[0m:sf=^J:so=\E[7m:sr=\EM:ta=^I:ue=\E[0m:\
-	:up=\E[A:us=\E[4m:
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:cd=\E[0J:ce=\E[K:\
+	:cl=\E[H\E[0J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k0=\E[Y:k1=\E[V:k2=\E[U:\
+	:k3=\E[T:k4=\E[S:k5=\E[G:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[0m:mr=\E[7m:\
+	:nd=\E[C:nw=^M^J:se=\E[0m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
+	:ue=\E[0m:up=\E[A:us=\E[4m:
+
+pc-minix|minix console on an Intel box:\
+	:tc=klone+acs:tc=minix:
 
 # According to the Coherent 2.3 manual, the PC console is similar
 # to a z19. The differences seem to be (1) 25 lines, (2) no status
@@ -8368,34 +8725,35 @@ minix|minix console:\
 pc-coherent|pcz19|coherent|IBM PC console running Coherent:\
 	:am:mi:\
 	:co#80:it#8:li#25:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :cr=^M:\
-	:dc=\EN:do=\EB:ei=\EO:ho=\EH:im=\E@:kb=^H:kd=\EB:\
-	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\Eq:\
-	:sf=^J:so=\Ep:sr=\EI:ta=^I:up=\EA:
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :cr=^M:dc=\EN:\
+	:do=\EB:ei=\EO:ho=\EH:im=\E@:kb=^H:kd=\EB:kh=\EH:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:me=\Eq:nd=\EC:se=\Eq:sf=^J:so=\Ep:\
+	:sr=\EI:ta=^I:up=\EA:
 
 # According to the Venix 1.1 manual, the PC console is similar
 # to a DEC vt52.  Differences seem to be (1) arrow keys send 
 # different strings, (2) enhanced standout, (3) added insert/delete line.
 # Note in particular that it doesn't have automatic margins.
-# There are other keys (f1-f10, pgup, pgdn, backtab, insch, delch)
-# not described here.
+# There are other keys (f1-f10, kpp, knp, kcbt, kich1, kdch1) but they
+# not described here because this derives from an old termcap entry.
 pc-venix|venix|IBM PC console running Venix:\
 	:co#80:it#8:li#25:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:dl=\EM:do=^J:kb=^H:kd=\EP:kh=\EG:kl=\EK:\
-	:kr=\EM:ku=\EH:le=^H:nd=\EC:sf=^J:sr=\EI:ta=^I:\
-	:up=\EA:
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
+	:dl=\EM:do=^J:kb=^H:kd=\EP:kh=\EG:kl=\EK:kr=\EM:ku=\EH:le=^H:\
+	:nd=\EC:sf=^J:sr=\EI:ta=^I:up=\EA:
 
 #### Miscellaneous microcomputer consoles
 #
 # If you know anything more about any of these, please tell me.
+#
 
 # basis from Peter Harrison, Computer Graphics Lab, San Francisco
 #   ucbvax!ucsfmis!harrison ...uucp / ucbvax!ucsfmis!harrison@BERKELEY ...ARPA
 # (basis: removed obsolete ":ma=^K^P^R^L^L :nl=5000*^J:" -- esr)
 basis|BASIS108 computer with terminal translation table active:\
-	:cd=\EY:ce=\ET:cl=300\E*:do=5000\n:kb=^H:kd=^J:kl=^H:\
-	:kr=^L:ku=^K:se=\E):so=\E(:tc=adm3a:
+	:cd=\EY:ce=\ET:cl=300\E*:do=5000\n:kb=^H:kd=^J:kl=^H:kr=^L:\
+	:ku=^K:me=\E):se=\E):so=\E(:\
+	:tc=adm3a:
 # luna's BMC terminal emulator
 luna|luna68k|LUNA68K Bitmap console:\
 	:co#88:li#46:tc=ansi-mini:
@@ -8407,24 +8765,24 @@ megatek|pegasus workstation terminal emulator:\
 xerox820|x820|Xerox 820:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=^Q:ce=^X:cl=1^Z:cm=\E=%+ %+ :cr=^M:do=^J:\
-	:ho=^^:le=^H:nd=^L:sf=^J:up=^K:
+	:bl=^G:cd=^Q:ce=^X:cl=1^Z:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:\
+	:le=^H:nd=^L:sf=^J:up=^K:
 
 #### Videotex and teletext
 #
 
 # standard-issue France Telecom minitel terminal (made by Philips)
-# (m2-nam: had unknown ":zd=\E[1m:zb=\E[5m:zc=lkmjqxtuwvn:";
-# also deleted unnecessary ":ug#0:sg#0:" -- esr)
+# (m2-nam: had unknown :zd=\E[1m:zb=\E[5m:zc=lkmjqxtuwvn:; also deleted
+# unnecessary :ug#0:sg#0: and added <acsc> to quiet tic. -- esr)
 m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel:\
 	:xn:\
 	:co#80:it#8:li#24:\
-	:ae=\E(B:al=\E[L:as=\E(0:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=\E[4l:ho=\E[H:\
-	:im=\E[4h:ip=7:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:\
-	:k3=\EOR:k4=\EOS:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
-	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+	:ac=:ae=\E(B:al=\E[L:as=\E(0:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:ip=7:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:\
+	:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
 
 ######## OBSOLETE VDT TYPES
 #
@@ -8440,9 +8798,8 @@ m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel:\
 abm80|amtek business machines 80:\
 	:am:bw:\
 	:co#80:li#24:\
-	:al=\E^Z:bt=^T:cd=\E^X:ce=\E^O:cl=\E^\:\
-	:cm=\E\021%r%+ %+ :dl=\E^S:do=\E^K:ho=\E^R:le=^H:\
-	:nd=^P:up=\E^L:
+	:al=\E^Z:bt=^T:cd=\E^X:ce=\E^O:cl=\E^\:cm=\E\021%r%+ %+ :\
+	:dl=\E^S:do=\E^K:ho=\E^R:le=^H:nd=^P:up=\E^L:
 
 #### Bell Labs blit terminals
 #
@@ -8470,25 +8827,24 @@ abm80|amtek business machines 80:\
 blit|jerq|blit running teletype rom:\
 	:am:eo:ul:xo:\
 	:co#87:it#8:li#72:\
-	:AL=\EF%+ :DC=\Ee%+ :DL=\EE%+ :IC=\Ef%+ :al=\EF!:\
-	:bl=^G:ce=\EK:cl=^L:cm=\EY%r%+ %+ :cr=^M:dc=\Ee!:\
-	:dl=\EE!:do=^J:ei=:ic=\Ef!:im=:k1=\Ex:k2=\Ey:k3=\Ez:\
-	:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:nd=\EC:\
-	:sf=^J:ta=^I:up=\EA:
+	:AL=\EF%+ :DC=\Ee%+ :DL=\EE%+ :IC=\Ef%+ :al=\EF!:bl=^G:\
+	:ce=\EK:cl=^L:cm=\EY%r%+ %+ :cr=^M:dc=\Ee!:dl=\EE!:do=^J:\
+	:ei=:ic=\Ef!:im=:k1=\Ex:k2=\Ey:k3=\Ez:kb=^H:kd=\EB:kl=\ED:\
+	:kr=\EC:ku=\EA:le=\ED:nd=\EC:sf=^J:ta=^I:up=\EA:
 
-# (cbblit: here's a BSD termcap that says <cud1>=\EG -- esr)
+# (cbblit: here's a BSD termcap that says :do=\EG: -- esr)
 cbblit|fixterm|blit running columbus code:\
 	:co#88:\
-	:cd=\EJ:ei=\ER:ic@:im=\EQ:pO=\EP%03:pf=^T:po=^R:\
-	:se=\EV!:so=\EU!:ue=\EV":us=\EU":vb=\E^G:tc=blit:
+	:cd=\EJ:ei=\ER:ic@:im=\EQ:pO=\EP%03:pf=^T:po=^R:se=\EV!:\
+	:so=\EU!:ue=\EV":us=\EU":vb=\E^G:\
+	:tc=blit:
 
 oblit|ojerq|first version of blit rom:\
 	:am:da:db:eo:mi:ul:xo:\
 	:co#88:it#8:li#72:\
-	:AL=\Ef%+ :DL=\Ee%+ :al=\EF:bl=^G:cd=\EJ:ce=\EK:\
-	:cl=^L:cm=\EY%r%+ %+ :cr=^M:dc=\EO:dl=\EE:do=^J:\
-	:ei=\ER:im=\EQ:kb=^H:le=\ED:nd=\EC:sf=^J:ta=^I:\
-	:up=\EA:vb=\E^G:
+	:AL=\Ef%+ :DL=\Ee%+ :al=\EF:bl=^G:cd=\EJ:ce=\EK:cl=^L:\
+	:cm=\EY%r%+ %+ :cr=^M:dc=\EO:dl=\EE:do=^J:ei=\ER:im=\EQ:\
+	:kb=^H:le=\ED:nd=\EC:sf=^J:ta=^I:up=\EA:vb=\E^G:
 
 #### Bolt, Beranek & Newman (bbn)
 #
@@ -8509,18 +8865,18 @@ oblit|ojerq|first version of blit rom:\
 # this big white gap.
 
 bitgraph|bg2.0nv|bg3.10nv|bbn bitgraph 2.0 or later (normal video):\
-	:is=\E>\E[?5l\E[?7h:vb=\E[?5h\E[?5l:tc=bg2.0:
+	:is=\E>\E[?5l\E[?7h:vb=\E[?5h\E[?5l:\
+	:tc=bg2.0:
 bg2.0rv|bg3.10rv|bbn bitgraph 2.0 (reverse video):\
 	:is=\E>\E[?5h\E[?7h:vb=\E[?5l\E[?5h:tc=bg2.0:
 bg2.0|bg3.10|bbn bitgraph 2.0 or later (no init):\
 	:xn:\
 	:co#85:li#64:\
-	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=%i\E[%d;%dH:cr=^M:cs=\E[%i%d;%dr:dl=\E[M:do=\E[B:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:ke=\E>:\
-	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:l1=PF1:l2=PF2:l3=PF3:\
-	:l4=PF4:le=^H:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=\n:\
-	:so=\E[7m:ta=^I:up=\E[A:
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=%i\E[%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:dl=\E[M:do=\E[B:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kd=\E[B:ke=\E>:kl=\E[D:kr=\E[C:ks=\E=:\
+	:ku=\E[A:l1=PF1:l2=PF2:l3=PF3:l4=PF4:le=^H:me=\E[m:nd=\E[C:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=\n:so=\E[7m:ta=^I:up=\E[A:
 
 bg1.25rv|bbn bitgraph 1.25 (reverse video):\
 	:is=\E>\E[?5h\E[?7h:vb=\E[?5l\E[?5h:tc=bg1.25:
@@ -8530,28 +8886,27 @@ bg1.25nv|bbn bitgraph 1.25 (normal video):\
 bg1.25|bbn bitgraph 1.25:\
 	:co#85:li#64:\
 	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=%i\E[%d;%dH:cr=^M:dl=\E[M:do=\E[B:\
-	:k1=\EP:k2=\EQ:k3=\ER:k4=\ES:kd=\EB:ke=\E>:kl=\ED:\
-	:kr=\EC:ks=\E=:ku=\EA:l1=PF1:l2=PF2:l3=PF3:l4=PF4:\
-	:le=^H:ll=\E[64;1H:nd=\E[C:se=\E[m:sf=\n:so=\E[7m:\
-	:ta=^I:up=\E[A:
+	:cl=\E[H\E[J:cm=%i\E[%d;%dH:cr=^M:dl=\E[M:do=\E[B:k1=\EP:\
+	:k2=\EQ:k3=\ER:k4=\ES:kd=\EB:ke=\E>:kl=\ED:kr=\EC:ks=\E=:\
+	:ku=\EA:l1=PF1:l2=PF2:l3=PF3:l4=PF4:le=^H:ll=\E[64;1H:\
+	:me=\E[m:nd=\E[C:se=\E[m:sf=\n:so=\E[7m:ta=^I:up=\E[A:
 
 #### Chromatics
 #
 
-# I have put the long strings in <smcup>/<rmcup>. Ti sets up a window 
+# I have put the long strings in :ti:/:te:. Ti sets up a window 
 # that is smaller than the screen, and puts up a warning message 
 # outside the window. Te erases the warning message, puts the 
 # window back to be the whole screen, and puts the cursor at just
-# below the small window. I defined <cnorm> and <civis> to really turn 
+# below the small window. I defined :ve: and :vi: to really turn 
 # the cursor on and off, but I have taken this out since I don't 
 # like the cursor being turned off when vi exits.   
 cg7900|chromatics|chromatics 7900:\
 	:am:\
 	:co#80:li#40:\
 	:al=^A>2:bl=^G:cd=^Al:ce=^A`:cl=^L:\
-	:cm=\001M%r%d\\\054%d\\\054:cr=^M:dc=^A<1:dl=^A<2:\
-	:do=^J:ei=:ho=^\:ic=^A>1:im=:le=^H:ll=^A|:nd=^]:\
+	:cm=\001M%r%d\\\054%d\\\054:cr=^M:dc=^A<1:dl=^A<2:do=^J:\
+	:ei=:ho=^\:ic=^A>1:im=:le=^H:ll=^A|:nd=^]:\
 	:se=\001C1\\\054\001c2\\\054:sf=^J:\
 	:so=\001C4\\\054\001c7\\\054:\
 	:te=\001W0\\\05440\\\05485\\\05448\\\054\014\001W0\\\0540\\\05485\\\05448\\\054\001M0\\\05440\\\054:\
@@ -8564,9 +8919,8 @@ cg7900|chromatics|chromatics 7900:\
 ca22851|computer automation 22851:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=^\:ce=^]:cl=\014:cm=\002%i%.%.:cr=^M:do=^J:\
-	:ho=^^:kd=^W:kh=^^:kl=^U:ku=^V:le=^U:nd=^I:sf=^J:\
-	:up=^V:
+	:bl=^G:cd=^\:ce=^]:cl=\014:cm=\002%i%.%.:cr=^M:do=^J:ho=^^:\
+	:kd=^W:kh=^^:kl=^U:ku=^V:le=^U:nd=^I:sf=^J:up=^V:
 
 #### Cybernex
 #
@@ -8575,17 +8929,16 @@ ca22851|computer automation 22851:\
 cyb83|xl83|cybernex xl-83:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cd=\020:ce=\017:cl=\014:cm=\027%+ %+ :cr=^M:\
-	:do=^J:ho=^K:kd=^J:kl=^H:kr=^I:ku=^N:le=^H:nd=^I:\
-	:sf=^J:sr=^N:up=^N:
+	:bl=^G:cd=\020:ce=\017:cl=\014:cm=\027%+ %+ :cr=^M:do=^J:\
+	:ho=^K:kd=^J:kl=^H:kr=^I:ku=^N:le=^H:nd=^I:sf=^J:sr=^N:up=^N:
 # (mdl110: removed obsolete ":ma=^Z^P:" and overridden ":cd=145^NA^W:" -- esr)
 cyb110|mdl110|cybernex mdl-110:\
 	:am:\
 	:co#80:li#24:\
 	:al=\016A\016\035:bl=^G:cd=\016@\026:ce=\016@\026:\
 	:cl=\030:cm=\020%+ %+ :cr=^M:dc=\016A\036:\
-	:dl=\016A\016\036:do=^J:ei=:ho=^Y:ic=\016A\035:im=:\
-	:le=^H:nd=^U:se=^NG:sf=^J:so=^NF:ta=\011:up=^Z:
+	:dl=\016A\016\036:do=^J:ei=:ho=^Y:ic=\016A\035:im=:le=^H:\
+	:nd=^U:se=^NG:sf=^J:so=^NF:ta=\011:up=^Z:
 
 #### Datapoint
 #
@@ -8598,8 +8951,8 @@ cyb110|mdl110|cybernex mdl-110:\
 dp3360|datapoint|datapoint 3360:\
 	:am:\
 	:co#82:li#25:\
-	:bl=^G:cd=^_:ce=^^:cl=^]^_:cr=^M:do=^J:ho=^]:le=^H:\
-	:nd=^X:sf=^J:up=^Z:
+	:bl=^G:cd=^_:ce=^^:cl=^]^_:cr=^M:do=^J:ho=^]:le=^H:nd=^X:\
+	:sf=^J:up=^Z:
 
 #### DEC terminals (Obsolete types: DECwriter and vt40/42/50)
 #
@@ -8619,18 +8972,18 @@ gt42|dec gt42:\
 	:bl=^G:cr=^M:do=^J:le=^H:
 vt50|dec vt50:\
 	:co#80:li#12:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cr=^M:do=^J:le=^H:\
-	:nd=\EC:sf=^J:ta=^I:up=\EA:
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cr=^M:do=^J:le=^H:nd=\EC:\
+	:sf=^J:ta=^I:up=\EA:
 vt50h|dec vt50h:\
 	:co#80:li#12:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
-	:do=^J:le=^H:nd=\EC:sf=^J:sr=\EI:ta=^I:up=\EA:
-# (vt61: there's a BSD termcap that claims <dl1>=\EPd, <il1>=\EPf. <kbs>=^H)
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:do=^J:\
+	:le=^H:nd=\EC:sf=^J:sr=\EI:ta=^I:up=\EA:
+# (vt61: there's a BSD termcap that claims :dl=\EPd:, :al=\EPf.: :kb=^H:)
 vt61|vt-61|vt61.5|dec vt61:\
 	:co#80:li#24:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=\r:\
-	:do=^J:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
-	:sf=\n:sr=\EI:ta=^I:up=\EA:
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=\r:do=^J:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:sf=\n:sr=\EI:ta=^I:\
+	:up=\EA:
 
 # The gigi does standout with red!
 # (gigi: I added <rmam>/<smam> based on the init string, corrected cub1 -- esr)
@@ -8641,10 +8994,10 @@ gigi|vk100|dec gigi graphics terminal:\
 	:UP=\E[%dA:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
 	:cm=\E[%i%d;%dH:cr=^M:do=^J:\
 	:is=\E>\E[?3l\E[?4l\E[?5l\E[?20l\E[?7h\E[?8h:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:ke=\E[?1l\E>:\
-	:kh=\E[H:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
-	:nd=\E[C:se=\E[m:sf=^J:so=\E[7;31m:sr=\EM:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:ke=\E[?1l\E>:kh=\E[H:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:me=\E[m:\
+	:nd=\E[C:se=\E[m:sf=^J:so=\E[7;31m:sr=\EM:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
 
 # DEC PRO-350 console (VT220-style).  The 350 was DEC's attempt to produce
 # a PC differentiated from the IBM clones.  It was a total, ludicrous,
@@ -8653,11 +9006,11 @@ gigi|vk100|dec gigi graphics terminal:\
 # a hefty premium!).
 pro350|decpro|dec pro console:\
 	:co#80:it#8:li#24:\
-	:ae=\EG:as=\EF:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:do=\EB:ho=\EH:k0=\EE:k1=\EF:k2=\EG:k3=\EH:k4=\EI:\
-	:k5=\EJ:k6=\Ei:k7=\Ej:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
-	:ku=\EA:le=^H:nd=\EC:se=\E^N:so=\E^H:sr=\EI:ta=^I:\
-	:ue=\E^C:up=\EA:us=\E^D:
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\EG:as=\EF:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :do=\EB:\
+	:ho=\EH:k0=\EE:k1=\EF:k2=\EG:k3=\EH:k4=\EI:k5=\EJ:k6=\Ei:\
+	:k7=\Ej:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
+	:se=\E^N:so=\E^H:sr=\EI:ta=^I:ue=\E^C:up=\EA:us=\E^D:
 
 dw1|decwriter I:\
 	:hc:os:\
@@ -8690,23 +9043,22 @@ dw3|la120|decwriter III:\
 	:bl=^G:cr=^M:do=^J:\
 	:i1=\E(B\E[20l\E[w\E[0;132s\E[2g\E[z\E[66t\E[1;66r\E[4g\E>:\
 	:is=\E[9;17;25;33;41;49;57;65;73;81;89;97;105;113;121;129u\r:\
-	:kb=^H:le=^H:se=\E[w:sf=^J:so=\E[6w:ta=^I:
+	:kb=^H:le=^H:me=\E[w:se=\E[w:sf=^J:so=\E[6w:ta=^I:
 dw4|decwriter IV:\
 	:am:hc:os:\
 	:co#132:\
-	:bl=^G:cr=^M:do=^J:is=\Ec:k0=\EOP:k1=\EOQ:k2=\EOR:\
-	:k3=\EOS:kb=^H:le=^H:sf=^J:ta=^I:
+	:bl=^G:cr=^M:do=^J:is=\Ec:k0=\EOP:k1=\EOQ:k2=\EOR:k3=\EOS:\
+	:kb=^H:le=^H:sf=^J:ta=^I:
 
 # These aren't official
 ln03|dec ln03 laser printer:\
 	:hc:\
 	:co#80:li#66:\
-	:bl=^G:cr=^M:do=^J:hd=\EK:hu=\EL:nw=^M^J:se=\E[22m:\
+	:bl=^G:cr=^M:do=^J:hd=\EK:hu=\EL:me=\E[m:nw=^M^J:se=\E[22m:\
 	:sf=^J:so=\E[1m:ta=^I:ue=\E[24m:us=\E[4m:
 ln03-w|dec ln03 laser printer 132 cols:\
 	:co#132:\
-	:bl=^G:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:\
-	:ta=^I:tc=ln03:
+	:bl=^G:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ln03:
 
 #### Delta Data (dd)
 #
@@ -8718,8 +9070,8 @@ ln03-w|dec ln03 laser printer 132 cols:\
 delta|dd5000|delta data 5000:\
 	:am:\
 	:co#80:li#27:\
-	:bl=^G:ce=^NU:cl=^NR:cm=\017%+^P%+^P:dc=^NV:do=^J:\
-	:ho=^NQ:le=^H:nd=^Y:sf=^J:up=^Z:
+	:bl=^G:ce=^NU:cl=^NR:cm=\017%+^P%+^P:dc=^NV:do=^J:ho=^NQ:\
+	:le=^H:nd=^Y:sf=^J:up=^Z:
 
 #### Digital Data Research (ddr)
 #
@@ -8731,13 +9083,30 @@ ddr|rebus3180|ddr3180|Rebus/DDR 3180 vt100 emulator:\
 	:RA=\E[7l:SA=\E[7l:cd=50\E[J:ce=3\E[K:cl=50\E[H\E[2J:\
 	:cm=5\E[%i%d;%dH:cs=\E[%i%d;%dr:do=^J:ho=\E[H:\
 	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
-	:kb=^H:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kr=\E[C:\
-	:ks=\E[?1h\E=:ku=\E[A:le=^H:mb=2\E[5m:md=2\E[1m:\
-	:me=2\E[m:mr=2\E[7m:nd=2\E[C:\
-	:r1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
-	:rf=/usr/share/lib/tabset/vt100:sc=\E7:se=\E[m:\
-	:sf=5\ED:so=\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:\
-	:us=2\E[4m:
+	:kb=^H:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kr=\E[C:ks=\E[?1h\E=:\
+	:ku=\E[A:le=^H:mb=2\E[5m:md=2\E[1m:me=2\E[m:mr=2\E[7m:\
+	:nd=2\E[C:r1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:rf=/usr/share/tabset/vt100:sc=\E7:se=\E[m:sf=5\ED:\
+	:so=\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:us=2\E[4m:
+
+#### Evans & Sutherland
+#
+
+# Jon Leech <leech@cs.unc.edu> tells us:
+# The ps300 was the Evans & Sutherland Picture System 300, a high
+# performance 3D vector graphics system with a bunch of specialized hardware.
+# Approximate date of release was 1982 (early 80s, anyway), and it had several
+# evolutions including (limited) color versions such as the PS330C. PS300s
+# were effectively obsolete by the late 80s, replaced by raster graphics
+# systems, although specialized applications like molecular modelling
+# hung onto them for a while longer.  AFAIK all E&S vector graphics systems
+# are out of production, though of course E&S is very much alive (in 1996).
+# (ps300: changed ":pt@:" to "it@" -- esr)
+#
+ps300|Picture System 300:\
+	:xt:\
+	:it@:\
+	:se@:so@:ue@:us@:tc=vt100:
 
 #### General Electric (ge)
 #
@@ -8783,40 +9152,42 @@ terminet1200|terminet300|tn1200|tn300|terminet|GE terminet 1200:\
 #          7 6 5 4 3 2 1 0
 # S401     1 0 0 0 1 1 0 0
 # S402     0 0 0 0 0 0 0 0
-# (h19: I added <rmam>/<smam> based on the init string -- esr)
-h19-a|heath-ansi|heathkit-a|heathkit h19 ansi mode:\
+# (h19: I added <rmam>/<smam> based on the init string;
+# also added empty <acsc> to suppress a tic warning -- esr)
+h19-a|h19a|heath-ansi|heathkit-a|heathkit h19 ansi mode:\
 	:am:mi:ms:\
 	:co#80:it#8:li#24:\
-	:RA=\E[?7l:SA=\E[?7h:ae=\E[11m:al=\E[1L:as=\E[10m:\
+	:RA=\E[?7l:SA=\E[?7h:ac=:ae=\E[11m:al=\E[1L:as=\E[10m:\
 	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-	:dc=\E[1P:dl=\E[1M:do=\E[1B:ei=\E[4l:ho=\E[H:\
-	:im=\E[4h:\
-	:is=\E<\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m\E[?7h:\
-	:k1=\EOS:k2=\EOT:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:\
-	:k7=\EOQ:k8=\EOR:kb=^H:kd=\E[1B:kh=\E[H:kl=\E[1D:\
-	:kr=\E[1C:ku=\E[1A:l6=blue:l7=red:l8=white:le=^H:\
-	:nd=\E[1C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:up=\E[1A:ve=\E[>4l:vs=\E[>4h:
+	:dc=\E[1P:dl=\E[1M:do=\E[1B:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E<\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m\E[?7h:k1=\EOS:\
+	:k2=\EOT:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:\
+	:kb=^H:kd=\E[1B:kh=\E[H:kl=\E[1D:kr=\E[1C:ku=\E[1A:l6=blue:\
+	:l7=red:l8=white:le=^H:nd=\E[1C:se=\E[m:sf=^J:so=\E[7m:\
+	:sr=\EM:ta=^I:up=\E[1A:ve=\E[>4l:vs=\E[>4h:
 h19-bs|heathkit w/keypad shifted:\
 	:ke=\Eu:ks=\Et:tc=h19-b:
 h19-smul|heathkit w/keypad shifted/underscore cursor:\
-	:ke=\Eu:ks=\Et:tc=h19-u:
-# (h19: merged in <ip> from BSDI hp19-e entry> 
+	:ke=\Eu:ks=\Et:\
+	:tc=h19-u:
+# (h19: merged in :ip: from BSDI hp19-e entry>;
+# also added empty <acsc> to suppress a tic warning --esr)
 h19|heath|h19-b|heathkit|heath-19|z19|zenith|heathkit h19:\
 	:am:es:hs:mi:ms:\
 	:co#80:it#8:li#24:\
-	:ae=\EG:al=\EL:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EE:\
-	:cm=\EY%+ %+ :cr=^M:dc=\EN:dl=\EM:do=\EB:ei=\EO:\
-	:fs=\Ek\Ey5:ho=\EH:im=\E@:ip=1.5<1.5/>:k1=\ES:k2=\ET:\
-	:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:kb=^H:\
-	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:l6=blue:l7=red:\
-	:l8=white:le=^H:nd=\EC:se=\Eq:sf=^J:so=\Ep:sr=\EI:\
-	:ta=^I:ts=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo:up=\EA:\
-	:ve=\Ey4:vs=\Ex4:
+	:ac=:ae=\EG:al=\EL:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EE:\
+	:cm=\EY%+ %+ :cr=^M:dc=\EN:dl=\EM:do=\EB:ei=\EO:fs=\Ek\Ey5:\
+	:ho=\EH:im=\E@:ip=1.5<1.5/>:k1=\ES:k2=\ET:k3=\EU:k4=\EV:\
+	:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:kb=^H:kd=\EB:kh=\EH:kl=\ED:\
+	:kr=\EC:ku=\EA:l6=blue:l7=red:l8=white:le=^H:nd=\EC:se=\Eq:\
+	:sf=^J:so=\Ep:sr=\EI:ta=^I:\
+	:ts=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo:up=\EA:ve=\Ey4:\
+	:vs=\Ex4:
 h19-u|heathkit with underscore cursor:\
 	:ve@:vs@:tc=h19-b:
 h19-us|h19us|heathkit w/keypad shifted/underscore cursor:\
-	:ke=\Eu:ks=\Et:tc=h19-u:
+	:ke=\Eu:ks=\Et:\
+	:tc=h19-u:
 h19-g|h19g|heathkit w/block cursor:\
 	:ve=\Ex4:tc=h19-b:
 alto-h19|altoh19|altoheath|alto-heath|alto emulating heathkit h19:\
@@ -8861,80 +9232,84 @@ alto-h19|altoh19|altoheath|alto-heath|alto emulating heathkit h19:\
 # it's only given an insert character ability or the Z29 doesn't 
 # require padding with this (the former is probably more likely, 
 # but I haven't checked it out).
+# (z29: added empty <acsc> to suppress a tic warning --esr)
 z29|zenith29|z29b|zenith z29b:\
 	:am:ms:\
 	:co#80:li#24:\
-	:ae=\EF:al=\EL:as=\EG:bl=^G:bt=\E-:cd=\EJ:ce=\EK:\
-	:cl=\EE:cm=\EY%+ %+ :cr=^M:dc=\EN:dl=\EM:do=\EB:ei=:\
-	:ho=\EH:ic=\E<\E[1@\E[?2h:im=:is=\E<\E[?2h\Ev:k0=\E~:\
-	:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:\
-	:k8=\ER:k9=\E0I:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
-	:ku=\EA:l0=home:le=^H:nd=\EC:se=\Eq:sf=\n:so=\Ep:\
-	:sr=\EI:ta=^I:ue=\Es0:up=\EA:us=\Es8:ve=\Ey4:vs=\Ex4:
+	:ac=:ae=\EF:al=\EL:as=\EG:bl=^G:bt=\E-:cd=\EJ:ce=\EK:cl=\EE:\
+	:cm=\EY%+ %+ :cr=^M:dc=\EN:dl=\EM:do=\EB:ei=:ho=\EH:\
+	:ic=\E<\E[1@\E[?2h:im=:is=\E<\E[?2h\Ev:k0=\E~:k1=\ES:\
+	:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:k9=\E0I:\
+	:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:l0=home:le=^H:\
+	:nd=\EC:se=\Eq:sf=\n:so=\Ep:sr=\EI:ta=^I:ue=\Es0:up=\EA:\
+	:us=\Es8:ve=\Ey4:vs=\Ex4:
 # z29 in ansi mode. Assumes that the cursor is in the correct state, and that
 # the world is stable. <rs1> causes the terminal to be reset to the state
 # indicated by the name. kc -> key click, nkc -> no key click, uc -> underscore
 # cursor, bc -> block cursor.
 # From: Mike Meyers
+# (z29a: replaced nonexistent :if=/usr/share/tabset/zenith29: befause :st:
+# looks vt100-compatible -- esr)
 z29a|z29a-kc-bc|h29a-kc-bc|heath/zenith 29 in ansi mode:\
 	:es:hs:\
 	:co#80:it#8:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
 	:RI=\E[%dC:UP=\E[%dA:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[1P:do=^J:ds=\E[>1l:fs=\E[u\E[>5l:ho=\E[H:\
-	:if=/usr/share/tabset/zenith29:k0=\E[~:k1=\EOS:\
-	:k2=\EOT:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:\
-	:k8=\EOR:k9=\EOX:kC=\E[J:kS=\E[J:kb=^H:kd=\EOB:\
-	:kh=\E[H:kl=\EOD:kr=\EOC:ku=\EOA:l0=help:le=^H:\
-	:mb=\E[5m:md=\E[2m:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:\
-	:nw=^M\ED:ps=\E#7:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[1P:\
+	:do=^J:ds=\E[>1l:fs=\E[u\E[>5l:ho=\E[H:\
+	:if=/usr/share/tabset/vt100:k0=\E[~:k1=\EOS:k2=\EOT:\
+	:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:k9=\EOX:\
+	:kC=\E[J:kS=\E[J:kb=^H:kd=\EOB:kh=\E[H:kl=\EOD:kr=\EOC:\
+	:ku=\EOA:l0=help:le=^H:mb=\E[5m:md=\E[2m:me=\E[m:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=^M\ED:ps=\E#7:\
 	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m\E[11m:\
-	:rc=\E[r:sc=\E[s:se=\E[m:sf=\ED:so=\E[7;2m:sr=\EM:\
-	:st=\EH:ta=^I:te=\E[?7h:ti=\E[?7l:\
+	:rc=\E[r:sc=\E[s:se=\E[m:sf=\ED:so=\E[7;2m:sr=\EM:st=\EH:\
+	:ta=^I:te=\E[?7h:ti=\E[?7l:\
 	:ts=\E[s\E[>5;1h\E[25;%i%dH\E[1K:ue=\E[m:up=\E[A:\
 	:us=\E[4m:
 z29a-kc-uc|h29a-kc-uc|z29 ansi mode with keyckick and underscore cursor:\
-	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m:tc=z29a:
+	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m:\
+	:tc=z29a:
 z29a-nkc-bc|h29a-nkc-bc|z29 ansi mode with block cursor and no keyclick:\
-	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2;4h\E[>1;3;5;6;7;8;9l\E[m\E[11m:tc=z29a:
+	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2;4h\E[>1;3;5;6;7;8;9l\E[m\E[11m:\
+	:tc=z29a:
 z29a-nkc-uc|h29a-nkc-uc|z29 ansi mode with underscore cursor and no keyclick:\
-	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2h\E[>1;3;4;5;6;7;8;9l\E[m\E[11m:tc=z29a:
+	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2h\E[>1;3;4;5;6;7;8;9l\E[m\E[11m:\
+	:tc=z29a:
 # From: Jeff Bartig <jeffb@dont.doit.wisc.edu> 31 Mar 1995
 z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode:\
 	:5i:am:es:hs:mi:ms:xo:\
 	:co#80:li#24:\
-	:%1=\E[~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
-	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:\
-	:ac=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~0a:ae=\E(B:\
-	:al=\E[1L:as=\E(0:bl=^G:bt=\E[1Z:cb=\E[1K:cd=\E[0J:\
+	:%1=\E[~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:K1=\EOw:\
+	:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:ac=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~0a:\
+	:ae=\E(B:al=\E[1L:as=\E(0:bl=^G:bt=\E[1Z:cb=\E[1K:cd=\E[0J:\
 	:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
 	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[1P:dl=\E[1M:do=\E[B:\
 	:ds=\E[>1l:ei=\E[4l:fs=\E[u:ho=\E[H:im=\E[4h:\
-	:is=\E<\E[>1;3;5;6;7l\E[0m\E[2J:k1=\EOS:k2=\EOT:\
-	:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:\
-	:k9=\EOX:kS=\E[J:kb=^H:kd=\E[B:ke=\E[>7l:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ks=\E[>7h:ku=\E[A:le=^H:ll=\E[24;1H:\
-	:mb=\E[5m:md=\E[1m:me=\E[0m:mh=\E[2m:mr=\E[7m:\
-	:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[?19h\E[i:\
-	:r2=\E<\Ec\200:rc=\E[u:sc=\E[s:se=\E[0m:sf=^J:\
-	:so=\E[7m:st=\EH:ta=^I:ts=\E[s\E[>1h\E[25;%i%p1%dH:\
+	:is=\E<\E[>1;3;5;6;7l\E[0m\E[2J:k1=\EOS:k2=\EOT:k3=\EOU:\
+	:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:k9=\EOX:kS=\E[J:\
+	:kb=^H:kd=\E[B:ke=\E[>7l:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[>7h:\
+	:ku=\E[A:le=^H:ll=\E[24;1H:mb=\E[5m:md=\E[1m:me=\E[0m:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:\
+	:ps=\E[?19h\E[i:r2=\E<\Ec\200:rc=\E[u:sc=\E[s:se=\E[0m:\
+	:sf=^J:so=\E[7m:st=\EH:ta=^I:ts=\E[s\E[>1h\E[25;%i%p1%dH:\
 	:ue=\E[0m:up=\E[A:us=\E[4m:ve=\E[>5l:vi=\E[>5h:
 
 # From: Brad Brahms <Brahms@USC-ECLC>
 z100|h100|z110|z-100|h-100|heath/zenith z-100 pc with color monitor:\
-	:ve=\Ey4\Em70:vs=\Ex4\Em71:tc=z100bw:
-# (z100bw: removed obsolete ":kn#10:" -- esr)
+	:ve=\Ey4\Em70:vs=\Ex4\Em71:\
+	:tc=z100bw:
+# (z100bw: removed obsolete ":kn#10:", added empty <acsc> -- esr)
 z100bw|h100bw|z110bw|z-100bw|h-100bw|heath/zenith z-100 pc:\
 	:mi:ms:\
 	:co#80:it#8:li#24:\
-	:ae=\EG:al=5*\EL:as=\EF:cd=\EJ:ce=\EK:cl=5*\EE:\
-	:cm=1*\EY%+ %+ :dc=1*\EN:dl=5*\EM:do=\EB:ei=\EO:\
-	:ho=\EH:im=\E@:k0=\EJ:k1=\ES:k2=\ET:k3=\EU:k4=\EV:\
-	:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:k9=\EOI:kb=^H:kd=\EB:\
-	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\Eq:\
-	:so=\Ep:sr=\EI:ta=^I:up=\EA:ve=\Ey4:vs=\Ex4:
+	:ac=:ae=\EG:al=5*\EL:as=\EF:cd=\EJ:ce=\EK:cl=5*\EE:\
+	:cm=1*\EY%+ %+ :dc=1*\EN:dl=5*\EM:do=\EB:ei=\EO:ho=\EH:\
+	:im=\E@:k0=\EJ:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:\
+	:k7=\EQ:k8=\ER:k9=\EOI:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:nd=\EC:se=\Eq:so=\Ep:sr=\EI:ta=^I:up=\EA:\
+	:ve=\Ey4:vs=\Ex4:
 p19|h19-b with il1/dl1:\
 	:al=2*\EL:dl=2*\EM:tc=h19-b:
 # From: <ucscc!B.fiatlux@ucbvax.berkeley.edu>
@@ -8942,13 +9317,13 @@ p19|h19-b with il1/dl1:\
 ztx|ztx11|zt-1|htx11|ztx-1-a|ztx-10 or 11:\
 	:am:es:hs:\
 	:co#80:it#8:li#24:\
-	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :dl=\EM:\
-	:do=^J:ds=\Ey1:fs=\Ek\Ey5:ho=\EH:\
+	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :dl=\EM:do=^J:\
+	:ds=\Ey1:fs=\Ek\Ey5:ho=\EH:\
 	:is=\Ej\EH\Eq\Ek\Ev\Ey1\Ey5\EG\Ey8\Ey9\Ey>:k0=\ES:\
-	:k1=\EB:k2=\EU:k3=\EV:k4=\EW:k5=\EP:k6=\EQ:k7=\ER:\
-	:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
-	:se=\Eq:so=\Es5:sr=\EI:ta=^I:\
-	:ts=\Ej\Ex5\Ex1\EY8%+ \Eo:ue=\Eq:up=\EA:us=\Es2:
+	:k1=\EB:k2=\EU:k3=\EV:k4=\EW:k5=\EP:k6=\EQ:k7=\ER:kb=^H:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\Eq:so=\Es5:\
+	:sr=\EI:ta=^I:ts=\Ej\Ex5\Ex1\EY8%+ \Eo:ue=\Eq:up=\EA:\
+	:us=\Es2:
 
 #### IMS International (ims)
 #
@@ -8962,20 +9337,18 @@ ims950-b|bare ims950 no init string:\
 # (ims950: removed obsolete ":ko@:" -- esr)
 ims950|ims televideo 950 emulation:\
 	:xn@:\
-	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb@:kd@:kh@:\
-	:kl@:kr@:ku@:vb@:tc=tvi950:
+	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb@:kd@:kh@:kl@:kr@:ku@:vb@:tc=tvi950:
 # (ims950-rv: removed obsolete ":ko@:" -- esr)
 ims950-rv|ims tvi950 rev video:\
 	:xn@:\
-	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb@:kd@:kh@:\
-	:kl@:kr@:ku@:vb@:tc=tvi950-rv:
+	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb@:kd@:kh@:kl@:kr@:ku@:vb@:tc=tvi950-rv:
 ims-ansi|ultima2|ultimaII|IMS Ultima II:\
 	:am:\
 	:co#80:it#8:li#24:\
-	:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:cm=\E[%i%2;%2H:\
-	:do=\ED:if=/usr/share/tabset/vt100:\
-	:is=\E[m\E[>14l\E[?1;?5;20l\E>\E[1m\r:kd=\E[B:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:se=\E[m\E[1m:\
+	:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:cm=\E[%i%2;%2H:do=\ED:\
+	:if=/usr/share/tabset/vt100:\
+	:is=\E[m\E[>14l\E[?1;?5;20l\E>\E[1m\r:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:se=\E[m\E[1m:\
 	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m\E[1m:up=\EM:us=\E[4m:
 
 #### Intertec Data Systems
@@ -8988,20 +9361,21 @@ ims-ansi|ultima2|ultimaII|IMS Ultima II:\
 superbrain|intertec superbrain:\
 	:am:bw:\
 	:co#80:li#24:\
-	:bl=^G:cd=\E~k<10*>:ce=\E~K:cl=\014:cm=\EY%+ %+ :\
-	:cr=^M:do=^J:kd=^J:kl=^U:kr=^F:ku=^K:le=^H:nd=^F:\
-	:sf=^J:ta=^I:te=^L:ti=^L:up=^K:
+	:bl=^G:cd=\E~k<10*>:ce=\E~K:cl=\014:cm=\EY%+ %+ :cr=^M:\
+	:do=^J:kd=^J:kl=^U:kr=^F:ku=^K:le=^H:nd=^F:sf=^J:ta=^I:te=^L:\
+	:ti=^L:up=^K:
 intertube|intertec|Intertec InterTube:\
 	:am:\
 	:co#80:li#25:\
-	:bl=^G:cl=^L:cm=\EY%+ %+ :cr=^M:do=^J:ho=^A:le=^H:\
-	:nd=^F:se=\E0@:sf=^J:so=\E0P:up=^Z:
+	:bl=^G:cl=^L:cm=\EY%+ %+ :cr=^M:do=^J:ho=^A:le=^H:nd=^F:\
+	:se=\E0@:sf=^J:so=\E0P:up=^Z:
 # The intertube 2 has the "full duplex" problem like the tek 4025: if you
 # are typing and a command comes in, the keystrokes you type get interspersed
 # with the command and it messes up
 intertube2|intertec data systems intertube 2:\
 	:ce=\EK:ch=\020%+^J:cm=\016%.\020%+^J:cv=\013%.:\
-	:ll=^K^X\r:tc=intertube:
+	:ll=^K^X\r:\
+	:tc=intertube:
 
 #### Ithaca Intersystems
 #
@@ -9020,18 +9394,18 @@ intertube2|intertec data systems intertube 2:\
 # <yandell@stat.wisc.edu> and Mike Meyer <mikem@stat.wisc.edu> at the 
 # University of Wisconsin.
 
-# (graphos: removed obsolete and syntactically incorrect :kn=4: -- esr)
+# (graphos: removed obsolete and syntactically incorrect :kn=4:, 
+# removed :if=/usr/share/tabset/init.graphos: and 
+# <rf=/usr/share/tabset/init.graphos> no such file & no :st: -- esr)
 graphos|graphos III:\
 	:am:mi:\
 	:co#80:it#8:li#24:\
 	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
 	:UP=\E[%dA:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:dm=\E[4h:\
-	:do=\E[B:ed=\E[4l:ei=\E[4l:ho=\E[H:\
-	:if=/usr/share/tabset/init.graphos:im=\E[4h:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:nw=^M\ED:\
-	:rc=\E8:rf=/usr/lib/tabset/init.graphos:sc=\E7:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:dm=\E[4h:do=\E[B:\
+	:ed=\E[4l:ei=\E[4l:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:me=\E[m:nd=\E[C:nw=^M\ED:rc=\E8:sc=\E7:\
 	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:up=\E[A:\
 	:ve=\Ez56;2;0;0z\Ez73z\Ez4;1;1z:\
 	:vs=\Ez4;2;1z\Ez56;2;80;24z:
@@ -9056,7 +9430,8 @@ modgraph|mod|modgraph terminal emulating vt100:\
 	:xn@:\
 	:co#80:li#24:\
 	:is=\E^9;0s\E^7;1s\E[3g\E^11;9s\E^11;17s\E^11;25s\E^11;33s\E^11;41s\E^11;49s\E^11;57s\E^11;65s\E^11;73s\E^11;81s\E^11;89s:\
-	:rf@:sr=5\EM\E[K:vs=\E^9;0s\E^7;1s:tc=vt100:
+	:rf@:sr=5\EM\E[K:vs=\E^9;0s\E^7;1s:\
+	:tc=vt100:
 # The GX-1000 manual is dated 1984.  This looks rather like a VT-52.
 modgraph2|modgraph gx-1000 80x24 with keypad not enabled:\
 	:am:da:db:\
@@ -9083,19 +9458,18 @@ modgraph2|modgraph gx-1000 80x24 with keypad not enabled:\
 mt70|mt-70|Morrow MD-70; native Morrow mode:\
 	:am:mi:ms:xo:\
 	:co#80:it#8:li#24:\
-	:%1=^AO\r:F1=^A`\r:F2=^Aa\r:F3=^Ab\r:F4=^Ac\r:\
-	:F5=^Ad\r:F6=^Ae\r:F7=^Af\r:F8=^Ag\r:F9=^Ah\r:\
-	:FA=^Ai\r:ac=+z\\\054{.yOi-x`|jGkFlEmDnHtLuKvNwMxIqJ:\
-	:ae=\E%:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:\
-	:ei=:ho=^^:i1=\E"2\EG0\E]:ic=\EQ:im=:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kB=^A^Z\r:\
-	:kC=^An\r:kD=\177:kb=^H:kd=^AK\r:kh=^AN\r:kl=^AL\r:\
-	:kr=^AM\r:ku=^AJ\r:le=^H:me=\EG0:mh=\EG2:mr=\EG4:\
-	:nd=^L:nw=^_:se=\EG0:sf=^J:so=\EG4:ta=^I:\
-	:ti=\E"2\EG0\E]:up=^K:us=\EG1:vb=\EK1\EK0:ve=\E"2:\
-	:vi=\E"0:
+	:%1=^AO\r:F1=^A`\r:F2=^Aa\r:F3=^Ab\r:F4=^Ac\r:F5=^Ad\r:\
+	:F6=^Ae\r:F7=^Af\r:F8=^Ag\r:F9=^Ah\r:FA=^Ai\r:\
+	:ac=+z\\\054{.yOi-x`|jGkFlEmDnHtLuKvNwMxIqJ:ae=\E%:\
+	:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:\
+	:i1=\E"2\EG0\E]:ic=\EQ:im=:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
+	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
+	:k;=^AI\r:kB=^A^Z\r:kC=^An\r:kD=\177:kb=^H:kd=^AK\r:\
+	:kh=^AN\r:kl=^AL\r:kr=^AM\r:ku=^AJ\r:le=^H:mh=\EG2:mk@:\
+	:nd=^L:nw=^_:sf=^J:ta=^I:ti=\E"2\EG0\E]:up=^K:us=\EG1:\
+	:vb=\EK1\EK0:ve=\E"2:vi=\E"0:\
+	:tc=adm+sgr:
 
 #### Omron
 #
@@ -9104,9 +9478,78 @@ mt70|mt-70|Morrow MD-70; native Morrow mode:\
 omron|Omron 8025AG:\
 	:am:da:db:\
 	:co#80:li#24:\
-	:al=\EL:bl=^G:cd=\ER:ce=\EK:cl=\EJ:cr=^M:dc=\EP:\
-	:dl=\EM:do=^J:ho=\EH:le=^H:nd=\EC:se=\E4:sf=\ES:\
-	:so=\Ef:sr=\ET:up=\EA:vs=\EN:
+	:al=\EL:bl=^G:cd=\ER:ce=\EK:cl=\EJ:cr=^M:dc=\EP:dl=\EM:do=^J:\
+	:ho=\EH:le=^H:nd=\EC:se=\E4:sf=\ES:so=\Ef:sr=\ET:up=\EA:\
+	:vs=\EN:
+
+#### Ramtek
+#
+# Ramtek was a vendor of high-end graphics terminals around 1979-1983; they
+# were competition for things like the Tektronics 4025.
+#
+
+# Ramtek 6221 from BRL, probably by Doug Gwyn
+# The following SET-UP modes are assumed for normal operation:
+#	UNDERLINE_CURSOR	ANSI_MODE	AUTO_XON/XOFF_ON
+#	NEWLINE_OFF		80_COLUMNS
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements; I recommend
+#	SMOOTH_SCROLL	AUTO_REPEAT_ON	3_#_SHIFTED	WRAP_AROUND_ON
+# Hardware tabs are assumed to be every 8 columns; they can be set up by the
+# "reset", "tset", or "tabs" utilities (use rt6221-w, 160 columns, for this).
+# Note that the Control-E key is useless on this brain-damaged terminal.  No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+rt6221|Ramtek 6221, 80x24:\
+	:ms:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ac=:ae=^O:as=^N:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[1;1H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^K:ho=\E[1;1H:is=\E)0:\
+	:k0=\EOP:k1=\EOQ:k2=\EOR:k3=\EOS:kb=^H:kd=\E[B:ke=\E>:\
+	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:l0=PF1:l1=PF2:l2=PF3:l3=PF4:\
+	:le=^H:ll=\E[24;1H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:\
+	:r1=\E[1w\E[>37m\E[>39m\E[1v\E[20l\E[?3l\E[?6l\E[>5h\E[>6h\E[>7h\E[>8l\E[>9h\E[>10l\E[1;24r\E[m\E[q\E(B\017\E)0\E#5\E>:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\EM:us=\E[4m:ve=\E[>5h\E[>9h:vi=\E[>5l:\
+	:vs=\E[>7h\E[>9l:
+# [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)].
+rt6221-w|Ramtek 6221, 160x48:\
+	:co#160:li#48:\
+	:kb=^H:kd=^J:kl=^H:ll=\E[48;1H:tc=rt6221:
+
+#### Selanar
+#
+
+# Selanar HiREZ-100 from BRL, probably by Doug Gwyn
+# The following SET-UP modes are assumed for normal operation:
+#	SET_DEFAULT_TABS	48_LINES		80_COLUMNS
+#	ONLINE			ANSI			CURSOR_VISIBLE
+#	VT102_AUTO_WRAP_ON	VT102_NEWLINE_OFF	VT102_MONITOR_MODE_OFF
+#	LOCAL_ECHO_OFF		US_CHAR_SET		WPS_TERMINAL_DISABLED
+#	CPU_AUTO_XON/XOFF_ENABLED			PRINT_FULL_SCREEN
+# For use with graphics software, all graphics modes should be set to factory
+# default.  Other SET-UP modes may be set for operator convenience or
+# communication requirements.  No delays are specified; use "stty ixon -ixany"
+# to enable DC3/DC1 flow control!
+# I commented out the scrolling capabilities since they are too slow.
+hirez100|Selanar HiREZ-100:\
+	:mi:ms:xo:\
+	:co#80:it#8:li#48:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ac=:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=^J:ho=\E[H:is=\E<\E)0:k0=\EOP:k1=\EOQ:\
+	:k2=\EOR:k3=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l0=PF1:l1=PF2:l2=PF3:l3=PF4:\
+	:le=^H:ll=\E[48H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:pf=\E[4i\E[?4i:po=\E[?5i\E[5i:ps=\E[i:\
+	:r1=\030\E2\E<\E[4i\E[?4i\E[12h\E[2;4;20l\E[?0;7h\E[?1;3;6;19l\E[r\E[m\E(B\017\E)0\E>:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:st=\EH:ta=^I:ue=\E[m:\
+	:up=\EM:us=\E[4m:
+hirez100-w|Selanar HiREZ-100 in 132-column mode:\
+	:co#132:\
+	:kb=^H:kd=^J:kl=^H:tc=hirez100:
 
 #### Signetics
 #
@@ -9116,9 +9559,8 @@ vsc|Signetics Vsc Video driver by RMC:\
 	:am:ms:\
 	:co#80:it#8:li#26:\
 	:ce=\E[K:cl=50\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:do=^J:\
-	:ho=\E[H:kb=^H:kd=^J:kl=^H:le=^H:me=^_!:mr=^_ :\
-	:nd=\E[C:nw=^M^J:se=^_!:sf=^J:so=^_ :ta=^I:ue=^_#:\
-	:up=\E[A:us=^_":
+	:ho=\E[H:kb=^H:kd=^J:kl=^H:le=^H:me=^_!:mr=^_ :nd=\E[C:\
+	:nw=^M^J:se=^_!:sf=^J:so=^_ :ta=^I:ue=^_#:up=\E[A:us=^_":
 
 #### Soroc
 #
@@ -9147,12 +9589,12 @@ soroc120|iq120|soroc|soroc iq120:\
 soroc140|iq140|soroc iq140:\
 	:am:mi:\
 	:co#80:li#24:\
-	:al=\Ee:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E+:\
-	:cm=\E=%+ %+ :cr=^M:dc=\Ew:dl=\Er:do=^J:ei=\E8:ho=^^:\
-	:im=\E9:k0=^A0\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
-	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:\
-	:kh=^^:kr=^L:ku=^K:le=^H:ll=^^^K:nd=^L:se=\E\177:\
-	:sf=^J:so=\E\177:ue=\E^A:up=^K:us=\E^A:
+	:al=\Ee:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:dc=\Ew:dl=\Er:do=^J:ei=\E8:ho=^^:im=\E9:k0=^A0\r:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kh=^^:kr=^L:ku=^K:le=^H:\
+	:ll=^^^K:nd=^L:se=\E\177:sf=^J:so=\E\177:ue=\E^A:up=^K:\
+	:us=\E^A:
 
 #### Southwest Technical Products
 #
@@ -9164,8 +9606,8 @@ soroc140|iq140|soroc iq140:\
 swtp|ct82|southwest technical products ct82:\
 	:am:\
 	:co#82:li#20:\
-	:al=^^Y:bl=^G:cd=^V:ce=^F:cl=^L:cm=\013%r%.%.:cr=^M:\
-	:dc=^^H:dl=^Z:do=^J:ei=:ho=^P:ic=^^X:im=:\
+	:al=^^Y:bl=^G:cd=^V:ce=^F:cl=^L:cm=\013%r%.%.:cr=^M:dc=^^H:\
+	:dl=^Z:do=^J:ei=:ho=^P:ic=^^X:im=:\
 	:is=\034\022\036\023\036\004\035\027\011\023\036\035\036\017\035\027\022\011:\
 	:le=^D:ll=^C:nd=^S:se=^^^F:sf=^N:so=^^^V:sr=^O:up=^A:
 
@@ -9208,6 +9650,7 @@ swtp|ct82|southwest technical products ct82:\
 # Sunnyvale, and I'm fairly sure they are still manufacturing ICs
 # (they've gone to ASICs and FPGAs), but I doubt they're in the computer
 # business these days.
+#
 
 # Tested, seems to work fine with vi.
 synertek|ktm|synertek380|synertek ktm 3/80 tubeless terminal:\
@@ -9225,17 +9668,18 @@ synertek|ktm|synertek380|synertek ktm 3/80 tubeless terminal:\
 #
 
 # The tab 132 uses xon/xoff, so no padding needed.
-# <smkx>/<rmkx> have nothing to do with arrow keys.
-# <is2> sets 80 col mode, normal video, autowrap on (for <am>).
+# :ks:/:ke: have nothing to do with arrow keys.
+# :is: sets 80 col mode, normal video, autowrap on (for :am:).
 # Seems to be no way to get rid of status line.
 # The manual for this puppy was dated June 1981.  It claims to be VT52-
 # compatible but looks more vt100-like.
 tab132|tab|tab132-15|tab 132/15:\
 	:da:db:\
 	:co#80:dN@:li#24:lm#96:\
-	:al=\E[L:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=^J:\
-	:ei=\E[4l:im=\E[4h:is=\E[?7h\E[?3l\E[?5l:kd=\E[B:ke@:\
-	:kl=\E[D:ks@:ku=\E[A:tc=vt100:
+	:al=\E[L:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
+	:im=\E[4h:is=\E[?7h\E[?3l\E[?5l:kd=\E[B:ke@:kl=\E[D:ks@:\
+	:ku=\E[A:\
+	:tc=vt100:
 tab132-w|tab132 in wide mode:\
 	:co#132:\
 	:is=\E[?7h\E[?3h\E[?5l:tc=tab132:
@@ -9268,18 +9712,17 @@ t3700|dumb teleray 3700:\
 	:bl=^G:cl=^L:cr=^M:do=^J:le=^H:sf=^J:
 t3800|teleray 3800 series:\
 	:co#80:it#8:li#24:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:do=^J:\
-	:ho=\EH:le=^H:ll=\EY7 :nd=\EC:sf=^J:ta=^I:up=^K:
+	:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:do=^J:ho=\EH:\
+	:le=^H:ll=\EY7 :nd=\EC:sf=^J:ta=^I:up=^K:
 t1061|teleray|teleray 1061:\
 	:am:km:xs:xt:\
 	:co#80:it#8:li#24:sg#1:ug#1:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\014:cm=\EY%+ %+ :\
-	:cr=^M:ct=\EG:dc=\EQ:dl=\EM:do=^J:ei=:ho=\EH:ic=\EP:\
-	:im=:ip=:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\014:cm=\EY%+ %+ :cr=^M:\
+	:ct=\EG:dc=\EQ:dl=\EM:do=^J:ei=:ho=\EH:ic=\EP:im=:ip=:\
 	:is=\Ee\EU01^Z1\EV\EU02^Z2\EV\EU03^Z3\EV\EU04^Z4\EV\EU05^Z5\EV\EU06^Z6\EV\EU07^Z7\EV\EU08^Z8\EV\Ef:\
-	:k1=^Z1:k2=^Z2:k3=^Z3:k4=^Z4:k5=^Z5:k6=^Z6:k7=^Z7:\
-	:k8=^Z8:le=^H:nd=\EC:se=\ER@:sf=^J:so= \ERD:st=\EF:\
-	:ta=^I:ue=\ER@:up=\EA:us=\ERH:
+	:k1=^Z1:k2=^Z2:k3=^Z3:k4=^Z4:k5=^Z5:k6=^Z6:k7=^Z7:k8=^Z8:\
+	:le=^H:nd=\EC:se=\ER@:sf=^J:so= \ERD:st=\EF:ta=^I:ue=\ER@:\
+	:up=\EA:us=\ERH:
 t1061f|teleray 1061 with fast PROMs:\
 	:al=\EL:dl=\EM:ip@:tc=t1061:
 # "Teleray Arpa Special", officially designated as
@@ -9295,10 +9738,9 @@ t1061f|teleray 1061 with fast PROMs:\
 t10|teleray 10 special:\
 	:km:xs:xt:\
 	:co#80:it#8:li#24:sg#2:ug#2:\
-	:al=\EL:cd=\EJ:ce=\EK:cl=30\Ej:cm=\EY%+ %+ :dc=\EQ:\
-	:dl=\EM:ei=:ho=\EH:ic=\EP:im=:le=^H:nd=\EC:pc=\200:\
-	:se=\ER@:sf=\Eq:so=\ERD:sr=\Ep:ta=^I:ue=\ER@:up=\EA:\
-	:us=\ERH:
+	:al=\EL:cd=\EJ:ce=\EK:cl=30\Ej:cm=\EY%+ %+ :dc=\EQ:dl=\EM:\
+	:ei=:ho=\EH:ic=\EP:im=:le=^H:nd=\EC:pc=\200:se=\ER@:sf=\Eq:\
+	:so=\ERD:sr=\Ep:ta=^I:ue=\ER@:up=\EA:us=\ERH:
 # teleray 16 - map the arrow keys for vi/rogue, shifted to up/down page, and
 # back/forth words. Put the function keys (f1-f10) where they can be
 # found, and turn off the other magic keys along the top row, except
@@ -9308,12 +9750,11 @@ t16|teleray 16:\
 	:am:da:db:mi:xs:xt:\
 	:co#80:li#24:\
 	:al=\E[L:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:\
-	:cm=%i\E[%d;%df:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:\
-	:ei=\E[4l:ho=\E[H:im=\E[4h:k1=^Z1:k2=^Z2:k3=^Z3:\
-	:k4=^Z4:k5=^Z5:k6=^Z6:k7=^Z7:k8=^Z8:k9=^Z9:k;=^Z0:\
-	:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\E[T:ta=^I:\
-	:te=\E[V\E[24;1f\E[?38h:ti=\E[U\E[?38l:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
+	:cm=%i\E[%d;%df:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:\
+	:ho=\E[H:im=\E[4h:k1=^Z1:k2=^Z2:k3=^Z3:k4=^Z4:k5=^Z5:k6=^Z6:\
+	:k7=^Z7:k8=^Z8:k9=^Z9:k;=^Z0:le=^H:me=\E[m:nd=\E[C:se=\E[m:\
+	:sf=^J:so=\E[7m:sr=\E[T:ta=^I:te=\E[V\E[24;1f\E[?38h:\
+	:ti=\E[U\E[?38l:ue=\E[m:up=\E[A:us=\E[4m:
 
 #### Texas Instruments (ti)
 #
@@ -9330,26 +9771,24 @@ ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL:\
 	:am:xo:\
 	:co#80:it#8:li#24:\
 	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:\
-	:cm=%i\E[%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:\
-	:dl=\E[M:do=\E[B:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:\
-	:k4=\EOS:k5=\E[16~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
-	:k9=\E[20~:kD=\E[P:kI=\E[@:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=\ED:\
-	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
+	:cm=%i\E[%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:dl=\E[M:\
+	:do=\E[B:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[16~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[P:kI=\E[@:\
+	:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:\
+	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
 	:us=\E[4m:ve=\E[?25h:vi=\E[?25l:vs=\E[?31h:
 ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL:\
 	:am:xo:\
 	:co#80:it#8:li#24:\
 	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:\
-	:cm=%i\E[%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:\
-	:dl=\E[M:do=\E[B:ho=\E[H:k1=P\217>:k2=Q\217>:\
-	:k3=R\217>:k4=S\217>:k5=~\23316>:k6=~\23317>:\
-	:k7=~\23318>:k8=~\23319>:k9=~\23320>:kD=P\233>:\
-	:kI=@\233>:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:\
-	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:cm=%i\E[%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:dl=\E[M:\
+	:do=\E[B:ho=\E[H:k1=P\217>:k2=Q\217>:k3=R\217>:k4=S\217>:\
+	:k5=~\23316>:k6=~\23317>:k7=~\23318>:k8=~\23319>:\
+	:k9=~\23320>:kD=P\233>:kI=@\233>:kb=^H:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:\
+	:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
 	:vi=\E[?25l:vs=\E[?31h:
 ti924w|Texas Instruments 924 VDT 7 bit - 132 column mode:\
 	:co#132:tc=ti924:
@@ -9358,19 +9797,19 @@ ti924-8w|Texas Instruments 924 VDT 8 bit - 132 column mode:\
 ti931|Texas Instruments 931 VDT:\
 	:am:xo:\
 	:co#80:li#24:\
-	:al=\EN:bl=^G:cd=\EJ:ce=\EI:cl=\EL:cm=\EY%+ %+ :\
-	:cr=^M:dc=\EQ:dl=\EO:do=\EB:ei=:ho=\EH:ic=\ER\EP\EM:\
-	:im=:is=\EGB\E(@B@@\E):k1=\Ei1:k2=\Ei2:k3=\Ei3:\
-	:k4=\Ei4:k5=\Ei5:k6=\Ei6:k7=\Ei7:k8=\Ei8:k9=\Ei9:\
-	:kA=\EN:kD=\EQ:kI=\EP:kL=\EO:kd=\EB:kl=\ED:kr=\EC:\
-	:ku=\EA:le=\ED:mb=\E4P:me=\E4@:mk=\E4H:mr=\E4B:\
-	:nd=\EC:se=\E4@:sf=\Ea:so=\E4A:sr=\Eb:ue=\E4@:up=\EA:\
-	:us=\E4D:ve=\E4@:
+	:al=\EN:bl=^G:cd=\EJ:ce=\EI:cl=\EL:cm=\EY%+ %+ :cr=^M:\
+	:dc=\EQ:dl=\EO:do=\EB:ei=:ho=\EH:ic=\ER\EP\EM:im=:\
+	:is=\EGB\E(@B@@\E):k1=\Ei1:k2=\Ei2:k3=\Ei3:k4=\Ei4:\
+	:k5=\Ei5:k6=\Ei6:k7=\Ei7:k8=\Ei8:k9=\Ei9:kA=\EN:kD=\EQ:\
+	:kI=\EP:kL=\EO:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:mb=\E4P:\
+	:me=\E4@:mk=\E4H:mr=\E4B:nd=\EC:se=\E4@:sf=\Ea:so=\E4A:\
+	:sr=\Eb:ue=\E4@:up=\EA:us=\E4D:ve=\E4@:
 ti926|Texas Instruments 926 VDT 8859/1 7 bit CTRL:\
 	:cs@:sf=\E[1S:sr=\E[1T:tc=ti924:
 # (ti926-8: I corrected this from the broken SCO entry -- esr)
 ti926-8|Texas Instruments 926 VDT 8859/1 8 bit CTRL:\
-	:cs@:sf=\2331S:sr=\2331T:tc=ti924-8:
+	:cs@:sf=\2331S:sr=\2331T:\
+	:tc=ti924-8:
 ti_ansi|basic entry for ti928:\
 	:am:eo:ut:xn:xo:\
 	:Co#8:co#80:it#8:li#25:pa#64:\
@@ -9378,11 +9817,10 @@ ti_ansi|basic entry for ti928:\
 	:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
 	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
 	:ic=\E[@:im=:k0=\E[V:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:\
-	:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:kN=\E[G:\
-	:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:nd=\E[C:\
-	:op=\E[37;40m:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:kN=\E[G:kP=\E[I:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:nd=\E[C:op=\E[37;40m:se=\E[m:\
+	:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 #
 #       928 VDT 7 bit control mode
 #
@@ -9390,28 +9828,33 @@ ti928|Texas Instruments 928 VDT 8859/1 7 bit CTRL:\
 	:%9=\E[35~:@7=\E_1\E\\:@8=\E[8~:F1=\E[29~:F2=\E[31~:\
 	:F3=\E[32~:F5=\E[34~:k1=\E[17~:k2=\E[18~:k3=\E[19~:\
 	:k4=\E[20~:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:\
-	:k9=\E[26~:k;=\E[28~:kD=\E[P:kI=\E[@:kN=\E[S:kP=\E[T:tc=ti_ansi:
+	:k9=\E[26~:k;=\E[28~:kD=\E[P:kI=\E[@:kN=\E[S:kP=\E[T:\
+	:tc=ti_ansi:
 #
 #       928 VDT 8 bit control mode
 #
 ti928-8|Texas Instruments 928 VDT 8859/1 8 bit CTRL:\
-	:%9=\23335~:@7=\2371\234:@8=\2338~:F1=\23329~:\
-	:F2=\23331~:F3=\23332~:F5=\23334~:k1=\23317~:\
-	:k2=\23318~:k3=\23319~:k4=\23320~:k5=\23321~:\
-	:k6=\23323~:k7=\23324~:k8=\23325~:k9=\23326~:\
-	:k;=\23328~:kD=\233P:kI=\233@:kN=\233S:kP=\233T:\
-	:kh=\233H:tc=ti_ansi:
+	:%9=\23335~:@7=\2371\234:@8=\2338~:F1=\23329~:F2=\23331~:\
+	:F3=\23332~:F5=\23334~:k1=\23317~:k2=\23318~:k3=\23319~:\
+	:k4=\23320~:k5=\23321~:k6=\23323~:k7=\23324~:k8=\23325~:\
+	:k9=\23326~:k;=\23328~:kD=\233P:kI=\233@:kN=\233S:\
+	:kP=\233T:kh=\233H:\
+	:tc=ti_ansi:
 
 #### Zentec (zen)
 #
 
-# (zen30: removed obsolete ":ma=^L ^R^L^K^P:" -- esr)
+# (zen30: removed obsolete :ma=^L ^R^L^K^P:.  This entry originally
+# had just :so:=\EG6 which I think means standout was supposed to be 
+# dim-reverse using ADM12-style attributes. ADM12 :us:/:ue: and
+# <invis> might work-- esr)
 zen30|z30|zentec 30:\
 	:am:mi:ul:\
 	:co#80:li#24:\
-	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :\
-	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:le=^H:\
-	:nd=^L:se=\EG0:sf=^J:so=\EG6:up=^K:
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:le=^H:mh=\EG2:nd=^L:\
+	:sf=^J:so=\EG6:ue@:up=^K:us@:\
+	:tc=adm+sgr:
 # (zen50: this had extension capabilities
 #	:BS=^U:CL=^V:CR=^B:
 # UK/DK/RK/LK/HM were someone's aliases for ku/kd/kl/kr/kh,
@@ -9420,13 +9863,73 @@ zen30|z30|zentec 30:\
 zen50|z50|zentec zephyr:\
 	:am:\
 	:co#80:li#24:sg#1:\
-	:al=\EE:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :dc=\EW:\
-	:dl=\ER:ei=:ic=\EQ:im=:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:le=^H:se=\EGO:so=\EG4:up=^K:
+	:al=\EE:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :dc=\EW:dl=\ER:ei=:\
+	:ic=\EQ:im=:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mk@:ue@:up=^K:\
+	:us@:\
+	:tc=adm+sgr:
 
 ######## OBSOLETE UNIX CONSOLES
 #
 
+#### Apollo consoles
+#
+# Apollo got bought by Hewlett-Packard.  The Apollo workstations are 
+# labeled HP700s now.
+#
+
+# From: Gary Darland <goodmanc@garnet.berkeley.edu>
+apollo|apollo console:\
+	:am:mi:\
+	:co#88:li#53:\
+	:al=\EI:cd=\EJ:ce=\EK:ch=\EN%d:cl=^L:cm=\EM%+ %d):cv=\EO+ :\
+	:dc=\EP:dl=\EL:do=\EB:ei=\ER:im=\EQ:le=^H:nd=\EC:se=\ET:\
+	:sf=\EE:so=\ES:sr=\ED:te=\EX:ti=\EW:ue=\EV:up=\EA:us=\EU:
+
+# We don't know whether or not the apollo guys replicated DEC's firmware bug
+# in the VT132 that reversed :ei:/:im:.  To be on the safe side, disable
+# both these capabilities.
+apollo_15P|apollo 15 inch display:\
+	:ei@:im@:tc=vt132:
+apollo_19L|apollo 19 inch display:\
+	:ei@:im@:tc=vt132:
+apollo_color|apollo color display:\
+	:ei@:im@:tc=vt132:
+
+#### Fortune Systems consoles
+#
+# Fortune made a line of 68K-based UNIX boxes that were pretty nifty
+# in their day; I (esr) used one myself for a year or so around 1984.
+# They had no graphics, though, and couldn't compete against Suns and
+# the like.  R.I.P.
+#
+
+# From: Robert Nathanson <c160-3bp@Coral> via tut   Wed Oct 5, 1983
+# (This had extension capabilities
+#	:rv=\EH:re=\EI:rg=0:GG=0:\
+#	:CO=\E\\:WL=^Aa\r:WR=^Ab\r:CL=^Ac\r:CR=^Ad\r:DL=^Ae\r:RF=^Af\r:\
+#	:RC=^Ag\r:CW=^Ah\r:NU=^Aj\r:EN=^Ak\r:HM=^Al:PL=^Am\r:\
+#	:PU=^An\r:PD=^Ao\r:PR=^Ap\r:HP=^A@\r:RT=^Aq\r:TB=\r:CN=\177:MP=\E+F:
+# It had both ":bs:" and ":bs=^H:"; I removed the latter.  Also, it had
+# ":sg=0:" and ":ug=0:"; evidently the composer was trying (unnecessarily)
+# to force both magic cookie glitches off.  Once upon a time, I
+# used a Fortune myself, so I know the capabilities of the form ^A[a-z]\r are
+# function keys; thus the "Al" value for HM was certainly an error.  I renamed
+# EN/PD/PU/CO/CF/RT according to the XENIX/TC mappings, but not HM/DL/RF/RC.  
+# I think :rv: and :re: are start/end reverse video and :rg: is a nonexistent
+# "reverse-video-glitch" capability; I have put :rv: and :re: in with standard
+# names below.  I've removed obsolete ":nl=5^J:" as there is a :do: -- esr)
+fos|fortune|Fortune system:\
+	:am:bw:\
+	:co#80:li#25:\
+	:@7=^Ak\r:@8=^Aq:ac=l m"k(j*v%w#q&x-:ae=^O:al=\034E:\
+	:as=\Eo:bl=^G:cd=\034Y:ce=^\Z:cl=\014:cm=\034C%+ %+ :cr=^M:\
+	:dc=\034W:dl=\034R:do=\n:ei=:ho=\036:ic=\034Q:im=:is=^_..:\
+	:k1=^Aa\r:k2=^Ab\r:k3=^Ac\r:k4=^Ad\r:k5=^Ae\r:k6=^Af\r:\
+	:k7=^Ag\r:k8=^Ah\r:kN=^Ao\r:kP=^An\r:kb=^H:kd=^Ay\r:\
+	:kh=^A?\r:kl=^Aw\r:kr=^Az\r:ku=^Ax\r:le=^H:mb=\EN:me=\EI:\
+	:mr=\EH:nw=^M^J:se=^\I`:sf=^J:so=^\H`:ta=^Z:ue=^\IP:up=\013:\
+	:us=^\HP:ve=\E\\:vi=\E]:vs=\E\072:
+
 #### Masscomp consoles
 #
 # Masscomp has gone out of business.  Their product line was purchased by
@@ -9438,11 +9941,10 @@ zen50|z50|zentec zephyr:\
 masscomp|masscomp workstation console:\
 	:km:mi:\
 	:co#80:it#8:li#24:\
-	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:im=\E[4h:\
-	:is=\EGc\EGb\EGw:kb=^H:kd=\EOB:kl=\EOD:kr=\EOC:\
-	:ku=\EOA:le=^H:nd=\E[C:se=\E[m:so=\E[7m:ta=^I:\
-	:ue=\EGau:up=\E[A:us=\EGu:
+	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=\E[4l:im=\E[4h:is=\EGc\EGb\EGw:kb=^H:\
+	:kd=\EOB:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:nd=\E[C:se=\E[m:\
+	:so=\E[7m:ta=^I:ue=\EGau:up=\E[A:us=\EGu:
 masscomp1|masscomp large screen version 1:\
 	:co#104:li#36:tc=masscomp:
 masscomp2|masscomp large screen version 2:\
@@ -9468,6 +9970,7 @@ qdss|qdcons|qdss glass tty:\
 #
 # These terminals are *long* dead -- these entries are retained for
 # historical interest only.
+#
 
 #### Obsolete non-ANSI software emulations
 #
@@ -9479,11 +9982,11 @@ qdss|qdcons|qdss glass tty:\
 # so we have to save their status in the static registers A, B and H
 # respectively, to be able to restore them when color changes
 # (because any color change turns off ALL attributes)
-# 3. <bold> and <rev> sequences alternate modes,
+# 3. :md: and :mr: sequences alternate modes,
 # rather then simply  entering them.  Thus we have to check the
 # static register B and H to determine the status, before sending the 
 # escape sequence.
-# 4. <sgr0> now must set the status of all 3 register (A,B,H) to zero
+# 4. :me: now must set the status of all 3 register (A,B,H) to zero
 # and then reset colors
 # 5. implementation of the protect mode would badly penalize the performance.
 # we would have to use \E&bn sequence to turn off colors (as well as all
@@ -9502,15 +10005,14 @@ qdss|qdcons|qdss glass tty:\
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 ctrm|C terminal emulator:\
 	:am:ut:xo:\
-	:Co#8:NC#2:Nl#0:co#80:lh#0:li#24:lm#0:lw#0:pa#63:\
-	:pb#19200:vt#6:\
-	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\
-	:cl=\EH\EJ:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:cv=\E&a%dY:\
-	:dc=\EP:dl=\EM:do=^J:ei=\ER:im=\EQ:ip=:is=\E&jA\r:\
-	:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:\
-	:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:kb=^H:kd=\Ew\r:ke=\E&jA:\
-	:kh=\Ep\r:kl=\Eu\r:kr=\Ev\r:ks=\E&jB:ku=\Et\r:le=^H:\
-	:mb=\E&dA%{1}%PA:md=%?%gH%{0}%=%t\E&dH%{1}%PH%;:\
+	:Co#8:NC#2:Nl#0:co#80:lh#0:li#24:lm#0:lw#0:pa#63:pb#19200:vt#6:\
+	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:\
+	:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:\
+	:do=^J:ei=\ER:im=\EQ:ip=:is=\E&jA\r:k1=\Ep\r:k2=\Eq\r:\
+	:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:\
+	:kb=^H:kd=\Ew\r:ke=\E&jA:kh=\Ep\r:kl=\Eu\r:kr=\Ev\r:\
+	:ks=\E&jB:ku=\Et\r:le=^H:mb=\E&dA%{1}%PA:\
+	:md=%?%gH%{0}%=%t\E&dH%{1}%PH%;:\
 	:me=\E&d@%{0}%PA%{0}%PB%{0}%PH:\
 	:mr=%?%gB%{0}%=%t\E&dB%{1}%PB%;:nd=\EC:\
 	:op=\E&bn\E&bB\E&bG\E&bR\n%{0}%PX%{0}%PY%{0}%PZ\n%{1}%PW%{1}%PV%{1}%PU:\
@@ -9518,23 +10020,24 @@ ctrm|C terminal emulator:\
 
 # gs6300 - can't use blue foreground, it clashes with underline;
 # it's simulated with cyan
+# Bug: The <op> capability probably resets attributes.
+# (gs6300: commented out <rmln> (no <smln>) --esr)
 gs6300|emots|AT&T PC6300 with EMOTS terminal emulator:\
 	:am:ms:ut:xo:\
 	:Co#8:co#80:it#8:li#24:pa#63:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:LF=\E|:RI=\E[%dC:Sb=\E[?;%dm:\
+	:LE=\E[%dD:RI=\E[%dC:Sb=\E[?;%dm:\
 	:..Sf=\E[?%?%p1%{0}%=%t0\n%e%p1%{1}%=%t2\n%e%p1%{1}%-%d%;m:\
 	:UP=\E[%dA:\
 	:ac=\\\054\\\054..--++``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
 	:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
-	:do=^J:ei=:ho=\E[H:ic=\E[@:im=:is=\E[m:k1=\E[0s:\
-	:k2=\E[24s:k3=\E[1s:k4=\E[23s:k5=\E[2s:k6=\E[22s:\
-	:k7=\E[3s:k8=\E[21s:kB=^R^I:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\E[10m:mr=\E[7m:nd=\E[C:op=\E[?;m:pf=\E[4i:\
-	:po=\E[5i:r1=\Ec:sf=^J:so=\E[1m:sr=\E[L:ta=^I:\
-	:up=\E[A:us=\E[4m:
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:\
+	:ei=:ho=\E[H:ic=\E[@:im=:is=\E[m:k1=\E[0s:k2=\E[24s:\
+	:k3=\E[1s:k4=\E[23s:k5=\E[2s:k6=\E[22s:k7=\E[3s:k8=\E[21s:\
+	:kB=^R^I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\E[10m:mr=\E[7m:nd=\E[C:\
+	:op=\E[?;m:pf=\E[4i:po=\E[5i:r1=\Ec:sf=^J:so=\E[1m:sr=\E[L:\
+	:ta=^I:up=\E[A:us=\E[4m:
 
 # From: <earle@smeagol.UUCP> 29 Oct 85 05:40:18 GMT
 # MS-Kermit with Heath-19 emulation mode enabled
@@ -9544,10 +10047,10 @@ h19k|h19kermit|heathkit emulation provided by Kermit (no auto margin):\
 	:it@:\
 	:ta@:tc=h19-u:
 
-# Apple Macintosh with Versaterm, a terminal emulator formerly
-# distributed by Peripherals Computers & Supplies, Inc
-# 2232 Perkiomen Ave., Mt. Penn, PA 19606, (215) 779-0522
-# The number no longer reaches them and they are no longer listed.
+# Apple Macintosh with Versaterm, a terminal emulator distributed by Synergy
+# Software (formerly Peripherals Computers & Supplies, Inc) of
+# 2457 Perkiomen Ave., Reading, PA 19606, 1-800-876-8376.  They can
+# also be reached at support@synergy.com.
 versaterm|versaterm vt100 emulator for the macintosh:\
 	:am:xn:\
 	:co#80:it#8:li#24:\
@@ -9555,50 +10058,39 @@ versaterm|versaterm vt100 emulator for the macintosh:\
 	:cm=5\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=7\E[1P:\
 	:dl=9\E[1M:do=^J:ei=:ho=\E[H:ic=7\E[1@:im=:\
 	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
-	:kb=^H:kd=\EOB:ke=\E>\E[?1l:kl=\EOD:kr=\EOC:\
-	:ks=\E=\E[?1h:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:\
-	:me=2\E[m:mr=2\E[7m:nd=2\E[C:nw=^M^J:r1=\E>:rc=\E8:\
-	:rf=/usr/lib/tabset/vt100:sc=\E7:se=2\E[m:so=2\E[7m:\
+	:kb=^H:kd=\EOB:ke=\E>\E[?1l:kl=\EOD:kr=\EOC:ks=\E=\E[?1h:\
+	:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:me=2\E[m:mr=2\E[7m:\
+	:nd=2\E[C:nw=^M^J:r1=\E>:rc=\E8:\
+	:rf=/usr/share/tabset/vt100:sc=\E7:se=2\E[m:so=2\E[7m:\
 	:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:us=2\E[4m:
 
-# vs100 emulator using tsim
-# From: <lai@decwrl.dec.com>
-# (vs100t: had Al/Dl in front of obvious AL/DL capabilities -- esr)
-vs100t|tsim|vs100-tsim|tsim vs100 emulator:\
-	:am:\
-	:co#80:it#8:li#24:\
-	:AL=\E+%+ :DL=\E-%+ :al=\EI:cd=\EQ:ce=\EL:cl=\EE:\
-	:cm=\EM%+ %+ :cs=\ES%+ %+ :dc=\Ed:dl=\ED:do=^J:ei=:\
-	:ho=\EH:i1=\ER:ic=\Ei:im=:le=^H:nd=\En:se=\Er:so=\Eh:\
-	:ta=^I:ue=\Ev:up=^K:us=\Eu:
-
 # From: Rick Thomas <ihnp4!btlunix!rbt>
 # (xtalk: I added <rmam>/<smam> based on the init string.
-# I also removed <xmc>#1, I don't believe it on a PC display -- esr)
+# I also removed :sg#1: and the trailing \s characters from the highlight
+# changers, I don't believe these on a VT100-emulating PC display -- esr)
 xtalk|IBM PC with xtalk communication program (versions up to 3.4):\
 	:am:mi:ms:xo:\
 	:co#80:it#8:li#24:vt#3:\
-	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:\
-	:K5=\EOn:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
-	:UP=\E[%dA:\
+	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dl=\E[M:\
-	:do=^J:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:k2=\EOQ:\
-	:k3=\EOR:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:\
-	:k9=\EOw:k;=\EOx:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
-	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:nd=\E[C:\
-	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:se=\E[m :sf=^J:\
-	:so=\E[7m :sr=\EM:st=\EH:ta=^I:up=\E[A:
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dl=\E[M:do=^J:\
+	:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:me=\E[m:nd=\E[C:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:up=\E[A:
 
 # The official PC terminal emulator program of the AT&T Product Centers.
 # Note - insert mode commented out - doesn't seem to work on AT&T PC.
 simterm|attpc running simterm:\
 	:am:\
 	:co#80:li#24:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\E=%+ %+ :\
-	:cr=^M:dc=\ER:dl=\EM:do=\EB:ho=\EH:im=\EQ:le=^H:\
-	:nd=\EC:sf=^J:so=\E&dB:te=\EVE:ti=\EVS:up=\EA:
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\E=%+ %+ :cr=^M:\
+	:dc=\ER:dl=\EM:do=\EB:ho=\EH:im=\EQ:le=^H:me=\E&d@:nd=\EC:\
+	:se=\E&d@:sf=^J:so=\E&dB:te=\EVE:ti=\EVS:up=\EA:
 
 #### Daisy wheel printers
 #
@@ -9606,26 +10098,28 @@ simterm|attpc running simterm:\
 # wheel terminals.  These are now largely obsolete.
 #
 
+# (diablo1620: removed :if=/usr/share/tabset/xerox1720:, no such file -- esr)
 diablo1620|diablo1720|diablo450|ipsi|diablo 1620:\
 	:hc:os:\
 	:co#132:it#8:\
-	:ch=\E\011%i%.:ct=\E2:do=^J:hd=\ED:hu=\EU:\
-	:if=/usr/share/tabset/xerox1720:kb=^H:le=^H:st=\E1:\
-	:ta=^I:up=\E^J:
+	:ch=\E\011%i%.:ct=\E2:do=^J:hd=\ED:hu=\EU:kb=^H:le=^H:\
+	:st=\E1:ta=^I:up=\E^J:
 diablo1620-m8|diablo1640-m8|diablo 1620 w/8 column left margin:\
 	:co#124:\
 	:is=\r        \E9:tc=diablo1620:
+# (diablo1640: removed :if=/usr/share/tabset/xerox1730:, no such file -- esr)
 diablo1640|diablo1730|diablo1740|diablo630|x1700|diablo|xerox|diablo 1640:\
-	:bl=^G:if=/usr/share/tabset/xerox1730:se=\E&:so=\EW:\
-	:ue=\ER:us=\EE:tc=diablo1620:
+	:bl=^G:se=\E&:so=\EW:ue=\ER:us=\EE:\
+	:tc=diablo1620:
+# (diablo1640-lm: removed :if=/usr/share/tabset/xerox1730-lm:, no such 
+# file -- esr)
 diablo1640-lm|diablo-lm|xerox-lm|diablo 1640 with indented left margin:\
 	:co#124:\
-	:if=/usr/share/tabset/xerox1730-lm:se=\E&:so=\EW:\
-	:ue=\ER:us=\EE:tc=diablo1620:
+	:se=\E&:so=\EW:ue=\ER:us=\EE:tc=diablo1620:
 diablo1740-lm|630-lm|1730-lm|x1700-lm|diablo 1740 printer:\
 	:tc=diablo1640-lm:
-# DTC 382 with VDU.  Has no <ed> so we fake it with <el>.  Standout
-# <smso>=^P\s\002^PF works but won't go away without dynamite <rmso>=^P\s\200.
+# DTC 382 with VDU.  Has no :cd: so we fake it with :ce:.  Standout
+# :so=^P\s\002^PF: works but won't go away without dynamite :se=^P\s\200:.
 # The terminal has tabs, but I'm getting tired of fighting the braindamage. 
 # If no tab is set or the terminal's in a bad mood, it glitches the screen
 # around all of memory.  Note that return puts a blank ("a return character")
@@ -9636,24 +10130,23 @@ diablo1740-lm|630-lm|1730-lm|x1700-lm|diablo 1740 printer:\
 # I have been unable to get tabs set in all 96 lines - it always leaves at
 # least one line with no tabs in it, and once you tab through that line,
 # it completely weirds out.
+# (dtc382: change :te: to :ti: -- it  just does a clear --esr)
 dtc382|DTC 382:\
 	:am:da:db:xs:\
 	:co#80:li#24:lm#96:\
 	:al=^P^Z:bl=^G:cd=\020\025\020\023\020\023:ce=^P^U:\
 	:cl=\020\035:cm=\020\021%r%.%.:cr=^P^M:dc=^X:dl=^P^S:\
 	:ei=^Pi:ho=^P^R:im=^PI:le=^H:nd=^PR:pc=\177:sf=^J:\
-	:te=\020\035:ue=^P \200:up=^P^L:us=^P ^P:ve=^Pb:\
-	:vs=^PB:
+	:ti=\020\035:ue=^P \200:up=^P^L:us=^P ^P:ve=^Pb:vs=^PB:
 dtc300s|DTC 300s:\
 	:hc:os:\
 	:co#132:\
-	:bl=^G:cr=^M:ct=\E3:do=^J:ff=^L:hd=\Eh:hu=\EH:kb=^H:\
-	:le=^H:sf=^J:st=\E1:ta=^I:up=^Z:
+	:bl=^G:cr=^M:ct=\E3:do=^J:ff=^L:hd=\Eh:hu=\EH:kb=^H:le=^H:\
+	:sf=^J:st=\E1:ta=^I:up=^Z:
 gsi|mystery gsi terminal:\
 	:hc:os:\
 	:co#132:\
-	:bl=^G:cr=^M:do=^J:hd=\Eh:hu=\EH:le=^H:sf=^J:ta=^I:\
-	:up=^Z:
+	:bl=^G:cr=^M:do=^J:hd=\Eh:hu=\EH:le=^H:sf=^J:ta=^I:up=^Z:
 aj830|aj832|aj|anderson jacobson:\
 	:hc:os:\
 	:bl=^G:cr=^M:do=^J:hd=\E9:hu=\E8:le=^H:sf=^J:up=\E7:
@@ -9661,30 +10154,27 @@ aj830|aj832|aj|anderson jacobson:\
 aj510|Anderson-Jacobson model 510:\
 	:am:mi:\
 	:co#80:li#24:\
-	:al=2*\E&I:cd=\E'P:ce=\E'L:cl=^L:cm=\E#%+ %+ :\
-	:dc=.1*\E'D:dl=2*\E&D:ei=\E'J:ic=:im=\E'I:ip=.1*:\
-	:kd=\EZ:kl=\EW:kr=\EX:ku=\EY:le=^H:nd=\EX:pc=\177:\
-	:se=\E"I:so=\E"I:te=\E"N:ti=\E"N:ue=\E"U:up=\EY:\
-	:us=\E"U:
+	:al=2*\E&I:cd=\E'P:ce=\E'L:cl=^L:cm=\E#%+ %+ :dc=.1*\E'D:\
+	:dl=2*\E&D:ei=\E'J:ic=:im=\E'I:ip=.1*:kd=\EZ:kl=\EW:kr=\EX:\
+	:ku=\EY:le=^H:nd=\EX:pc=\177:se=\E"I:so=\E"I:te=\E"N:\
+	:ti=\E"N:ue=\E"U:up=\EY:us=\E"U:
 # From: <cbosg!ucbvax!pur-ee!cincy!chris> Thu Aug 20 09:09:18 1981
 # This is incomplete, but it's a start.
 nec5520|nec|spinwriter|nec 5520:\
 	:hc:os:\
 	:co#132:it#8:\
 	:bl=^G:cr=^M:ct=\E3:do=^J:ff=^L:hd=\E]s\n\E]W:\
-	:hu=\E]s\E9\E]W:kb=^H:le=^H:sf=^J:st=\E1:ta=^I:\
-	:up=\E9:
+	:hu=\E]s\E9\E]W:kb=^H:le=^H:sf=^J:st=\E1:ta=^I:up=\E9:
 qume5|qume|Qume Sprint 5:\
 	:hc:os:\
 	:co#80:it#8:\
-	:bl=^G:cr=^M:ct=\E3:do=^J:ff=^L:hd=\Eh:hu=\EH:kb=^H:\
-	:le=^H:sf=^J:st=\E1:ta=^I:up=^Z:
+	:bl=^G:cr=^M:ct=\E3:do=^J:ff=^L:hd=\Eh:hu=\EH:kb=^H:le=^H:\
+	:sf=^J:st=\E1:ta=^I:up=^Z:
 # I suspect the xerox 1720 is the same as the diablo 1620.
 xerox1720|x1720|x1750|xerox 1720:\
 	:hc:os:\
 	:co#132:it#8:\
-	:bl=^G:cr=^M:ct=\E2:do=^J:ff=^L:le=^H:sf=^J:st=\E1:\
-	:ta=^I:
+	:bl=^G:cr=^M:ct=\E2:do=^J:ff=^L:le=^H:sf=^J:st=\E1:ta=^I:
 
 #### Miscellaneous obsolete terminals, manufacturers unknown
 #
@@ -9698,22 +10188,19 @@ cad68-3|cgc3|cad68 basic monitor transparent mode size 3 chars:\
 cad68-2|cgc2|cad68 basic monitor transparent mode size 2 chars:\
 	:am:\
 	:co#85:li#39:\
-	:cl=^Z:ho=^^:k1=\E5:k2=\E6:k3=\E7:k4=\E8:kd=\E2:\
-	:kl=\E3:kr=\E4:ku=\E1:le=^H:nd=^L:se=\Em^C:so=\Em^L:\
-	:up=^K:
+	:cl=^Z:ho=^^:k1=\E5:k2=\E6:k3=\E7:k4=\E8:kd=\E2:kl=\E3:\
+	:kr=\E4:ku=\E1:le=^H:nd=^L:se=\Em^C:so=\Em^L:up=^K:
 cops10|cops|cops-10|cops 10:\
 	:am:bw:\
 	:co#80:li#24:\
-	:bl=^G:cd=^W:ce=^V:cl=30\030:cm=\020%+ %+ :cr=^M:\
-	:do=^J:kb=^H:kd=^J:kh=^Y:kl=^H:kr=^L:ku=^K:le=^H:\
-	:nd=^L:sf=^J:up=^K:
+	:bl=^G:cd=^W:ce=^V:cl=30\030:cm=\020%+ %+ :cr=^M:do=^J:\
+	:kb=^H:kd=^J:kh=^Y:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:up=^K:
 # (d132: removed duplicate ":ic=\E5:" -- esr)
 d132|datagraphix|datagraphix 132a:\
 	:da:db:in:\
 	:co#80:li#30:\
-	:al=\E3:bl=^G:cl=^L:cr=^M:dc=\E6:do=^J:ei=:ho=\Et:\
-	:ic=\E5:im=:nd=\El:sf=\Ev:sr=\Ew:up=\Ek:ve=\Em\En:\
-	:vs=\Ex:
+	:al=\E3:bl=^G:cl=^L:cr=^M:dc=\E6:do=^J:ei=:ho=\Et:ic=\E5:im=:\
+	:nd=\El:sf=\Ev:sr=\Ew:up=\Ek:ve=\Em\En:vs=\Ex:
 # The d800 was an early portable terminal from c.1984-85 that looked a lot
 # like the original Compaq `lunchbox' portable (but no handle).  It had a vt220
 # mode (which is what this entry looks like) and several other lesser-known
@@ -9721,16 +10208,27 @@ d132|datagraphix|datagraphix 132a:\
 d800|Direct 800/A:\
 	:am:da:db:ms:xs:\
 	:co#80:it#8:li#24:\
-	:ae=\E[m:as=\E[1m:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[1;1H\E[2J:cm=\E[%i%d;%dH:cr=^M:do=^J:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:\
-	:k8=\EOW:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[>12h:vs=\E[>12l:
+	:ac=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~:\
+	:ae=\E[m:as=\E[1m:bl=^G:cd=\E[J:ce=\E[K:cl=\E[1;1H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:do=^J:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=\ED:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[>12h:\
+	:vs=\E[>12l:
 digilog|digilog 333:\
 	:co#80:li#16:\
-	:bl=^G:ce=^X:cr=^M:do=^J:ho=^N:le=^H:nd=^I:sf=^J:\
-	:up=^O:
+	:bl=^G:ce=^X:cr=^M:do=^J:ho=^N:le=^H:nd=^I:sf=^J:up=^O:
+# The DWK was a terminal manufactured in the Soviet Union c.1986
+dwk|dwk-vt|dwk terminal:\
+	:am:\
+	:co#80:it#8:li#24:\
+	:ac=lJmFkCjXtEuPv\\wKqUxWnNo~s_`+a\072f'g#~_\\\054Q+^.M-Sh#I#0\177:\
+	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
+	:cr=^M:dc=\EP:do=^J:ei=:ho=\EH:ic=\EQ:im=:k1=\Ef1:k2=\Ef2:\
+	:k3=\Ef3:k4=\Ef4:k5=\Ef5:k6=\Ef6:k7=\Ef7:k8=\Ef8:k9=\Ef9:\
+	:k;=\Ef0:kD=\Ee:kI=\Ed:kN=\Eh:kP=\Eg:kb=\177:kd=\EB:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:me=\EX:mr=\ET:nd=\EC:nw=^M^J:se=\EX:\
+	:sf=^J:so=\ET:sr=\ES:ta=^I:up=\EA:
 env230|envision230|envision 230 graphics terminal:\
 	:xn@:\
 	:pf=\E[4i:po=\E[5i:ps=\E[0i:\
@@ -9759,9 +10257,9 @@ ep40|ep4000|execuport 4000:\
 ifmr|Informer D304:\
 	:am:\
 	:co#80:li#24:\
-	:cd=\E/:ce=\EQ:cl=\EZ:cm=\EY%r%+ %+ :dc=\E\\:do=^J:\
-	:ei=:ho=\EH:ic=\E[:im=:le=^H:nd=\EC:se=\EK:so=\EJ:\
-	:sr=\En:up=\EA:
+	:cd=\E/:ce=\EQ:cl=\EZ:cm=\EY%r%+ %+ :dc=\E\\:do=^J:ei=:\
+	:ho=\EH:ic=\E[:im=:le=^H:me=\EK:nd=\EC:se=\EK:so=\EJ:sr=\En:\
+	:up=\EA:
 # Entry largely based on wy60 and has the features of wy60ak.
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)
@@ -9769,30 +10267,22 @@ ifmr|Informer D304:\
 opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys:\
 	:am:bw:hs:km:mi:ms:ul:xo:\
 	:co#80:li#24:ws#80:\
-	:ae=\EH^C:al=\EE:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:cl=\E*:cm=\Ea%i%dR%dC:cr=^M:ct=\E0:dc=\EW:dl=\ER:\
-	:do=^J:ds=\Ez(\r:ei=\Er:fs=^M:ho=\036:\
-	:if=/usr/share/tabset/std:im=\Eq:ip=:\
+	:ae=\EH^C:al=\EE:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E*:\
+	:cm=\Ea%i%dR%dC:cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\Ez(\r:\
+	:ei=\Er:fs=^M:ho=\036:if=/usr/share/tabset/std:im=\Eq:ip=:\
 	:is=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Ed/\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177\Ezz`\E[F\177\EA1*\EZH12:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
-	:kN=\EK:kP=\EJ:kb=^H:kd=\E[B:kh=^^:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:mb=\EG2:me=\E(\EH\003\EG0\EcD:mh=\EGp:\
-	:mr=\EG4:nd=^L:nw=\r\n:se=\EG0:sf=^J:so=\EG4:sr=\Ej:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=\E[B:kh=^^:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=^J:sr=\Ej:\
 	:st=\E1:ta=\011:\
 	:ti=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177:\
-	:ts=\Ez(:uc=\EG8%p1%c\EG0:ue=\EG0:up=^K:us=\EG8:\
-	:ve=\E`1:vi=\E`0:
-# (ps300: changed ":pt@:" to "it@" -- esr)
-ps300|Picture System 300:\
-	:xt:\
-	:it@:\
-	:se@:so@:ue@:us@:tc=vt100:
+	:ts=\Ez(:uc=\EG8%p1%c\EG0:up=^K:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
 teletec|Teletec Datascreen:\
 	:am:\
 	:co#80:li#24:\
-	:bl=^G:cl=^L:cr=^M:do=^J:ho=^^:le=^H:nd=^_:sf=^J:\
-	:up=^K:
+	:bl=^G:cl=^L:cr=^M:do=^J:ho=^^:le=^H:nd=^_:sf=^J:up=^K:
 # Terak made a PDP-11 based machine with a bitmapped display that ran UCSD
 # Pascal as the native OS. It was quite a nice box, and there were several
 # at UC Berkeley.
@@ -9809,14 +10299,13 @@ terak|Terak emulating Datamedia 1520:\
 v3220|LANPAR Vision II model 3220/3221/3222:\
 	:am:mi:xn:\
 	:co#80:it#8:li#24:\
-	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=\E[4l:\
-	:im=\E[4h:is=\E>\E[?3l\E[?7h\E[?8h\E[p:k0=\E[1~:\
-	:k1=\E[2~:k2=\E[3~:k3=\E[4~:k4=\E[5~:k5=\E[6~:\
-	:k6=\E[OP:k7=\E[OQ:k8=\E[OR:k9=\E[OS:kd=\E[B:ke=\E>:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:\
-	:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:\
+	:is=\E>\E[?3l\E[?7h\E[?8h\E[p:k0=\E[1~:k1=\E[2~:\
+	:k2=\E[3~:k3=\E[4~:k4=\E[5~:k5=\E[6~:k6=\E[OP:k7=\E[OQ:\
+	:k8=\E[OR:k9=\E[OS:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E=:ku=\E[A:le=^H:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:\
+	:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 ######## ICH/ICH1 VERSUS RMIR/SMIR
 #
 # Some non-curses applications get confused if both ich/ich1 and rmir/smir
@@ -9858,7 +10347,7 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # ANSI Standard (X3.64) Control Sequences for Video Terminals and Peripherals
 # and ECMA-48 Control Functions for Coded Character Sets.
 # 
-# Most of the content of this comment is adapted from a table prepared by
+# Much of the content of this comment is adapted from a table prepared by
 # Richard Shuford, based on a 1984 Byte article.  Terminfo correspondences,
 # discussion of some terminfo-related issues, and updates to capture ECMA-48
 # have been added.  Control functions described in ECMA-48 only are tagged
@@ -9871,11 +10360,6 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # semicolons.  Parameter meanings for most parametrized sequences are
 # decribed in the notes.
 #
-# (NOTE: THE ECMA-48 COVERAGE IN THE TABLE IS NOT YET ACTUALLY COMPLETE,
-# IT IS ONLY COMPLETE UP TO THE BROKEN LINE OF DASHES.  Have patience,
-# reading the legalese and adding entries is a long-drawn-out and tedious
-# process...)
-#                                                    Default    Type
 # Sequence     Sequence                             Parameter   or
 # Mnemonic     Name              Sequence           Value      Mode   terminfo
 # -----------------------------------------------------------------------------
@@ -9917,7 +10401,7 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # EM   Eend of Medium *          ^Y                  -         -      -
 # EMI  Enable Manual Input       \E b                          Fs     -
 # ENQ  Enquire                   ^E                  -         -      -
-# EOT  End Of Transmission       ^D                  -         -      -
+# EOT  End Of Transmission       ^D                  -         *      -
 # EPA  End of Protected Area     \E W                -         -      -   (K)
 # ESA  End of Selected Area      \E G                -         -      -
 # ESC  Escape                    ^[                  -         -      -
@@ -9955,45 +10439,83 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # LS3R Locking Shift Right 3 *   \E |                -         -      -
 # MC   Media Copy                \E [ Ps i           0         -      -   (S)
 # MW   Message Waiting           \E U                -         -      -
-# NAK  Negative Acknowledge *    ^U                  -         -      -
+# NAK  Negative Acknowledge *    ^U                  -         *      -
 # NBH  No Break Here *           \E C                -         -      -
 # NEL  Next Line                 \E E                -         FE     nel (D)
 # NP   Next Page                 \E [ Pn U           1         eF     -
 # NUL  Null *                    ^@                  -         -      -
 # OSC  Operating System Command  \E ]                -         Delim  -
-# PEC  Pres. Expand/Contract *   \E Pn SPC Z         -         -      -
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# PLD  Partial Line Down         \E K                -         FE     -
-# PLU  Partial Line Up           \E L                -         FE     -
+# PEC  Pres. Expand/Contract *   \E Pn SPC Z         0         -      -
+# PFS  Page Format Selection *   \E Pn SPC J         0         -      -
+# PLD  Partial Line Down         \E K                -         FE     -   (T)
+# PLU  Partial Line Up           \E L                -         FE     -   (U)
 # PM   Privacy Message           \E ^                -         Delim  -
 # PP   Preceding Page            \E [ Pn V           1         eF     -
+# PPA  Page Position Absolute *  \E [ Pn SPC P       1         FE     -
+# PPB  Page Position Backward *  \E [ Pn SPC R       1         FE     -
+# PPR  Page Position Forward *   \E [ Pn SPC Q       1         FE     -
+# PTX  Parallel Texts *          \E [ \              -         -      -
 # PU1  Private Use 1             \E Q                -         -      -
 # PU2  Private Use 2             \E R                -         -      -
 # QUAD Typographic Quadding      \E [ Ps SPC H       0         FE     -
 # REP  Repeat Char or Control    \E [ Pn b           1         -      rep
-# RI   Reverse Index             \E M                -         FE     -
+# RI   Reverse Index             \E M                -         FE     -   (V)
 # RIS  Reset to Initial State    \E c                -         Fs     -
-# RM   Reset Mode                \E [ Ps l           none      -      -
+# RM   Reset Mode *              \E [ Ps l           -         -      -   (W)
+# SACS Set Add. Char. Sep. *     \E [ Pn SPC /       0         -      -
+# SAPV Sel. Alt. Present. Var. * \E [ Ps SPC ]       0         -      -   (X)
+# SCI  Single-Char Introducer    \E Z                -         -      -
+# SCO  Sel. Char. Orientation *  \E [ Pn ; Pn SPC k  -         -      -
+# SCS  Set Char. Spacing *       \E [ Pn SPC g       -         -      -
 # SD   Scroll Down               \E [ Pn T           1         eF     rin
-# SEM  Select Edit Extent Mode   \E [ Ps Q           0         -      -
+# SDS  Start Directed String *   \E [ Pn ]           1         -      -
+# SEE  Select Editing Extent     \E [ Ps Q           0         -      -   (Y)
+# SEF  Sheet Eject & Feed *      \E [ Ps ; Ps SPC Y  0,0       -      -
 # SGR  Select Graphic Rendition  \E [ Ps m           0         FE     sgr (O)
+# SHS  Select Char. Spacing *    \E [ Ps SPC K       0         -      -
 # SI   Shift In                  ^O                  -         -      -   (P)
+# SIMD Sel. Imp. Move Direct. *  \E [ Ps ^           -         -      -
 # SL   Scroll Left               \E [ Pn SPC @       1         eF     -
-# SM   Select Mode               \E [ Ps h           none      -      -
+# SLH  Set Line Home *           \E [ Pn SPC U       -         -      -
+# SLL  Set Line Limit *          \E [ Pn SPC V       -         -      -
+# SLS  Set Line Spacing *        \E [ Pn SPC h       -         -      -
+# SM   Select Mode               \E [ Ps h           none      -      -   (W)
 # SO   Shift Out                 ^N                  -         -      -   (Q)
-# SPA  Start of Protected Area   \E V                -         -      -
+# SOH  Start Of Heading *        ^A                  -         -      -
+# SOS  Start of String *         \E X                -         -      -
+# SPA  Start of Protected Area   \E V                -         -      -   (Z)
+# SPD  Select Pres. Direction *  \E [ Ps ; Ps SPC S  0,0       -      -
+# SPH  Set Page Home *           \E [ Ps SPC G       -         -      -
 # SPI  Spacing Increment         \E [ Pn ; Pn SPC G  none      FE     -
+# SPL  Set Page Limit *          \E [ Ps SPC j       -         -      -
+# SPQR Set Pr. Qual. & Rapid. *  \E [ Ps SPC X       0         -      -
 # SR   Scroll Right              \E [ Pn SPC A       1         eF     -
+# SRCS Set Reduced Char. Sep. *  \E [ Pn SPC f       0         -      -
+# SRS  Start Reversed String *   \E [ Ps [           0         -      -
+# SSA  Start of Selected Area    \E F                -         -      -
+# SSU  Select Size Unit *        \E [ Pn SPC I       0         -      -
+# SSW  Set Space Width *         \E [ Pn SPC [       none      -      -
 # SS2  Single Shift 2 (G2 set)   \E N                -         Intro  -
 # SS3  Single Shift 3 (G3 set)   \E O                -         Intro  -
-# SSA  Start of Selected Area    \E F                -         -      -
 # ST   String Terminator         \E \                -         Delim  -
+# STAB Selective Tabulation *    \E [ Pn SPC ^       -         -      -
 # STS  Set Transmit State        \E S                -         -      -
+# STX  Start pf Text *           ^B                  -         -      -
 # SU   Scroll Up                 \E [ Pn S           1         eF     indn
+# SUB  Substitute *              ^Z                  -         -      -
+# SVS  Select Line Spacing *     \E [ Pn SPC \       1         -      -
+# SYN  Synchronous Idle *        ^F                  -         -      -
+# TAC  Tabul. Aligned Centered * \E [ Pn SPC b       -         -      -
+# TALE Tabul. Al. Leading Edge * \E [ Pn SPC a       -         -      -
+# TATE Tabul. Al. Trailing Edge* \E [ Pn SPC `       -         -      -
 # TBC  Tab Clear                 \E [ Ps g           0         FE     tbc
+# TCC  Tabul. Centered on Char * \E [ Pn SPC c       -         -      -
+# TSR  Tabulation Stop Remove  * \E [ Pn SPC d       -         FE     -
 # TSS  Thin Space Specification  \E [ Pn SC E        none      FE     -
-# VPA  Vert Position Absolute    \E [ Pn d           1         FE     vpa
-# VPR  Vert Position Relative    \E [ Pn e           1         FE     -   (R)
+# VPA  Vert. Position Absolute   \E [ Pn d           1         FE     vpa
+# VPB  Line Position Backward *  \E [ Pn k           1         FE     -
+# VPR  Vert. Position Relative   \E [ Pn e           1         FE     -   (R)
+# VT   Vertical Tabulation *     ^K                  -         FE     -
 # VTS  Vertical Tabulation Set   \E J                -         FE     -
 # 
 # ---------------------------------------------------------------------------
@@ -10005,22 +10527,22 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # referred to other standards such as ISO 1745 or ECMA-35).  They are listed
 # here anyway for completeness.
 #
-# (A) ECMA-48 calls this "CancelCharacter" but retains the CCH acronyms.
+# (A) ECMA-48 calls this "CancelCharacter" but retains the CCH abbreviation.
 #
 # (B) There seems to be some confusion abroad between CHA and HPA.  Most
 # `ANSI' terminals accept the CHA sequence, not the HPA. but terminfo calls
 # the capability (hpa).  ECMA-48 calls this "Cursor Character Absolute" but
-# preserved the CHA acronym.
+# preserved the CHA abbreviation.
 #
 # (C) CHT corresponds to terminfo (tab).  Usually it has the value ^I.
 # Occasionally (as on, for example, certain HP terminals) this has the HTJ
 # value.  ECMA-48 calls this "Cursor Forward Tabulation" but preserved the
-# CHT acronym.
+# CHT abbreviation.
 #
 # (D) terminfo (nel) is usually \r\n rather than ANSI \EE.
 #
 # (E) ECNA-48 calls this "Active Position Report" but preserves the CPR 
-# acronym.
+# abbreviation.
 # 
 # (F) CTC parameter values: 0 = set char tab, 1 = set line tab, 2 = clear
 # char tab, 3 = clear line tab, 4 = clear all char tabs on current line, 
@@ -10028,9 +10550,10 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 #
 # (G) CUP and HVP are identical in effect.  Some ANSI.SYS versions accept
 # HVP, but always allow CUP as an alternate.  ECMA-48 calls HVP "Character
-# Position Absolute" but retains the HVP acronym.
+# Position Absolute" but retains the HVP abbreviation.
 #
-# (H) ECMA calls this "Cursor Line Tabulation" but preserves the CVT acronym.
+# (H) ECMA calls this "Cursor Line Tabulation" but preserves the CVT
+# abbreviation.
 #
 # (I) DSR parameter values: 0 = ready, 1 = busy, 2 = busy, will send DSR
 # later, 3 = malfunction, 4 = malfunction, will send DSR later, 5 = request
@@ -10039,15 +10562,16 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # (J) ECMA calls ED "Erase In Page". EA/ED/EL parameters: 0 = clear to end,
 # 1 = clear from beginning, 2 = clear.
 # 
-# (K) ECMA calls this "End of Guarded Area" but preserves the EPA acronym.
+# (K) ECMA calls this "End of Guarded Area" but preserves the EPA abbreviation.
 #
 # (L) The GSM parameters are vertical and horizontal parameters to scale by.
 #
 # (M) Some ANSI.SYS versions accept HPR, but more commonly `ANSI' terminals
 # use CUF for this function and ignore HPR.  ECMA-48 calls this "Character
-# Position Relative" but retains the HPR acronym.
+# Position Relative" but retains the HPR abbreviation.
 #
-# (N) ECMA-48 calls this "Character Tabulation" but retains the HT acronym.
+# (N) ECMA-48 calls this "Character Tabulation" but retains the HT
+# abbreviation.
 #
 # (O) SGR parameter values: 0 = default mode (attributes off), 1 = bold,
 # 2 = dim, 3 = italicized, 4 = underlined, 5 = slow blink, 6 = fast blink,
@@ -10069,7 +10593,8 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # (Q) SI is also called LS1, Locking Shift One.
 #
 # (R) Some ANSI.SYS versions accept VPR, but more commonly `ANSI' terminals
-# use CUD for this function and ignore VPR.
+# use CUD for this function and ignore VPR.  ECMA calls it `Line Position
+# Absolute but retains the VPA abbreviation.
 #
 # (S) MC parameters: 0 = start xfer to primary aux device, 1 = start xfer from
 # primary aux device, 2 = start xfer to secondary aux device, 3 = start xfer
@@ -10077,6 +10602,36 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # start relay to primary aux device, 6 = stop relay to secondary aux device,
 # 7 = start relay to secondary aux device.
 #
+# (T) ECMA-48 calls this "Partial Line Forward" but retains the PLD
+# abbreviation.
+#
+# (U) ECMA-48 calls this "Partial Line Backward" but retains the PLD
+# abbreviation.
+#
+# (V) ECMA-48 calls this "Reverse Line Feed" but retains the RI abbreviation.
+#
+# (W) RM/SM modes are as follows: 1 = Guarder Area Transfer Mode (GATM), 
+# 2 = Keyboard Action Mode (KAM), 3 = Control Representation Mode (CRM), 
+# 4 = Insertion Replacement Mode, 5 = Status Report Transfer Mode (SRTM),
+# 6 = Erasure Mode (ERM), 7 = Line Editing Mode (LEM), 8 = Bi-Directional
+# Support Mode (BDSM), 9 = Device Component Select Mode (DCSM), 
+# 10 = Character Editing Mode (HEM), 11 = Positioning Unit Mode (PUM),
+# 12 = Send/Receive Mode, 13 = Format Effector Action Mode (FEAM), 
+# 14 = Format Effector Transfer Mode (FETM), 15 = Multiple Area Transfer
+# Mode (MATM), 16 = Transfer Termination Mode, 17 = Selected Area Transfer
+# Mode, 18 = Tabulation Stop Mode, 19 = Editing Boundary Mode, 20 = Line Feed
+# New Line Mode (LF/NL), Graphic Rendition Combination Mode (GRCM), 22 =
+# Zero Default Mode (ZDM).  The EBM and LF/NL modes have actually been removed
+# from ECMA-48's 5th edition but are listed here for reference.
+#
+# (X) Select Alternate Presentation Variants is used only for non-Latin
+# alphabets.
+#
+# (Y) "Select Editing Extent" (SEE) was ANSI "Select Edit Extent Mode" (SEM).
+#
+# (Z) ECMA-48 calls this "Start of Guarded Area" but retains the SPA
+# abbreviation.
+#
 # ---------------------------------------------------------------------------
 # 
 # Abbreviations:
@@ -10104,7 +10659,7 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # 
 # C0     the familiar set of 7-bit ASCII control characters
 # 
-# C1     roughly, the set of control characters available only in 8-bit systems.
+# C1     roughly, the set of control chars available only in 8-bit systems.
 #        This is too complicated to explain fully here, so read Jim Fleming's
 #        article in the February 1983 BYTE, especially pages 214 through 224.
 # 
@@ -10425,6 +10980,15 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 # The box2 characters are the double-line versions of these forms graphics.
 # The AIX binary terminfo format is incompatible with SVr4's.
 #
+# Iris console extensions:
+#
+# HS is half-intensity start; HE is half-intensity end
+# CT is color terminal type (for Curses & rogue)
+# CP is color change escape sequence
+# CZ are color names (for Curses & rogue)
+#
+# The ncurses tic utility recognizes HS as an alias for mh <dim>.
+#
 # TC Extensions:
 #
 # There is a set of extended termcaps associated with something
@@ -10468,7 +11032,7 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 #	* Better XENIX keycap translation.  Describe TC termcaps.
 #	* Contact and history info supplied by Qume.
 # 9.3.2 (Sat Feb 11 23:40:02 EST 1995):
-#	* Raided the Shufort FTP site for recent termcaps/terminfos.
+#	* Raided the Shuford FTP site for recent termcaps/terminfos.
 #	* Added information on X3.64 and VT100 standard escape sequences.
 # 9.3.3 (Mon Feb 13 12:26:15 EST 1995):
 #	* Added a correct X11R6 xterm entry.
@@ -10753,19 +11317,98 @@ v3220|LANPAR Vision II model 3220/3221/3222:\
 #	* Sent t500 to the UFI file.
 #	* I think we've sucked all the juice out of BSDI's termcap file now.
 #	* Freeze for ncurses 1.9.8 release
-#
 # 9.12.1 (Thu Nov 30 03:14:06 EST 1995)
 #	* Unfreeze, linux kbs needed to be fixed.
 #	* Tim Theisen pinned down a bug in the DMD firmware.
-#
 # 9.12.2 (Thu Nov 30 19:08:55 EST 1995):
 #	* Fixes to ansi and klone capabilities (thank you, Aaron Ucko).
 #	  (The broken ones had been shadowed by sgr.)
-#
 # 9.12.3 (Thu Dec  7 17:47:22 EST 1995):
 #	* Added documentation on ECMA-48 standard.
 #	* New Amiga entry.
-#
+# 9.12.4 (Thu Dec 14 04:16:39 EST 1995):
+#	* More ECMA-48 stuff
+#	* Corrected typo in minix entry, added pc-minix.
+#	* Corrected khome/kend in xterm (thank you again, Aaron Ucko).
+#	* Added rxvt entry.
+#	* Added 1.3.x color-change capabilities to linux entry.
+# 9.12.5 (Tue Dec 19 00:22:10 EST 1995):
+#	* Corrected rxvt entry khome/kend.
+#	* Corrected linux color change capabilities.
+#	* NeXT entries from Dave Wetzel.
+#	* Cleaned up if and rf file names (all in /usr/share now).
+#	* Changed linux op capability to avoid screwing up a background color
+#	  pair set by setterm.
+# 9.12.6 (Wed Feb  7 16:14:35 EST 1996):
+#	* Added xterm-sun.
+# 9.12.7 (Fri Feb  9 13:27:35 EST 1996):
+#	* Added visa50.
+#
+# 9.13.0 (Sun Mar 10 00:13:08 EST 1996):
+#	* Another sweep through the Shuford archive looking for new info.
+#	* Added dg100 alias to dg6053 based on a comp.terminals posting.
+# 	* Added st52 from Per Persson.
+#	* Added eterm from the GNU Emacs 19.30 distribution.
+#	* Freeze for 1.9.9.
+# 9.13.1 (Fri Mar 29 14:06:46 EST 1996):
+#	* FreeBSD console entries from Andrew Chernov.
+#	* Removed duplicate Atari st52 name.
+# 9.13.2 (Tue May  7 16:10:06 EDT 1996)
+#	* xterm doesn't actually have ACS_BLOCK.
+#	* Change klone+color setf/setb to simpler forms that can be
+#	  translated into termcap.
+#	* Added xterm1.
+#	* Removed mechanically-generated junk capabilities from cons* entries.
+#	* Added color support to bsdos.
+# 9.13.3 (Thu May  9 10:35:51 EDT 1996):
+#	* Added Wyse 520 entries from Wm. Randolph Franklin <wrf@ecse.rpi.edu>.
+#	* Created ecma+color, linux can use it.  Also added ech to linux.
+#	* Teach xterm about more keys. Add Thomas Dickey's 3.1.2E updates.
+#	* Add descriptions to FreeBSD console entries.  Also shorten
+#	  some aliases to <= 14 chars for portability.
+#	* Added x68k console
+#	* Added OTbs to several VT-series entries.
+# 9.13.4 (Wed May 22 10:54:09 EDT 1996):
+#	* screen entry update for 3.7.1 from Michael Alan Dorfman.
+# 9.13.5 (Wed Jun  5 11:22:41 EDT 1996):
+#	* kterm correction due to Kenji Rikitake.
+#	* ACS correction in vt320-kll due to Phillippe De Muyter.
+# 9.13.6 (Sun Jun 16 15:01:07 EDT 1996):
+#	* Sun console entry correction from J.T. Conklin.
+#	* Changed all DEC VT300 and up terminals to use VT300 tab set
+# 9.13.7 (Mon Jul  8 20:14:32 EDT 1996):
+#	* Added smul to linux entry (we never noticed it was missing 
+#	  because of sgr!).
+#	* Added rmln to hp+labels (deduced from other HP entries).
+#	* Added vt100 acsc capability to vt220, vt340, vt400, d800, dt80-sas,
+#	  pro350, att7300, 5420_2, att4418, att4424, att4426, att505, vt320-k3.
+#	* Corrected vt220 acsc.
+#	* The klone+sgr and klone+sgr-dumb entries now use klone+acs;
+#	  this corresponds to reality and helps prevent some tic warnings.
+#	* Added sgr0 to c101, pcix, vt100-nav, screen2, oldsun, next, altos2,
+#	  hpgeneric, hpansi, hpsub, hp236, hp700-wy, bobcat, dku7003, adm11,
+#	  adm12, adm20, adm21, adm22, adm31, adm36, adm42, pt100, pt200,
+#	  qvt101, tvi910, tvi921, tvi92B, tvi925, tvi950, tvi970, wy30-mc,
+#	  wy50-mc, wy100, wyse-vp, ampex232, regent100, viewpoint, vp90,
+#	  adds980, cit101, cit500, contel300, cs10, dm80, falco, falco-p, 
+#	  f1720a, go140, sb1, superbeeic, microb, ibm8512, kt7, ergo4000,
+#	  owl, uts30, dmterm, dt100, dt100, dt110, appleII, apple-videx,
+#	  lisa, trsII, atari, st52, pc-coherent, basis, m2-man, bg2.0, bg1.25,
+#	  dw3, ln03, ims-ansi, graphos, t16, zen30, xtalk, simterm, d800,
+#	  ifmr, v3220, wy100q, tandem653, ibmaed.
+#	* Added DWK terminal description.
+# 9.13.8 (Wed Jul 10 11:45:21 EDT 1996)
+#	* Many entries now have highlights inherited from adm+sgr.
+#	* xterm entry now corresponds to XFree86 3.1.2E, with color.
+#	* xtitle and xtitle-twm enable access to the X status line.
+#	* Added linux-1.3.6 color palette caps in conventional format.
+#	* Added adm1178 terminal.
+#	* Move fos and apollo terminals to obsolete category.
+#	* Aha! The BRL terminals file told us what the Iris extensions mean.
+#	* Added, from the BRL termcap file: rt6221, rt6221-w, northstar,
+#	  commodore, cdc721-esc, excel62, osexec.  Replaced from the BRL file:
+#	  cit500, adm11, 
+
 ######## REORDER
 #
 # Older termcap distributions featured a kluge called `reorder' intended to