Vendor import ncurses 6.6vendor/ncurses/6.6vendor/ncurses

8 files changed, 2711 insertions, 2138 deletions

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 1539973fef07..bfcee26a6dd3 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.79 2021/11/06 23:36:12 tom Exp $
+# $Id: Makefile.in,v 1.88 2025/12/25 22:26:15 tom Exp $
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -47,10 +47,9 @@ SHELL		= @SHELL@
 VPATH		= @srcdir@
 THIS		= Makefile
 
-CF_MFLAGS 	= @cf_cv_makeflags@
 @SET_MAKE@
+@SET_DESTDIR@
 
-DESTDIR		= @DESTDIR@
 top_srcdir	= @top_srcdir@
 srcdir		= @srcdir@
 prefix		= @prefix@
@@ -61,7 +60,7 @@ datarootdir	= @datarootdir@
 datadir		= @datadir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
 
 tabsetdir	= $(datadir)/tabset
 ticdir		= @TERMINFO@
@@ -75,6 +74,17 @@ INSTALL_DATA	= @INSTALL_DATA@
 
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
+
+@MAKE_DATABASE@INSTALL_PREFIX	= $(DESTDIR)$(prefix@MERGE_PREFIX@)
+@MAKE_DATABASE@LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+@MAKE_DATABASE@TICDIR		= $(DESTDIR)$(ticdir@MERGE_PREFIX@)
+@MAKE_DATABASE@TICFILE		= $(DESTDIR)$(ticfile@MERGE_PREFIX@)
+@MAKE_DATABASE@TABSETDIR	= $(DESTDIR)$(tabsetdir@MERGE_PREFIX@)
+
+@MAKE_PC_FILES@INSTALL_CONFIG	= $(DESTDIR)$(PKG_CONFIG_LIBDIR@MERGE_PREFIX@)
+
 ################################################################################
 
 @MAKE_PHONY@.PHONY :	all
@@ -97,31 +107,28 @@ all \
 depend \
 sources ::
 
+check ::
+	@echo "no unit-test implemented"
+
 @MAKE_DATABASE@all \
 @MAKE_DATABASE@sources :: terminfo.tmp
 
 @MAKE_DATABASE@install :: @MISC_INSTALL_DATA@
 
 @MAKE_DATABASE@install.data ::	terminfo.tmp \
-@MAKE_DATABASE@		$(DESTDIR)$(libdir) \
-@MAKE_DATABASE@		$(DESTDIR)$(datadir) \
-@MAKE_DATABASE@		$(DESTDIR)$(tabsetdir)
-@MAKE_DATABASE@	DESTDIR=${DESTDIR} \
-@MAKE_DATABASE@	prefix=${prefix} \
-@MAKE_DATABASE@	exec_prefix=${exec_prefix} \
-@MAKE_DATABASE@	bindir=${bindir} \
-@MAKE_DATABASE@	top_srcdir=${top_srcdir} \
-@MAKE_DATABASE@	srcdir=${srcdir} \
-@MAKE_DATABASE@	datadir=${datadir} \
-@MAKE_DATABASE@	ticdir=${ticdir} \
-@MAKE_DATABASE@	source=terminfo.tmp \
-@MAKE_DATABASE@	cross_compiling=@cross_compiling@ \
+@MAKE_DATABASE@		$(LIBDIR) \
+@MAKE_DATABASE@		$(DATADIR) \
+@MAKE_DATABASE@		$(TABSETDIR)
+@MAKE_DATABASE@	INSTALL_PREFIX=${INSTALL_PREFIX} \
+@MAKE_DATABASE@	TICDIR=${TICDIR} \
+@MAKE_DATABASE@	BINDIR=${BINDIR} \
+@MAKE_DATABASE@	tic_source=terminfo.tmp \
 @MAKE_DATABASE@	$(SHELL) ./run_tic.sh
 @MAKE_DATABASE@	@( cd $(srcdir)/tabset && \
 @MAKE_DATABASE@		$(SHELL) -c 'for i in * ; do \
 @MAKE_DATABASE@			if test -f $$i ; then \
 @MAKE_DATABASE@			echo installing $$i; \
-@MAKE_DATABASE@			$(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \
+@MAKE_DATABASE@			$(INSTALL_DATA) $$i $(TABSETDIR)/$$i; \
 @MAKE_DATABASE@			fi; done' )
 install.data ::
 	@echo "finished $@"
@@ -129,8 +136,8 @@ install.data ::
 NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_suffix@-config
 
 install \
-install.libs :: $(DESTDIR)$(bindir) ncurses-config
-	$(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
+install.libs :: $(BINDIR) ncurses-config
+	$(INSTALL_SCRIPT) ncurses-config $(BINDIR)/$(NCURSES_CONFIG)
 
 # Make a list of the files that gen-pkgconfig might create:
 @MAKE_PC_FILES@PC_FILES = \
@@ -148,12 +155,12 @@ install.libs :: $(DESTDIR)$(bindir) ncurses-config
 @MAKE_PC_FILES@install \
 @MAKE_PC_FILES@install.libs :: pc-files
 @MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
-@MAKE_PC_FILES@		x/*) \
-@MAKE_PC_FILES@			mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
+@MAKE_PC_FILES@		x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
+@MAKE_PC_FILES@			mkdir -p $(INSTALL_CONFIG); \
 @MAKE_PC_FILES@			for name in $(PC_FILES); do \
 @MAKE_PC_FILES@				test -f $$name || continue; \
 @MAKE_PC_FILES@				echo installing $$name; \
-@MAKE_PC_FILES@				$(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
+@MAKE_PC_FILES@				$(INSTALL_DATA) $$name $(INSTALL_CONFIG)/$$name; \
 @MAKE_PC_FILES@			done \
 @MAKE_PC_FILES@			;; \
 @MAKE_PC_FILES@		*) \
@@ -177,27 +184,29 @@ run_tic.sed :
 	datadir=${datadir} \
 	$(SHELL) $(srcdir)/gen_edit.sh >$@
 
-$(DESTDIR)$(bindir) \
-$(DESTDIR)$(libdir) \
-$(DESTDIR)$(datadir) \
-$(DESTDIR)$(tabsetdir) :
+$(BINDIR) \
+$(DATADIR) :
 	mkdir -p $@
 
+@MAKE_DATABASE@$(LIBDIR) \
+@MAKE_DATABASE@$(TABSETDIR) :
+@MAKE_DATABASE@	mkdir -p $@
+
 uninstall : @MISC_UNINSTALL_DATA@ uninstall.libs
 
 uninstall.data :
-	-test -d $(DESTDIR)$(tabsetdir) && rm -rf $(DESTDIR)$(tabsetdir)
-	-test -d $(DESTDIR)$(ticdir) && rm -rf $(DESTDIR)$(ticdir)
-	-test -f $(DESTDIR)$(ticfile) && rm -f $(DESTDIR)$(ticfile)
+@MAKE_DATABASE@	-$(SHELL) -c 'if test -d $(TABSETDIR) ; then rm -rf $(TABSETDIR); fi'
+@MAKE_DATABASE@	-$(SHELL) -c 'if test -d $(TICDIR) ; then rm -rf $(TICDIR); fi'
+@MAKE_DATABASE@	-$(SHELL) -c 'if test -f $(TICFILE) ; then rm -f $(TICFILE); fi'
 
 uninstall.libs :
-	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
-@MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
-@MAKE_PC_FILES@	x/*) \
+	-rm -f $(BINDIR)/$(NCURSES_CONFIG)
+@MAKE_PC_FILES@	@$(SHELL) -c 'case x$(INSTALL_CONFIG) in \
+@MAKE_PC_FILES@	x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
 @MAKE_PC_FILES@		for name in $(PC_FILES); do \
 @MAKE_PC_FILES@			test -f $$name || continue; \
 @MAKE_PC_FILES@			echo uninstalling $$name; \
-@MAKE_PC_FILES@			rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
+@MAKE_PC_FILES@			rm -f $(INSTALL_CONFIG)/$$name; \
 @MAKE_PC_FILES@		done \
 @MAKE_PC_FILES@		;; \
 @MAKE_PC_FILES@	esac'
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 89a5cd4a3180..c369dd26a07c 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.56 2022/10/08 16:45:20 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.58 2024/09/28 20:21:23 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -92,7 +92,7 @@ do
 	-specs*) # ignore linker specs-files which were used to build library
 		continue
 		;;
-	-Wl,-z,*) # ignore flags used to manipulate shared image
+	-Wl,-z*) # ignore flags used to manipulate shared image
 		continue
 		;;
 	-Wl,--dynamic-linker*) # ignore ELF interpreter
@@ -112,7 +112,7 @@ do
 		@LD_SEARCHPATH@) # skip standard libdir
 			if [ "$lib_check" = "$libdir" ]
 			then
-				lib_first=yes
+				lib_first=no
 				IFS_save="$IFS"
 				IFS='|'
 				LIBDIRS="@LD_SEARCHPATH@"
@@ -120,11 +120,11 @@ do
 				do
 					if [ -d "$lib_check" ]
 					then
-						if [ "$lib_check" != "$libdir" ]
+						if [ "$lib_check" = "$libdir" ]
 						then
-							lib_first=no
+							lib_first=yes
+							break
 						fi
-						break
 					fi
 				done
 				IFS="$IFS_save"
diff --git a/misc/gen_edit.sh b/misc/gen_edit.sh
index 0c41611d7c57..1fe43cd7ad1b 100755
--- a/misc/gen_edit.sh
+++ b/misc/gen_edit.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2025 Thomas E. Dickey                                  #
 # Copyright 2004-2011,2012 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,8 +30,8 @@
 #
 # Author: Thomas E. Dickey
 #
-# $Id: gen_edit.sh,v 1.7 2021/09/04 15:55:29 tom Exp $
-# Generate a sed-script for converting the terminfo.src to the form which will
+# $Id: gen_edit.sh,v 1.9 2025/11/12 00:52:57 Branden.Robinson Exp $
+# Generate a sed script for converting the terminfo.src to the form which will
 # be installed.
 #
 # Assumes:
@@ -48,13 +48,13 @@ linux_dft=linux2.2
 # If we're not installing into /usr/share/, we'll have to adjust the location
 # of the tabset files in terminfo.src (which are in a parallel directory).
 TABSET=${datadir}/tabset
-if test "x$TABSET" != "x/usr/share/tabset" ; then
+if [ "x$TABSET" != "x/usr/share/tabset" ] ; then
 cat <<EOF
 s%/usr/share/tabset%$TABSET%g
 EOF
 fi
 
-if test "$WHICH_XTERM" != "xterm-new" ; then
+if [ "$WHICH_XTERM" != "xterm-new" ] ; then
 echo "** using $WHICH_XTERM terminal description for XTerm entry" >&2
 cat <<EOF
 /^# This is xterm for ncurses/,/^$/{
@@ -63,7 +63,7 @@ cat <<EOF
 EOF
 fi
 
-if test "$XTERM_KBS" != "BS" ; then
+if [ "$XTERM_KBS" != "BS" ] ; then
 echo "** using DEL for XTerm backspace-key" >&2
 cat <<EOF
 /^xterm+kbs|fragment for backspace key/,/^#/{
@@ -83,7 +83,7 @@ fi
 case x$WHICH_LINUX in #(vi
 xauto)
 	system=`uname -s 2>/dev/null`
-	if test "x$system" = xLinux
+	if [ "$system" = Linux ]
 	then
 		case x`uname -r` in
 		x1.*)
@@ -108,7 +108,7 @@ xlinux*)
 	;;
 esac
 
-if test $WHICH_LINUX != $linux_dft
+if [ "$WHICH_LINUX" != "$linux_dft" ]
 then
 echo "** using $WHICH_LINUX terminal description for Linux console" >&2
 cat <<EOF
diff --git a/misc/magic b/misc/magic
index ee1a1c4d456c..314cb6d20d23 100644
--- a/misc/magic
+++ b/misc/magic
@@ -1,6 +1,6 @@
-# $Id: magic,v 1.5 2023/09/23 23:37:26 tom Exp $
+# $Id: magic,v 1.6 2025/02/15 15:23:23 tom Exp $
 ##############################################################################
-# Copyright 2020,2023 Thomas E. Dickey                                       #
+# Copyright 2020-2023,2025 Thomas E. Dickey                                  #
 # Copyright 2015,2018 Free Software Foundation, Inc.                         #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -59,9 +59,8 @@
 >>12	regex		\^[a-zA-Z0-9][a-zA-Z0-9.][^|]*	Compiled 32-bit terminfo entry "%-s"
 !:mime	application/x-terminfo2
 #
-# While the compiled terminfo uses little-endian format irregardless of
-# platform, System V screen dumps do not.  They came later, and that detail was
-# overlooked.
+# While the compiled terminfo uses little-endian format regardless of platform,
+# System V screen dumps do not.  They came later; that detail was overlooked.
 #
 # AIX and HPUX use the SVr4 big-endian format
 # Solaris uses the SVr3 formats (sparc and x86 differ endian-ness)
diff --git a/misc/makellib b/misc/makellib
index fb3d3b7a92fd..04d99fe9ebdf 100755
--- a/misc/makellib
+++ b/misc/makellib
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2025 Thomas E. Dickey                                  #
 # Copyright 1998,2000 Free Software Foundation, Inc.                         #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,7 +30,7 @@
 #
 # Author: Thomas E. Dickey 1996,1997,2000
 #
-# $Id: makellib,v 1.11 2021/09/04 15:49:38 tom Exp $
+# $Id: makellib,v 1.12 2025/06/14 14:44:56 tom Exp $
 # System-dependent wrapper for 'lint' that creates a lint-library via the
 # following method (XXX is the name of the library):
 #	a.  If the file llib-lXXX doesn't exist, create it using the make-rule
@@ -52,7 +52,7 @@
 #	$* = C-preprocessor options
 #
 ARCH=`uname -s`
-if test "x$ARCH" = "xSunOS" ; then
+if [ "$ARCH" = "SunOS" ] ; then
 	case `uname -r` in
 	5.*)	ARCH=Solaris
 		;;
@@ -64,7 +64,7 @@ OPT=""
 LLIB=""
 llib=""
 #
-while test $# != 0
+while [ $# != 0 ]
 do
 	case $1 in
 	-L*)
@@ -74,7 +74,7 @@ do
 		OPT="$OPT $1"
 		;;
 	*)
-		if test -z "$LLIB"
+		if [ -z "$LLIB" ]
 		then
 			LLIB=$1
 		else
@@ -85,16 +85,16 @@ do
 	shift
 done
 
-if test -z "$LLIB"
+if [ -z "$LLIB" ]
 then
 	echo '? no library name specified'
 	exit 1
-elif test -z "$llib"
+elif [ -z "$llib" ]
 then
 	llib="llib-l$LLIB"
 fi
 
-if test ! -f "$llib" ; then
+if [ ! -f "$llib" ] ; then
 	if ( make "$llib" )
 	then
 		:
@@ -142,16 +142,16 @@ UNIX_SV)
 	exit 1
 esac
 
-echo OPT    "$OPT"
-echo TARGET "$TARGET"
-echo LIBNAME "$llib"
+echo "OPT     $OPT"
+echo "TARGET  $TARGET"
+echo "LIBNAME $llib"
 if ( lint "$CREATE" "$OPT" "$TARGET" )
 then
-	if test -f "$llib.ln"
+	if [ -f "$llib.ln" ]
 	then
 		for p in $HOME/lib $HOME/lib/$ARCH $HOME/lib/$ARCH/lint
 		do
-			if test ! -d "$p"
+			if [ ! -d "$p" ]
 			then
 				mkdir "$p"
 			fi
@@ -163,6 +163,6 @@ then
 		rm -f "$llib.ln"
 	fi
 fi
-if test "x$TARGET" = "x$llib.c" ; then
+if [ "$TARGET" = "$llib.c" ] ; then
 	rm -f "$TARGET"
 fi
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index c9f1cf809843..ea3ad0d26ddd 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.52 2022/07/26 21:36:28 tom Exp $
+# $Id: ncurses-config.in,v 1.63 2025/11/22 19:19:28 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -46,12 +46,10 @@ datarootdir="@datarootdir@"
 datadir="@datadir@"
 mandir="@mandir@"
 
-THIS="@LIB_NAME@@USE_LIB_SUFFIX@"
+CURSES_LIB="@LIB_NAME@@ABI_SUFFIX@"
 TINFO_LIB="@TINFO_ARG_SUFFIX@"
 RPATH_LIST="@RPATH_LIST@"
 
-includesubdir="@includedir@/${THIS}"
-
 # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
 # We cannot filter it out within the build-process since the variable is used
 # in some special cases of installation using a relative path.
@@ -80,18 +78,29 @@ fi
 # the headers to include like this:
 #	<ncurses@LIB_SUFFIX@/curses.h>
 if [ x@WITH_OVERWRITE@ = xno ]; then
+	includesubdir="@includedir@/${CURSES_LIB}"
 	case $includedir in
 	$prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
 		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
 		;;
 	esac
+else
+	includesubdir="@includedir@"
 fi
 
 LIBS="@LIBS@"
 if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
-	LIBS="-l${THIS} $LIBS"
+	LIBS="-l${CURSES_LIB} $LIBS"
 else
-	LIBS="-l${THIS} -l${TINFO_LIB} $LIBS"
+	LIBS="-l${CURSES_LIB} -l${TINFO_LIB} $LIBS"
+fi
+
+CFLAGS="@PKG_CFLAGS@"
+if [ "$includesubdir" != "/usr/include" ]; then
+	CFLAGS="$CFLAGS -I${includesubdir}"
+	if [ "$includedir" != "/usr/include" ]; then
+		[ x@WITH_OVERWRITE@ = xno ] && CFLAGS="$CFLAGS -I${includedir}"
+	fi
 fi
 
 # Ignore -L options which do not correspond to an actual directory, or which
@@ -107,7 +116,7 @@ do
 	-specs*) # ignore linker specs-files which were used to build library
 		continue
 		;;
-	-Wl,-z,*) # ignore flags used to manipulate shared image
+	-Wl,-z*) # ignore flags used to manipulate shared image
 		continue
 		;;
 	-Wl,--dynamic-linker*) # ignore ELF interpreter
@@ -123,7 +132,7 @@ do
 		@LD_SEARCHPATH@) # skip standard libdir
 			if [ "$lib_check" = "$libdir" ]
 			then
-				lib_first=yes
+				lib_first=no
 				IFS_save="$IFS"
 				IFS='|'
 				LIBDIRS="@LD_SEARCHPATH@"
@@ -131,11 +140,11 @@ do
 				do
 					if [ -d "$lib_check" ]
 					then
-						if [ "$lib_check" != "$libdir" ]
+						if [ "$lib_check" = "$libdir" ]
 						then
-							lib_first=no
+							lib_first=yes
+							break
 						fi
-						break
 					fi
 				done
 				IFS="$IFS_save"
@@ -186,16 +195,57 @@ while [ $# -gt 0 ]; do
 		;;
 	# compile/link
 	--cflags)
-		INCS="@PKG_CFLAGS@"
-		if [ "x@WITH_OVERWRITE@" = xno ]; then
-			INCS="$INCS -I${includesubdir}"
-		fi
-		if [ "${includedir}" != /usr/include ]; then
-			INCS="$INCS -I${includedir}"
-		fi
-		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-			$INCS
-ENDECHO
+		OPTS=
+		for opt in $CFLAGS
+		do
+			case "x$opt" in
+			x-[fgOW]*)
+				opt=
+				;;
+			esac
+			if [ -n "$opt" ]
+			then
+				[ -n "$OPTS" ] && OPTS="$OPTS "
+				OPTS="$OPTS$opt"
+			fi
+		done
+		printf "%s\n" "$OPTS"
+		;;
+	--cflags-only-I)
+		OPTS=
+		for opt in $CFLAGS
+		do
+			case "x$opt" in
+			x-[I]*)
+				;;
+			*)
+				opt=
+				;;
+			esac
+			if [ -n "$opt" ]
+			then
+				[ -n "$OPTS" ] && OPTS="$OPTS "
+				OPTS="$OPTS$opt"
+			fi
+		done
+		printf "%s\n" "$OPTS"
+		;;
+	--cflags-only-other)
+		OPTS=
+		for opt in $CFLAGS
+		do
+			case "x$opt" in
+			x-[I]*|x-[fgOW]*)
+				opt=
+				;;
+			esac
+			if [ -n "$opt" ]
+			then
+				[ -n "$OPTS" ] && OPTS="$OPTS "
+				OPTS="$OPTS$opt"
+			fi
+		done
+		printf "%s\n" "$OPTS"
 		;;
 	--libs)
 		OPTS=
@@ -294,30 +344,32 @@ ENDECHO
 Usage: `basename "$0"` [options]
 
 Options:
-  --prefix           echos the package-prefix of ${THIS}
-  --exec-prefix      echos the executable-prefix of ${THIS}
+  --prefix            echoes the package-prefix of ${CURSES_LIB}
+  --exec-prefix       echoes the executable-prefix of ${CURSES_LIB}
 
-  --cflags           echos the C compiler flags needed to compile with ${THIS}
-  --libs             echos the libraries needed to link with ${THIS}
+  --cflags            echoes the C compiler flags needed to compile for ${CURSES_LIB}
+  --cflags-only-I     echoes only -I C compiler flags needed with ${CURSES_LIB}
+  --cflags-only-other echoes only C compiler flags other than -I for ${CURSES_LIB}
+  --libs              echoes the libraries needed to link with ${CURSES_LIB}
 
-  --libs-only-L      echos -L linker options (search path) for ${THIS}
-  --libs-only-l      echos -l linker options (libraries) for ${THIS}
-  --libs-only-other  echos linker options other than -L/-l
+  --libs-only-L       echoes -L linker options (search path) for ${CURSES_LIB}
+  --libs-only-l       echoes -l linker options (libraries) for ${CURSES_LIB}
+  --libs-only-other   echoes linker options other than -L/-l
 
-  --version          echos the release+patchdate version of ${THIS}
-  --abi-version      echos the ABI version of ${THIS}
-  --mouse-version    echos the mouse-interface version of ${THIS}
+  --version           echoes the release+patchdate version of ${CURSES_LIB}
+  --abi-version       echoes the ABI version of ${CURSES_LIB}
+  --mouse-version     echoes the mouse-interface version of ${CURSES_LIB}
 
-  --bindir           echos the directory containing ${THIS} programs
-  --datadir          echos the directory containing ${THIS} data
-  --includedir       echos the directory containing ${THIS} header files
-  --libdir           echos the directory containing ${THIS} libraries
-  --mandir           echos the directory containing ${THIS} manpages
-  --terminfo         echos the \$TERMINFO terminfo database path
-  --terminfo-dirs    echos the \$TERMINFO_DIRS directory list
-  --termpath         echos the \$TERMPATH termcap list
+  --bindir            echoes the directory containing ${CURSES_LIB} programs
+  --datadir           echoes the directory containing ${CURSES_LIB} data
+  --includedir        echoes the directory containing ${CURSES_LIB} header files
+  --libdir            echoes the directory containing ${CURSES_LIB} libraries
+  --mandir            echoes the directory containing ${CURSES_LIB} man pages
+  --terminfo          echoes the \$TERMINFO terminfo database path
+  --terminfo-dirs     echoes the \$TERMINFO_DIRS directory list
+  --termpath          echoes the \$TERMPATH termcap list
 
-  --help             prints this message
+  --help              prints this message
 ENDHELP
 		;;
 	--error|*)
diff --git a/misc/run_tic.in b/misc/run_tic.in
index bd11c4c80d4c..60fbdcc7fa52 100644
--- a/misc/run_tic.in
+++ b/misc/run_tic.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: run_tic.in,v 1.40 2022/07/16 19:37:03 tom Exp $
+# $Id: run_tic.in,v 1.44 2025/09/13 16:52:46 tom Exp $
 ##############################################################################
-# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2024,2025 Thomas E. Dickey                                  #
 # Copyright 2000-2012,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -42,50 +42,59 @@ echo "** Building terminfo database, please wait..."
 # The script is designed to be run from the misc/Makefile as
 #	make install.data
 
-: "${suffix:=@EXEEXT@}"
-: "${DESTDIR:=@DESTDIR@}"
+# Symbols which are not overridden by misc/Makefile:
 : "${prefix:=@prefix@}"
 : "${exec_prefix:=@exec_prefix@}"
-: "${bindir:=@bindir@}"
 : "${top_srcdir:=@top_srcdir@}"
 : "${srcdir:=@srcdir@}"
 : "${datarootdir:=@datarootdir@}"
 : "${datadir:=@datadir@}"
-: "${TIC_PATH:=@TIC@}"
-: "${ticdir:=@TERMINFO@}"
-: "${source:=@TERMINFO_SRC@}"
-: "${cross_compiling:=no}"
+: "${cross_compiling:=@cross_compiling@}"
+: "${suffix:=@EXEEXT@}"
+
 : "${ext_funcs:=@NCURSES_EXT_FUNCS@}"
+: "${tic_path:=@TIC@}"
+: "${ticdir:=@TERMINFO@}"
+: "${tic_source:=@TERMINFO_SRC@}"
+
+# Symbols which $DESTDIR and/or install-prefix may affect:
+: "${INSTALL_PREFIX:=$prefix}"
+: "${BINDIR:=@bindir@}"
+: "${TICDIR:=$ticdir}"
 
-test -z "${DESTDIR}" && DESTDIR=
+failed() {
+	echo "? $*" >&2
+	exit 1
+}
+
+unset CDPATH
 
 # Allow tic to run either from the install-path, or from the build-directory.
 # Do not do this if we appear to be cross-compiling.  In that case, we rely
 # on the host's copy of tic to compile the terminfo database.
-if test "x$cross_compiling" = "xno"
+if test "$cross_compiling" = "no"
 then
-	if test -f ../progs/tic$suffix
+	if test -f ../progs/tic"$suffix"
 	then
 		case "$PATH" in
 		\@PATH_SEPARATOR@*)
-			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH"
+			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}$PATH"
 			;;
 		*)
-			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH"
+			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}@PATH_SEPARATOR@$PATH"
 			;;
 		esac
 		export PATH
 		if test @DFT_LWR_MODEL@ = shared
 		then
 			SHLIB="sh $srcdir/shlib"
-			TIC_PATH="$SHLIB tic"
+			tic_path="$SHLIB tic"
 		else
-			TIC_PATH="tic"
+			tic_path="tic"
 		fi
-	elif test "$TIC_PATH" = unknown
+	elif test "$tic_path" = unknown
 	then
-		echo "? no tic program found"
-		exit 1
+		failed "no tic program found"
 	fi
 else
 	# Cross-compiling, so don't set PATH or run shlib.
@@ -95,26 +104,27 @@ else
 fi
 
 
-# set another env var that doesn't get reset when `shlib' runs, so `shlib' uses
+# Set another env var that doesn't get reset when `shlib' runs, so `shlib' uses
 # the PATH we just set.
 SHLIB_PATH=$PATH
 export SHLIB_PATH
 
-# set a variable to simplify environment update in shlib
+# Set a variable to simplify environment update in the shlib script.
 SHLIB_HOST=@host_os@
 export SHLIB_HOST
 
-# don't use user's TERMINFO variable
+# Don't use user's TERMINFO or TERMINFO_DIRS variables.  The explicit "-o"
+# option makes this moot, but this may reduce confusion.
 unset TERMINFO_DIRS
-TERMINFO="${DESTDIR}$ticdir" ; export TERMINFO
+unset TERMINFO
 umask 022
 
 # Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo.
-TICDIR=`echo "$TERMINFO" | sed -e 's%/share/\([^/]*\)$%/lib/\1%'`
+OLD_DIR=`echo "$TICDIR" | sed -e 's%/share/\([^/]*\)$%/lib/\1%'`
 
 # Parent directory may not exist, which would confuse the install for hashed
 # database.  Fix.
-PARENT=`echo "$TERMINFO" | sed -e 's%/[^/]*$%%'`
+PARENT=`echo "$TICDIR" | sed -e 's%/[^/]*$%%'`
 if test -n "$PARENT"
 then
 	mkdir -p "$PARENT"
@@ -124,87 +134,102 @@ fi
 # would generate a lot of confusing error messages if we tried to overwrite it.
 # We explicitly remove its contents rather than the directory itself, in case
 # the directory is actually a symbolic link.
-if test -d "$TERMINFO"
+if test -d "$TICDIR"
 then
-	( cd "$TERMINFO" && rm -fr ./? 2>/dev/null )
-elif test -f "$TERMINFO.db"
+	test -w "$TICDIR" || failed "existing $TICDIR is not writable"
+	( cd "$TICDIR" && rm -fr ./? 2>/dev/null )
+elif test -f "$TICDIR.db"
 then
-	( rm -f "$TERMINFO.db" 2>/dev/null )
+	( rm -f "$TICDIR.db" 2>/dev/null )
+	test -f "$TICDIR.db" && failed "cannot remove $TICDIR.db"
 fi
 
 if test "$ext_funcs" = 1 ; then
 cat <<EOF
-Running $TIC_PATH to install $TERMINFO ...
+Running $tic_path to install $TICDIR ...
 
 	You may see messages regarding extended capabilities, e.g., AX.
 	These are extended terminal capabilities which are compiled
 	using
-		tic -x
+		$tic_path -x
 	If you have ncurses 4.2 applications, you should read the INSTALL
 	document, and install the terminfo without the -x option.
 
 EOF
-$TIC_PATH -V
-if ( $TIC_PATH -x -s -o "$TERMINFO" $source )
+$tic_path -V
+if ( $tic_path -x -s -o "$TICDIR" "$tic_source" )
 then
-	echo "** built new $TERMINFO"
+	echo "** built new $TICDIR"
 else
-	echo "? tic could not build $TERMINFO"
-	exit 1
+	failed "$tic_path could not build $TICDIR"
 fi
 else
 cat <<EOF
-Running $TIC_PATH to install $TERMINFO ...
+Running $tic_path to install $TICDIR ...
 
 	You may see messages regarding unknown capabilities, e.g., AX.
 	These are extended terminal capabilities which may be compiled
 	using
-		tic -x
+		$tic_path -x
 	If you have ncurses 4.2 applications, you should read the INSTALL
 	document, and install the terminfo without the -x option.
 
 EOF
-$TIC_PATH -V
-if ( $TIC_PATH -s -o "$TERMINFO" $source )
+$tic_path -V
+if ( $tic_path -s -o "$TICDIR" "$tic_source" )
 then
-	echo "** built new $TERMINFO"
+	echo "** built new $TICDIR"
 else
-	echo "? tic could not build $TERMINFO"
-	exit 1
+	failed "$tic_path could not build $TICDIR"
 fi
 fi
 
+# Check if we are using symbolic links, or just pretending.
+case "@LN_S@" in
+cp\ *)
+	OLD_DIR="$TICDIR"
+	echo "** assuming we cannot make symbolic links to a directory"
+	;;
+*)
+	echo "** assuming we can make symbolic links to a directory"
+	;;
+esac
+
+
 # Make a symbolic link to provide compatibility with applications that expect
 # to find terminfo under /usr/lib.  That is, we'll _try_ to do that.  Not
 # all systems support symbolic links, and those that do provide a variety
 # of options for 'test'.
-if test "$TICDIR" != "$TERMINFO" ; then
-	( rm -f "$TICDIR" 2>/dev/null )
-	if ( cd "$TICDIR" 2>/dev/null )
+if test "$OLD_DIR" != "$TICDIR" ; then
+	( rm -f "$OLD_DIR" 2>/dev/null )
+	if ( cd "$OLD_DIR" 2>/dev/null )
 	then
-		cd "$TICDIR" || exit
-		TICDIR=`pwd`
-		if test "$TICDIR " != "$TERMINFO "; then
+		cd "$OLD_DIR" || exit
+		OLD_DIR=`pwd`
+		if test "$OLD_DIR " != "$TICDIR "; then
 			# Well, we tried.  Some systems lie to us, so the
 			# installer will have to double-check.
-			echo "Verify if $TICDIR and $TERMINFO are the same."
-			echo "The new terminfo is in $TERMINFO; the other should be a link to it."
-			echo "Otherwise, remove $TICDIR and link it to $TERMINFO."
+			echo "Verify if $OLD_DIR and $TICDIR are the same."
+			echo "The new terminfo is in $TICDIR; the other should be a link to it."
+			echo "Otherwise, remove $OLD_DIR and link it to $TICDIR."
 		fi
 	else
-		cd ${DESTDIR}$prefix || exit
+		cd "${INSTALL_PREFIX}" || exit
 		# Construct a symbolic link that only assumes $ticdir has the
 		# same $prefix as the other installed directories.
-		RELATIVE=`echo $ticdir|sed -e 's%^'$prefix'/%%'`
-		if test "$RELATIVE" != "$ticdir" ; then
-			RELATIVE=../`echo $ticdir|sed -e 's%^'$prefix'/%%' -e 's%^/%%'`
+		SOURCE=`echo "$ticdir"|sed -e 's%^'"$prefix"'/%%'`
+		if test "$SOURCE" != "$ticdir" ; then
+			SOURCE=../`echo "$ticdir"|sed -e 's%^'"$prefix"'/%%' -e 's%^/%%'`
 		fi
-		if ( @LN_S@ "$RELATIVE" "$TICDIR" )
+		test -d lib || mkdir lib
+		cd lib || exit
+		TARGET=`pwd`/terminfo
+		if ( @LN_S@ "$SOURCE" terminfo )
 		then
-			echo "** sym-linked $TICDIR for compatibility"
+			echo "** sym-linked $TARGET for compatibility"
 		else
-			echo "** could not sym-link $TICDIR for compatibility"
+			echo "** could not sym-link $TARGET for compatibility"
 		fi
 	fi
 fi
-# vile:shmode
+# vile:shmode ts=4 sw=4
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 5d575b8eb454..f111e5342c90 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1143 $
-#	$Date: 2024/03/09 20:01:40 $
+#	$Revision: 1.1200 $
+#	$Date: 2025/11/12 00:52:57 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -423,11 +423,10 @@ klone+acs|alternate character set for ansi.sys displays,
 # <rmul=\E[24m>, but this isn't a documented feature of ANSI.SYS.
 klone+sgr|attribute control for ansi.sys displays,
 	blink=\E[5m, bold=\E[1m, rev=\E[7m, rmpch=\E[10m,
-	rmso=\E[m, rmul=\E[m,
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
 	    %t;1%;%?%p9%t;11%;m,
-	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
-	use=klone+acs,
+	sgr0=\E[0;10m, smpch=\E[11m, use=ansi+sgrso,
+	use=ansi+sgrul, use=klone+acs,
 
 # Most Intel boxes do not treat "invis" (invisible) text.
 klone+sgr8|attribute control for ansi.sys displays with invis,
@@ -475,9 +474,15 @@ ecma+color|color control for ECMA-48-compatible terminals,
 ecma+italics|ECMA-48 italics,
 	ritm=\E[23m, sitm=\E[3m,
 
+ecma+standout|ECMA-48 standout,
+	rmso=\E[27m, smso=\E[7m,
+
+ecma+underline|ECMA-48 underline,
+	rmul=\E[24m, smul=\E[4m,
+
 # Attribute control for ECMA-48-compatible terminals
 ecma+sgr|attribute capabilities for true ECMA-48 terminals,
-	rmso=\E[27m, rmul=\E[24m, use=klone+sgr8,
+	use=ecma+underline, use=ecma+standout, use=klone+sgr8,
 
 ecma+strikeout|ECMA-48 strikeout/crossed-out,
 	rmxx=\E[29m, smxx=\E[9m,
@@ -494,10 +499,10 @@ ecma+index|ECMA-48 scroll up/down,
 ibcs2|Intel Binary Compatibility Standard prescriptions,
 	cbt=\E[Z, clear=\Ec, cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch=\E[%p1%dP,
-	dispc=\E=%p1%dg, ech=\E[%p1%dX, hpa=\E[%i%p1%dG, hts=\EH,
-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, rc=\E7,
-	rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g,
-	vpa=\E[%i%p1%dd, use=ansi+local, use=ecma+index,
+	dispc=\E=%p1%dg, ech=\E[%p1%dX, hts=\EH, ich=\E[%p1%d@,
+	ich1=\E[@, il=\E[%p1%dL, rc=\E7, rmam=\E[?7l, sc=\E7,
+	smam=\E[?7h, tbc=\E[g, use=ansi+local, use=ansi+rca2,
+	use=ecma+index,
 
 #### ANSI/ECMA-48 terminals and terminal emulators
 #
@@ -559,12 +564,12 @@ ansi-mtabs|any ANSI terminal with pessimistic assumptions (relative addressing),
 ansi77|ANSI 3.64 standard 1977 version,
 	OTbs, am, mir,
 	cols#80, it#8, lines#24,
-	bel=^G, clear=\E[;H\E[2J, cr=\r, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M$<5*/>,
-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[L$<5*/>, ind=\ED,
-	kf1=\EOP, kf2=\EOR, kf4=\EOS, nel=\r\ED, ri=\EM, rmir=\E[4l,
-	rmso=\E[m, rmul=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+csr, use=ansi+local1,
+	bel=^G, clear=\E[;H\E[2J, cr=\r, cub1=^H, dch1=\E[P,
+	dl1=\E[M$<5*/>, ed=\E[J, el=\E[K, ht=^I, il1=\E[L$<5*/>,
+	ind=\ED, kf1=\EOP, kf2=\EOR, kf4=\EOS, nel=\r\ED, ri=\EM,
+	rmir=\E[4l, smir=\E[4h, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+local1, use=ansi+sgrso,
+	use=ansi+sgrul,
 
 # Procomm and some other ANSI emulations don't recognize all of the ANSI-
 # standard capabilities.  This entry deletes <cuu>, <cuf>, <cud>, <cub>, and
@@ -579,10 +584,9 @@ ansi77|ANSI 3.64 standard 1977 version,
 pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ANSI (mono mode),
 	OTbs, am, mir, msgr,
 	cols#80, lines#24,
-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M,
-	home=\E[H, ht=^I, il1=\E[L, ind=\n, use=ansi+arrows,
-	use=ansi+erase, use=ansi+inittabs, use=ansi+local1,
-	use=klone+sgr-dumb,
+	bel=^G, cr=\r, dch1=\E[P, ind=\n, use=ansi+arrows,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl1,
+	use=ansi+inittabs, use=ansi+local1, use=klone+sgr-dumb,
 
 pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
 	lines#25, use=pcansi-m,
@@ -607,10 +611,10 @@ pcansi-43|pcansi43|ibm-pc terminal programs with 43 lines,
 ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes,
 	mc5i,
 	dch=\E[%p1%dP, dl=\E[%p1%dM, ech=\E[%p1%dX, el1=\E[1K,
-	hpa=\E[%i%p1%dG, ht=\E[I, ich=\E[%p1%d@, il=\E[%p1%dL,
-	kcbt=\E[Z, kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
+	ht=\E[I, ich=\E[%p1%d@, il=\E[%p1%dL, kcbt=\E[Z,
+	kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
 	rep=%p1%c\E[%p2%{1}%-%db, s0ds=\E(B, s1ds=\E)B,
-	s2ds=\E*B, s3ds=\E+B, vpa=\E[%i%p1%dd, use=ansi+local,
+	s2ds=\E*B, s3ds=\E+B, use=ansi+local, use=ansi+rca2,
 	use=ecma+index, use=pcansi-m,
 
 # ECMA-48 addresses three of the four capabilities here:
@@ -636,7 +640,7 @@ ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes,
 #	Parameter default value: Ps = 0
 #	With a parameter value not equal to 0, DA is used to identify the
 #	device which sends the DA.  The parameter value is a device type
-#	identification code according to a register which is to be established. 
+#	identification code according to a register which is to be established.
 #	If the parameter value is 0, DA is used to request an identifying DA
 #	from a device.
 #
@@ -687,10 +691,10 @@ ansi-generic|ansiterm|generic ANSI standard terminal,
 ansi.sys-old|ANSI.SYS under PC-DOS 2.0,
 	OTbs, am, mir, msgr, xon,
 	cols#80, lines#25,
-	clear=\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH, el=\E[k,
-	home=\E[H, is2=\E[m\E[?7h, kcub1=^H, kcud1=\n, kcuf1=^L,
-	kcuu1=^K, khome=^^, pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p,
-	rc=\E[u, rmam=\E[?7l, sc=\E[s, smam=\E[?7h, use=ansi+cpr,
+	clear=\E[2J, cub1=^H, el=\E[k, is2=\E[m\E[?7h, kcub1=^H,
+	kcud1=\n, kcuf1=^L, kcuu1=^K, khome=^^,
+	pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p, rc=\E[u, rmam=\E[?7l,
+	sc=\E[s, smam=\E[?7h, use=ansi+cpr, use=ansi+cup,
 	use=ansi+local1, use=klone+color, use=klone+sgr8,
 
 # Keypad:	Home=\0G	Up=\0H	PrPag=\0I
@@ -834,17 +838,15 @@ tw100|Toswin VT100 window manager,
 	     yzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\Ef,
 	clear=\E[2J\E[H, cnorm=\Ee, cr=\r, cub1=^H, cud1=\EB,
-	cuf1=\EC, cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch1=\Ea,
-	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
-	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il1=\EL,
-	ind=\n, is2=\E<\E)0, kdch1=^?, kf1=\EOP, kf10=\EOY, kf11=\Ep,
-	kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev,
-	kf18=\Ew, kf19=\Ex, kf2=\EOQ, kf20=\Ey, kf3=\EOR, kf4=\EOS,
-	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khlp=\EH,
+	cuf1=\EC, cuu1=\EA, dch1=\Ea, dim=\E[2m, dl=\E[%p1%dM,
+	dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, il1=\EL, ind=\n, is2=\E<\E)0, kdch1=^?,
+	kf10=\EOY, kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et,
+	kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf20=\Ey, kf5=\EOT,
+	kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khlp=\EH,
 	khome=\E\EE, kich1=\EI, knp=\Eb, kpp=\E\Ea, kund=\EK,
 	ll=\E[24H, nel=\EE, oc=\E[30;47m, op=\E[30;47m, rev=\E[7m,
 	ri=\EM, rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
 	rs1=\E<\E[20l\E[?3;6;9l\E[r\Eq\E(B\017\E)0\E>,
 	setb=\E[4%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=
 	     %t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'
@@ -853,8 +855,9 @@ tw100|Toswin VT100 window manager,
 	     %t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'
 	     %=%t3%e7%;m,
 	sgr0=\E[m, smacs=^N, smcup=\E[?7l, smir=\Eh,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	use=ansi+apparrows, use=ansi+csr, use=ansi+local,
+	smkx=\E[?1h\E=, tbc=\E[3g, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
 
 # The entries for stv52 and stv52pc probably need a revision.
 stv52|MiNT virtual console,
@@ -925,19 +928,18 @@ st52-old|Atari ST with VT52 emulation,
 beterm|BeOS Terminal,
 	am, eo, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#25, ncv#5,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, el1=\E[1K,
-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
-	kf1=\E[11~, kf10=\E[20~, kf11=\E[21~, kf12=\E[22~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[16~,
-	kf7=\E[17~, kf8=\E[18~, kf9=\E[19~, khome=\E[1~, kspd=^Z,
-	nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM, rmkx=\E[?4l, rmso=\E[m,
-	rmul=\E[24m, rs1=\Ec, setb=\E[%p1%{40}%+%cm,
-	setf=\E[%p1%{30}%+%cm, sgr0=\E[0;10m, smkx=\E[?4h,
-	smso=\E[7m, smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u7=\E[6n,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+local, use=klone+color, use=vt220+pcedit,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, ech=\E[%p1%dX,
+	el1=\E[1K, ht=^I, hts=\EH, ind=\n, kf10=\E[20~, kf11=\E[21~,
+	kf12=\E[22~, kf6=\E[16~, kf7=\E[17~, kf8=\E[18~,
+	kf9=\E[19~, khome=\E[1~, kspd=^Z, nel=\r\n, op=\E[m,
+	rev=\E[7m, ri=\EM, rmkx=\E[?4l, rs1=\Ec,
+	setb=\E[%p1%{40}%+%cm, setf=\E[%p1%{30}%+%cm,
+	sgr0=\E[0;10m, smkx=\E[?4h, u6=\E[%i%p1%d;%p2%dR,
+	u7=\E[6n, use=ecma+underline, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ansi+local, use=ansi+rca2,
+	use=ansi+sgrso, use=klone+color, use=vt220+pcedit,
+	use=xterm+r5+fkeys,
 
 #### Linux consoles
 #
@@ -973,28 +975,31 @@ linux-basic|Linux console (basic),
 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
-	dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\E[[A,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[[B,
-	kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kmous=\E[M, kspd=^Z,
-	nel=\r\n, ri=\EM, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec\E]R,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX,
+	el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH,
+	ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M,
+	kspd=^Z, nel=\r\n, ri=\EM, rmam=\E[?7l, rs1=\Ec\E]R,
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
 	    %t;2%;%?%p6%t;1%;%?%p9%t;11%;m,
-	smam=\E[?7h, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+local, use=vt220+pcedit, use=vt102+enq,
-	use=klone+sgr, use=ecma+color, use=linux+sfkeys,
+	smam=\E[?7h, tbc=\E[3g, use=ecma+underline,
+	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+local, use=ansi+rca2, use=vt220+pcedit,
+	use=vt102+enq, use=klone+sgr, use=ecma+color,
+	use=linux+lockeys, use=linux+sfkeys, use=vt220+ufkeys,
+
+# VT220 uses F1-F5 for "local" manipulation, normally not sending anything to
+# the host.  Rather than adapt the numbering scheme used by xterm, Linux used
+# this arrangement which doubles the "[", making it inconsistent with most
+# terminals having function-keys in the same format as control sequences -TD
+linux+lockeys|Linux "local" keys in vt220 scheme,
+	kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
 
 linux+decid|ncurses extension for Linux console DECID,
 	u8=\E[?6c, use=decid+cpr,
 
 linux+sfkeys|shifted function-keys for Linux console,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
+	use=vt220+sfkeys,
 
 linux-m|Linux console no color,
 	colors@, pairs@,
@@ -1140,34 +1145,29 @@ linux-vt|Linux console using VT codes for graphics,
 # of the functionality), but does not recognize as many control sequences.
 # The program comes bundled with an old (circa 1998) copy of the Linux
 # console terminfo.  It recognizes some non-ANSI/VT100 sequences such as
-#	\E*	move cursor to home, as as \E[H
+#	\E*	move cursor to home, as \E[H
 #	\E,X	same as \E(X
 #	\EE	move cursor to beginning of row
 #	\E[y,xf	same as \E[y,xH
 #
 # Note: The status-line support is buggy (dsl does not work).
 kon|kon2|Kanji ON Linux console,
-	am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon,
+	am, bce, ccc, eo, mir, msgr, xenl, xon,
 	it#8, ncv#18,
-	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
-	dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
-	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E,
+	el1=\E[1K, fsl=\E[?F, ht=^I, hts=\EH, ind=\n,
 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
-	kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[[B,
-	kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kspd=^Z,
-	nel=\r\n, op=\E[37;40m, ri=\EM, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec,
+	khome=\E[1~, kspd=^Z, nel=\r\n, ri=\EM, rs1=\Ec,
 	sgr=\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,
 	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+	use=ecma+underline, use=ecma+standout, use=vt220+cvis,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+local, use=ansi+sgrbold, use=ecma+sgr,
-	use=klone+color, use=vt220+pcedit,
+	use=ansi+local, use=ansi+sgrbold, use=ansi+rca2,
+	use=dec+sl, use=ecma+sgr, use=klone+color,
+	use=linux+lockeys, use=linux+sfkeys, use=vt220+ufkeys,
+	use=vt220+pcedit,
 
 # release: 0.4.7 2005/05
 #
@@ -1237,18 +1237,33 @@ bterm|bogl virtual terminal,
 	am, bce,
 	colors#8, cols#80, lines#24, pairs#64,
 	acsc=aajjkkllmmqqttuuxx, bold=\E[1m, clear=\E[H\E[2J,
-	cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J,
-	el=\E[K, home=\E[H, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
-	kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[[B,
-	kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
-	kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[49m\E[39m, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmso=\E[27m, rmul=\E[24m,
+	cr=\r, cub1=^H, cud1=\n, ed=\E[J, el=\E[K, ind=\n, kb2=\E[G,
+	kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M, kspd=^Z,
+	nel=\r\n, op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0m, smacs=^N,
-	smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=vt220+pcedit, use=vt220+cvis,
+	smul=\E[4m, use=ecma+underline, use=ecma+standout,
+	use=ansi+arrows, use=ansi+cup, use=linux+lockeys,
+	use=linux+sfkeys, use=vt220+pcedit, use=vt220+cvis,
+	use=vt220+ufkeys,
+
+# https://lists.gnu.org/archive/html/bug-ncurses/2025-04/msg00014.html
+sclp|IBM s390 driver for Linux,
+	xon,
+	cols#80, lines#24,
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+	bel=^G, blink=\E[5m, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, el1=\E[1K,
+	enacs=\E)0, ht=^I, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
+	kf5=\E[15~, khome=\E[1~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
+	rmacs=\E(B$<4>, sc=\E7,
+	sgr=\E[0%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
+	    \E(B%;$<2>,
+	sgr0=\E[m\E(B, smacs=\E(0$<2>, smul=\E[4m,
+	use=ecma+underline, use=ecma+standout, use=klone+color,
+	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
+	use=ansi+local, use=ansi+rca, use=linux+sfkeys,
+	use=vt100+pf1-pf4, use=vt220+ufkeys, use=vt220+pcedit,
 
 #### Mach
 #
@@ -1258,20 +1273,19 @@ mach|Mach console,
 	am, km, NQ,
 	cols#80, it#8, lines#25,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
-	home=\E[H, ht=^I, ind=\n, kbs=^?, kdch1=\E[9, kend=\E[Y,
-	kf1=\EOP, kf10=\EOY, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT,
-	kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@, kll=\E[F,
-	knp=\E[U, kpp=\E[V, rev=\E[7m, rmso=\E[0m, rmul=\E[24m,
-	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+idl, use=ansi+local,
+	cud1=\n, ed=\E[J, el=\E[K, ht=^I, ind=\n, kbs=^?, kdch1=\E[9,
+	kend=\E[Y, kf10=\EOY, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+	kf9=\EOX, kich1=\E[@, kll=\E[F, knp=\E[U, kpp=\E[V,
+	rev=\E[7m, rmso=\E[0m, sgr0=\E[0m, use=ecma+underline,
+	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=vt100+pf1-pf4,
 
 mach-bold|Mach console with bold instead of underline,
 	rmul=\E[0m, smul=\E[1m, use=mach,
 mach-color|Mach console with ANSI color,
 	colors#8, pairs#64,
-	dim=\E[2m, invis=\E[8m, op=\E[37;40m, rmso=\E[27m,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=mach,
+	dim=\E[2m, invis=\E[8m, op=\E[37;40m, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm, use=ecma+standout, use=mach,
 
 # From: Samuel Thibault
 # Source: git://git.sv.gnu.org/hurd/gnumach.git
@@ -1291,8 +1305,8 @@ mach-gnu|GNU Mach,
 
 mach-gnu-color|GNU Mach console with ANSI color,
 	colors#8, pairs#64,
-	op=\E[37;40m, rmso=\E[27m, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm, use=mach-gnu,
+	op=\E[37;40m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	use=ecma+standout, use=mach-gnu,
 
 # From: Marcus Brinkmann
 # http://git.savannah.gnu.org/cgit/hurd/hurd.git/log/console/
@@ -1329,22 +1343,19 @@ hurd|The GNU Hurd console server,
 	bel=^G, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H, cvvis=\E[34l,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
 	el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@, ind=\E[S,
-	kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\EOP, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[39;49m,
-	ri=\E[T, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	kb2=\E[G, kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M,
+	kspd=^Z, nel=\r\n, op=\E[39;49m, ri=\E[T, rmir=\E[4l,
 	rs1=\EM\E[?1000l,
 	sgr=\E[0%?%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,
 	smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
+	use=ecma+underline, use=ecma+standout,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
 	use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit,
 	use=ecma+index, use=ecma+italics, use=klone+acs,
-	use=klone+color, use=vt220+cvis,
+	use=klone+color, use=linux+sfkeys, use=vt100+pf1-pf4,
+	use=vt220+cvis, use=xterm+r5+fkeys,
 
 #### QNX
 #
@@ -1462,14 +1473,13 @@ qansi-g|QNX ANSI,
 	kLFT=\E[d, kNXT=\E[u, kOPT=\ENz, kPRV=\E[v, kRIT=\E[c,
 	kcan=\E[S, kcbt=\E[Z, kclo=\ENc, kclr=\ENa, kcmd=\E[G,
 	kcpy=\E[g, kctab=\E[z, kdch1=\E[P, kdl1=\E[p, kend=\E[Y,
-	kext=\E[y, kf1=\EOP, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
-	kf13=\EOp, kf14=\EOq, kf15=\EOr, kf16=\EOs, kf17=\EOt,
-	kf18=\EOu, kf19=\EOv, kf2=\EOQ, kf20=\EOw, kf21=\EOx,
-	kf22=\EOy, kf23=\EOz, kf24=\EOa, kf25=\E[1~, kf26=\E[2~,
-	kf27=\E[3~, kf28=\E[4~, kf29=\E[5~, kf3=\EOR, kf30=\E[6~,
-	kf31=\E[7~, kf32=\E[8~, kf33=\E[9~, kf34=\E[10~,
-	kf35=\E[11~, kf36=\E[12~, kf37=\E[17~, kf38=\E[18~,
-	kf39=\E[19~, kf4=\EOS, kf40=\E[20~, kf41=\E[21~,
+	kext=\E[y, kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf13=\EOp,
+	kf14=\EOq, kf15=\EOr, kf16=\EOs, kf17=\EOt, kf18=\EOu,
+	kf19=\EOv, kf20=\EOw, kf21=\EOx, kf22=\EOy, kf23=\EOz,
+	kf24=\EOa, kf25=\E[1~, kf26=\E[2~, kf27=\E[3~, kf28=\E[4~,
+	kf29=\E[5~, kf30=\E[6~, kf31=\E[7~, kf32=\E[8~, kf33=\E[9~,
+	kf34=\E[10~, kf35=\E[11~, kf36=\E[12~, kf37=\E[17~,
+	kf38=\E[18~, kf39=\E[19~, kf40=\E[20~, kf41=\E[21~,
 	kf42=\E[22~, kf43=\E[23~, kf44=\E[24~, kf45=\E[25~,
 	kf46=\E[26~, kf47=\E[27~, kf48=\E[28~, kf5=\EOT, kf6=\EOU,
 	kf7=\EOV, kf8=\EOW, kf9=\EOX, kfnd=\ENf, khlp=\ENh,
@@ -1478,7 +1488,7 @@ qansi-g|QNX ANSI,
 	kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg, kri=\E[b,
 	krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T, ktbc=\ENd,
 	kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m, ri=\E[T,
-	rmacs=^O, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
+	rmacs=^O, rmam=\E[?7l,
 	rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
@@ -1488,10 +1498,11 @@ qansi-g|QNX ANSI,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
-	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+arrows,
+	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
+	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
 	use=ansi+local, use=ansi+rep, use=ansi+inittabs,
 	use=ansi+sgrbold, use=att610+cvis0, use=decid+cpr,
-	use=ecma+index,
+	use=ecma+index, use=vt100+pf1-pf4,
 #
 qansi|QNX ANSI with console writes,
 	daisy, xhpa, use=qansi-g,
@@ -1523,8 +1534,8 @@ qansi-w|QNX ANSI for windows,
 #
 # klone+sgr-dumb is an error since the acsc does not match -TD
 #
-# In this description based on SCO's keyboard(HW) manpage list of default
-# function key values:
+# In this description based on SCO's keyboard(HW) man page list of
+# default function key values:
 #	F13-F24 are shifted F1-F12
 #	F25-F36 are control F1-F12
 #	F37-F48 are shift+control F1-F12
@@ -1547,26 +1558,26 @@ scoansi-old|SCO Extended ANSI standard crt (5.0.5),
 	     yszr{c}\034~\207,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
 	civis=\E[=14;12C, clear=\E[H\E[2J, cnorm=\E[=10;12C,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=0;12C,
-	dch=\E[%p1%dP, dch1=\E[P, dispc=\E[=%p1%dg, ed=\E[m\E[J,
-	el=\E[m\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m, kbeg=\E[E,
-	kcbt=\E[Z, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
-	kf11=\E[W, kf12=\E[X, kf13=\E[Y, kf15=\E[a, kf16=\E[b,
-	kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f,
-	kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k,
-	kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O,
-	kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t,
-	kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y,
-	kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\,
-	kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{,
-	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L,
-	knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8, rev=\E[7m,
-	ri=\E[T, rmacs=\E[10m, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
+	cub1=^H, cvvis=\E[=0;12C, dch=\E[%p1%dP, dch1=\E[P,
+	dispc=\E[=%p1%dg, ed=\E[m\E[J, el=\E[m\E[K, el1=\E[1K,
+	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
+	invis=\E[8m, kbeg=\E[E, kcbt=\E[Z, kdch1=^?, kend=\E[F,
+	kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, kf13=\E[Y,
+	kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d, kf19=\E[e,
+	kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h, kf23=\E[i,
+	kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m, kf28=\E[n,
+	kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q, kf32=\E[r,
+	kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v, kf37=\E[w,
+	kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z, kf41=\E[@,
+	kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^, kf46=\E[_,
+	kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T,
+	kf9=\E[U, kich1=\E[L, knp=\E[G, kpp=\E[I, op=\E[0;37;40m,
+	rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m, rmam=\E[?7l,
 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-	sgr0=\E[0;10m, smacs=\E[12m, smam=\E[?7h, smso=\E[7m,
-	smul=\E[4m, use=ansi+arrows, use=ansi+idl,
-	use=ansi+local, use=ecma+index,
+	sgr0=\E[0;10m, smacs=\E[12m, smam=\E[?7h,
+	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+	use=ecma+index,
 
 scoansi-new|SCO Extended ANSI standard crt (5.0.6),
 	km,
@@ -1625,9 +1636,8 @@ iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100),
 	cols#80, it#8, lines#40,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J,
 	cnorm=\E[9/y\E[12/y\E[=6l, cr=\r, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[10/y\E[=1h\E[=2l\E[=6h, ed=\E[J, el=\E[K,
-	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\ED,
+	el1=\E[1K, ht=^I, hts=\EH, ind=\ED,
 	is2=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8, kDC=\E[P,
 	kEND=\E[147q, kHOM=\E[143q, kLFT=\E[158q, kPRT=\E[210q,
 	kRIT=\E[167q, kSPD=\E[218q, kcbt=\E[Z, kdch1=^?,
@@ -1637,22 +1647,23 @@ iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100),
 	kf8=\E[008q, kf9=\E[009q, kich1=\E[139q, knp=\E[154q,
 	kpp=\E[150q, kprt=\E[209q, krmir=\E[146q, kspd=\E[217q,
 	nel=\EE, pfkey=\EP101;%p1%d.y%p2%s\E\\, rc=\E8,
-	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7,
-	sgr0=\E[m, smam=\E[?7h, smso=\E[1;7m, smul=\E[4m,
-	tbc=\E[3g, use=ansi+arrows, use=ansi+idl, use=ansi+local,
+	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[m, sc=\E7, sgr0=\E[m,
+	smam=\E[?7h, smso=\E[1;7m, tbc=\E[3g, use=ansi+arrows,
+	use=ansi+cup, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrul,
 
 iris-ansi-ap|IRIS ANSI in application-keypad mode,
 	is2=\E[?1l\E=\E[?7h, kent=\EOM, use=iris-ansi,
 
-# From the man-page, this is a quasi-vt100 emulator that runs on SGI's IRIX
+# From the man page, this is a quasi-vt100 emulator that runs on SGI's IRIX
 # (T.Dickey 98/1/24)
 iris-color|xwsh|IRIX ANSI with color,
 	ncv#33,
 	csr=\E[%i%p1%d;%p2%dr, dch=\E[%p1%dP, dim=\E[2m,
-	ech=\E[%p1%dX, ich=\E[%p1%d@, rmul=\E[24m, rs1=\Ec,
+	ech=\E[%p1%dX, ich=\E[%p1%d@, rs1=\Ec,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
-	use=ecma+italics, use=vt100+enq, use=klone+color,
-	use=iris-ansi-ap,
+	use=ecma+underline, use=ecma+italics, use=vt100+enq,
+	use=klone+color, use=iris-ansi-ap,
 
 #### OpenBSD consoles
 #
@@ -1669,51 +1680,48 @@ iris-color|xwsh|IRIX ANSI with color,
 # Notes from testing with vttest:
 #	fails wrapping test
 #	no 8-bit controls
-#	identifies as vt200 with selective erase, but does not implement DECSCA
+#	DA1 says vt200 with selective erase, but does not implement DECSCA
+#	DA2 says vt320, has DECTABSR
 #	no vt52 mode
 #	also lacks these:
 #		ESC # 8	  DEC Screen Alignment Test (DECALN).
 #		CSI ? 5 h Reverse Video (DECSCNM).
 #
 pccon+keys|OpenBSD PC keyboard keys,
-	kbs=^?, kend=\E[8~, kent=\r, kf1=\E[11~, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[35~,
-	kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~,
-	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, khome=\E[7~, krfr=^R, use=ansi+arrows,
-	use=vt220+pcedit,
+	kbs=^?, kend=\E[8~, kent=\r, kf21=\E[35~, kf22=\E[36~,
+	kf23=\E[37~, kf24=\E[38~, khome=\E[7~, krfr=^R,
+	use=ansi+arrows, use=vt220+pcedit, use=vt220+sfkeys,
+	use=xterm+r5+fkeys,
 pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
 	acsc=+>\,<-\^.v0#`+a:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#
 	     z#{*|!}#~o,
-	bold=\E[1m, rev=\E[7m, rmso=\E[27m,
+	bold=\E[1m, rev=\E[7m,
 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p6%t;1%;%?%p2%t;4%;m,
-	sgr0=\E[m, smso=\E[7m,
+	sgr0=\E[m, use=ecma+standout,
 pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bold=\E[1m, enacs=\E)0, rev=\E[7m, rmacs=\E(B, rmso=\E[27m,
+	bold=\E[1m, enacs=\E)0, rev=\E[7m, rmacs=\E(B,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
 	    \E(B%;,
-	sgr0=\E[m\E(B, smacs=\E(0, smso=\E[7m,
+	sgr0=\E[m\E(B, smacs=\E(0, use=ecma+standout,
 # underline renders as color
 pccon+colors|ANSI colors for OpenBSD PC console,
 	bce,
 	ncv#2,
 	op=\E[49;39m, use=klone+color,
-# OpenBSD uses wscons,
-# + which does not implement DECSCNM or anything comparable, so it does not
+# OpenBSD uses wscons, "imported" from NetBSD in 2000.
+# + it does not implement DECSCNM or anything comparable, so it does not
 #   support flash.
 # + it renders underline using color.
 pccon+base|base capabilities for OpenBSD PC console,
 	am, km, mc5i, msgr, npc, nxon, xenl, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED, nel=\EE,
-	ri=\EM, rmam=\E[?7l, rmul=\E[24m, rs2=\Ec, smam=\E[?7h,
-	smul=\E[4m, tbc=\E[3g, use=ansi+cpr, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P,
+	ech=\E[%p1%dX, el1=\E[1K, ht=^I, hts=\EH, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\ED, nel=\EE, ri=\EM, rmam=\E[?7l, rs2=\Ec,
+	smam=\E[?7h, smul=\E[4m, tbc=\E[3g, use=ecma+underline,
+	use=ansi+cpr, use=ansi+csr, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=xterm+keypad,
 
 pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
 	use=pccon+sgr+acs0, use=pccon+base, use=pccon+keys,
@@ -1744,19 +1752,19 @@ pcvtXX|pcvt VT200 emulator (DEC VT220),
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
+	dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, ind=\ED,
 	is1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kbs=^?,
 	kdch1=\E[3~, kf1=\E[17~, kf2=\E[18~, kf3=\E[19~,
 	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~,
 	khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~,
 	nel=\EE, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM,
 	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m,
 	rs1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m,
 	smacs=\E(0, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+apparrows,
-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	smul=\E[4m, tbc=\E[3g, use=ecma+underline,
+	use=ecma+standout, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
 	use=ansi+local, use=decid+cpr, use=ecma+index,
 	use=vt220+cvis,
 
@@ -1807,12 +1815,10 @@ pcvt50w|DEC VT220 emulation with 50 lines and 132 cols,
 #	OpenBSD implements a color variation
 pcvt25-color|DEC VT220 emulation with 25 lines and color,
 	cols#80, lines#25,
-	is2=\E[1;25r\E[25;1H, kf1=\EOP, kf10=\E[29~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf5=\E[17~,
-	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, use=pcvtXX,
-	use=ecma+color,
+	is2=\E[1;25r\E[25;1H, kf10=\E[29~, kf11=\E[23~,
+	kf12=\E[24~, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
+	kf8=\E[20~, kf9=\E[21~, use=vt100+pf1-pf4, use=pcvtXX,
+	use=ecma+color, use=vt220+sfkeys,
 
 # Terminfo entries to enable the use of the ncurses library in colour on a
 # NetBSD-arm32 console (only tested on a RiscPC).
@@ -1886,10 +1892,9 @@ ofcons|DNARD OpenFirmware console,
 wsvt25|NetBSD wscons in 25 line DEC VT220 mode,
 	bce,
 	colors#8, lines#25, pairs#64,
-	is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, kf1=\E[11~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	khome=\E[7~, op=\E[m, rs1=\Ec, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm, use=vt220,
+	is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, khome=\E[7~,
+	op=\E[m, rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	use=xterm+r5+lockeys, use=vt220,
 
 wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta,
 	km, use=wsvt25,
@@ -1949,17 +1954,17 @@ mgterm|MGL/MGL2 MobileGear Graphic Library,
 	OTbs, OTpt, am, bce, bw, eo, km, msgr, npc,
 	colors#8, cols#80, it#8, lines#18, pairs#64,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[30;1m, ech=\E[%p1%dX, el1=\E[1K, home=\E[H,
-	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
-	kb2=\E[E, kcbt=\E[Z, kdch1=^?, kend=\E[F, kf1=\E[M,
-	kf10=\E[V, kf11=\E[W, kf12=\E[X, kf2=\E[N, kf3=\E[O,
-	kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U,
-	kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rev=\E[7m,
-	ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, setb=\E[4%p1%dm,
-	setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=ecma+index,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX,
+	el1=\E[1K, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\E[S, kb2=\E[E, kcbt=\E[Z, kdch1=^?,
+	kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X,
+	kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S,
+	kf8=\E[T, kf9=\E[U, kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E,
+	op=\E[x, rev=\E[7m, ri=\E[T, rs2=\E[x\E[m\Ec,
+	setb=\E[4%p1%dm, setf=\E[3%p1%dm, sgr0=\E[m,
+	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ecma+index,
 
 #### FreeBSD console entries
 
@@ -1997,27 +2002,27 @@ cons25w|ansiw|ansi80x25-raw|FreeBSD console (25-line raw mode),
 	am, bce, bw, eo, msgr, npc,
 	cols#80, it#8, lines#25, ncv#21,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cnorm=\E[=0C,
-	cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=1C,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX,
-	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
-	ich1=\E[@, ind=\E[S, kb2=\E[E, kcbt=\E[Z, kdch1=^?,
-	kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X,
-	kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b, kf17=\E[c,
-	kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g,
-	kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l,
-	kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p,
-	kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u,
-	kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P,
-	kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[],
-	kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q,
-	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L, knp=\E[G,
-	kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T,
-	rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
+	cr=\r, cub1=^H, cvvis=\E[=1C, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[30;1m, ech=\E[%p1%dX, hpa=\E[%i%p1%d`, ht=^I,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, kb2=\E[E, kcbt=\E[Z,
+	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
+	kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b,
+	kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f,
+	kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k,
+	kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O,
+	kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t,
+	kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y,
+	kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\,
+	kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{,
+	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L,
+	knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m,
+	ri=\E[T, rs2=\E[x\E[m\Ec, sc=\E7,
 	sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;30;1%;%?
 	    %p6%t;1%;m,
-	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ecma+index, use=klone+color,
+	sgr0=\E[m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ecma+index,
+	use=klone+color,
 
 cons25|ansis|ansi80x25|FreeBSD console (25-line ANSI mode),
 	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l
@@ -2028,9 +2033,8 @@ cons25-debian|FreeBSD console with debian backspace (25-line ANSI mode),
 	kbs=^?, kdch1=\E[3~, use=cons25,
 cons25-m|ansis-mono|ansi80x25-mono|FreeBSD console (25-line mono ANSI mode),
 	colors@, pairs@,
-	bold@, dim@, op@, rmul=\E[m, setab@, setaf@,
-	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m,
-	smul=\E[4m, use=cons25,
+	bold@, dim@, op@, setab@, setaf@,
+	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m, use=ansi+sgrul, use=cons25,
 cons30|ansi80x30|FreeBSD console (30-line ANSI mode),
 	lines#30, use=cons25,
 cons30-m|ansi80x30-mono|FreeBSD console (30-line mono ANSI mode),
@@ -2054,10 +2058,10 @@ cons25r|pc3r|ibmpc3r|cons25-koi8-r|FreeBSD console w/koi8-r cyrillic,
 	use=cons25w,
 cons25r-m|pc3r-m|ibmpc3r-mono|cons25-koi8r-m|FreeBSD console w/koi8-r cyrillic (mono),
 	colors@, pairs@,
-	op@, rmul=\E[m, setab@, setaf@,
+	op@, setab@, setaf@,
 	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
 	    %t;30;1%;%?%p6%t;1%;m,
-	smul=\E[4m, use=cons25r,
+	use=ansi+sgrul, use=cons25r,
 cons50r|cons50-koi8r|FreeBSD console w/koi8-r cyrillic (50 lines),
 	lines#50, use=cons25r,
 cons50r-m|cons50-koi8r-m|FreeBSD console w/koi8-r cyrillic (50-line mono),
@@ -2074,9 +2078,8 @@ cons25l1|cons25-iso8859|FreeBSD console w/iso 8859-1 chars,
 	use=cons25w,
 cons25l1-m|cons25-iso-m|FreeBSD console w/iso 8859-1 chars (mono),
 	colors@, pairs@,
-	bold@, dim@, op@, rmul=\E[m, setab@, setaf@,
-	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m,
-	smul=\E[4m, use=cons25l1,
+	bold@, dim@, op@, setab@, setaf@,
+	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m, use=ansi+sgrul, use=cons25l1,
 cons50l1|cons50-iso8859|FreeBSD console w/iso 8859-1 chars (50 lines),
 	lines#50, use=cons25l1,
 cons50l1-m|cons50-iso-m|FreeBSD console w/iso 8859-1 chars (50-line mono),
@@ -2180,30 +2183,27 @@ teken-2018|teken as of 2018,
 	acsc=0\333a\260f\370g\361h\261j\331k\277l\332m\300n\305q
 	     \304t\303u\264v\301w\302x\263y\363z\362~\371,
 	cvvis@, hpa=\E[%i%p1%dG, hts=\EH, kdch1=\E[3~, kent=\r,
-	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	rmir=\E[4l, smir=\E[4h, tbc=\E[3g, use=vt220+cvis,
-	use=cons25,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5=\E[15~,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, rmir=\E[4l, smir=\E[4h,
+	tbc=\E[3g, use=vt100+pf1-pf4, use=vt220+cvis, use=cons25,
 
 teken-2022|teken as of 2022,
 	am, bce, eo, mir, msgr, npc, NQ,
 	cols#80, it#8, lines#25, ncv#21, U8#1,
 	bold=\E[1m, cr=\r, cub1=^H, dim=\E[30;1m, ech=\E[%p1%dX,
 	ind=\E[S, kent=\r, nel=\E[E, op=\E[x, rev=\E[7m, ri=\E[T,
-	rmso=\E[27m, rs2=\E[x\E[m\Ec,
+	rs2=\E[x\E[m\Ec,
 	sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p5%t;30;1%;%?%p6%t;1%;m,
-	sgr0=\E[m, use=vt220+cvis, use=ecma+index,
-	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	sgr0=\E[m, use=ecma+standout, use=vt220+cvis,
+	use=ecma+index, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+local, use=ansi+rca2, use=ansi+sgrso,
 	use=ansi+tabs, use=klone+color,
 
 teken-vt+fkeys|teken's xterm special keys,
-	kend=\E[F, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
-	use=vt220+pcedit,
+	kend=\E[F, khome=\E[H, use=vt100+pf1-pf4,
+	use=vt220+pcedit, use=xterm+r5+fkeys,
 
 teken-sc+fkeys|teken's syscons special keys,
 	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
@@ -2243,9 +2243,9 @@ origpc3|origibmpc3|IBM PC 386BSD console,
 oldpc3|oldibmpc3|old IBM PC BSD/386 console,
 	OTbs, km,
 	lines#25,
-	bel=^G, bold=\E[=15F, cr=\r, cud1=\n, dim=\E[=8F, dl1=\E[M,
-	ht=^I, il1=\E[L, ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G,
-	kpp=\E[I, nel=\r\n, sgr0=\E[=R, use=ansi+arrows,
+	bel=^G, bold=\E[=15F, cr=\r, cud1=\n, dim=\E[=8F, ht=^I,
+	ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, kpp=\E[I, nel=\r\n,
+	sgr0=\E[=R, use=ansi+arrows, use=ansi+idl1,
 
 # Description of BSD/OS console emulator in version 1.1, 2.0, 2.1
 # Note, the emulator supports many of the additional console features
@@ -2266,14 +2266,13 @@ bsdos-pc-nobold|BSD/OS PC console w/o bold,
 bsdos-pc-m|bsdos-pc-mono|BSD/OS PC console mono,
 	OTbs, am, eo, km, xon,
 	cols#80, it#8, lines#25,
-	bel=^G, clear=\Ec, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, kpp=\E[I, nel=\r\n,
-	rc=\E8, sc=\E7,
+	bel=^G, clear=\Ec, cr=\r, cub1=^H, cud1=\n, ed=\E[J, el=\E[K,
+	ht=^I, ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, kpp=\E[I,
+	nel=\r\n, rc=\E8, sc=\E7,
 	sgr=\E[0;10%?%p1%t;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7
 	    %t;8%;%?%p9%t;11%;m%?%p5%t\E[=8F%;,
-	use=ansi+arrows, use=ansi+idl, use=ansi+local,
-	use=klone+sgr8,
+	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
+	use=ansi+local, use=klone+sgr8,
 
 # Old names for BSD/OS PC console used in releases before 4.1.
 pc3|BSD/OS on the PC console,
@@ -2438,9 +2437,10 @@ vt52+arrows|cursor keys for VT52,
 # support:
 vt100+keypad|DEC VT100 numeric keypad no fkeys,
 	ka1=\EOq, ka3=\EOs, kb2=\EOr, kc1=\EOp, kc3=\EOn,
+vt100+pf1-pf4|DEC VT100 PF1-PF4,
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 vt100+pfkeys|DEC VT100 numeric keypad (kf1-kf4),
-	kent=\EOM, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	use=vt100+keypad,
+	kent=\EOM, use=vt100+pf1-pf4, use=vt100+keypad,
 vt100+fnkeys|DEC VT100 numeric keypad (kf0-kf10),
 	kf0=\EOy, kf10=\EOx, kf5=\EOt, kf6=\EOu, kf7=\EOv, kf8=\EOl,
 	kf9=\EOw, use=vt100+pfkeys,
@@ -2555,8 +2555,8 @@ 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,
 	xmc#1,
-	blink@, bold@, rev@, rmso=\E[m, rmul@, sgr@, sgr0@, smso=\E[7m,
-	smul@, use=vt100,
+	blink@, bold@, rev@, rmul@, sgr@, sgr0@, smul@, use=ansi+sgrso,
+	use=vt100,
 vt100-nav-w|vt100-w-nav|DEC VT100 132 cols 14 lines (no advanced video option),
 	cols#132, lines#14, use=vt100-nav,
 
@@ -2582,7 +2582,7 @@ vt100-s-bot|vt100-bot-s|VT100 for use with bottom sysline,
 # This entry (or vt102-nsgr) is probably the right thing to use for
 # these.
 vt102|DEC VT102,
-	dch1=\E[P, dl1=\E[M, il1=\E[L, rmir=\E[4l, smir=\E[4h,
+	dch1=\E[P, rmir=\E[4l, smir=\E[4h, use=ansi+idl1,
 	use=vt100,
 vt102-w|DEC VT102 in wide mode,
 	cols#132,
@@ -2615,13 +2615,13 @@ vt131|DEC VT131,
 	cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>,
 	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
 	ht=^I, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, nel=\r\n, rev=\E[7m$<2/>, ri=\EM$<5/>,
-	rmam=\E[?7h, rmkx=\E[?1l\E>, rmso=\E[m$<2/>,
-	rmul=\E[m$<2/>,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, nel=\r\n,
+	rev=\E[7m$<2/>, ri=\EM$<5/>, rmam=\E[?7h, rmkx=\E[?1l\E>,
+	rmso=\E[m$<2/>, rmul=\E[m$<2/>,
 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr0=\E[m$<2/>, smam=\E[?7h, smkx=\E[?1h\E=,
 	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+csr,
+	use=vt100+pf1-pf4,
 
 # 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
@@ -2648,21 +2648,19 @@ vt220-old|vt200-old|DEC VT220 in VT100 emulation mode,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
 	clear=\E[H\E[2J$<50>, cr=\r, cub1=^H,
 	cup=\E[%i%p1%d;%p2%dH$<10>, dch1=\E[P, ed=\E[J$<50>,
-	el=\E[K$<3>, home=\E[H, ht=^I,
-	if=/usr/share/tabset/vt100, ind=\ED$<20/>,
-	is2=\E[1;24r\E[24;1H, kf1=\EOP, kf10=\E[29~, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
-	kf8=\E[20~, kf9=\E[21~, khome=\E[1~, kich1=\E[2~,
-	rev=\E[7m$<2>, rf=/usr/share/tabset/vt100,
+	el=\E[K$<3>, ht=^I, if=/usr/share/tabset/vt100,
+	ind=\ED$<20/>, is2=\E[1;24r\E[24;1H, kf10=\E[29~,
+	kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~,
+	khome=\E[1~, rev=\E[7m$<2>, rf=/usr/share/tabset/vt100,
 	ri=\EM$<14/>, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
-	rmso=\E[27m, rmul=\E[24m,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
 	    %p9%t\E(0%e\E(B%;$<2>,
 	sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
-	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+csr,
-	use=ansi+idl1, use=ansi+local1, use=vt220+pcedit,
-	use=vt220+cvis,
+	smul=\E[4m, use=ecma+underline, use=ecma+standout,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+idl1, use=ansi+local1, use=ansi+sgrso,
+	use=vt100+pf1-pf4, use=vt220+pcedit, use=vt220+cvis,
 
 # Here's a picture of the Sun/PC editing keypad:
 #	+--------+--------+--------+
@@ -2710,20 +2708,19 @@ vt220-base|DEC VT220 as emulated,
 	enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH,
 	ich=\E[%p1%d@, if=/usr/share/tabset/vt100, ind=\ED,
 	is2=\E[?7h\E[>\E[?1l\E F\E[?4l, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ,
-	kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, lf1=pf1,
-	lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM,
-	rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E[?3l,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf13=\E[25~,
+	kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
+	kf20=\E[34~, khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2,
+	lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B$<4>,
+	rmam=\E[?7l, rmir=\E[4l, rs1=\E[?3l,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
 	    %p9%t\E(0%e\E(B%;$<2>,
 	sgr0=\E[m\E(B, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr,
-	use=ansi+cup, use=ansi+pp, use=ansi+enq, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=vt220+vtedit,
+	smul=\E[4m, tbc=\E[3g, use=ecma+underline,
+	use=ecma+standout, use=ansi+csr, use=ansi+cup,
+	use=ansi+pp, use=ansi+enq, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=vt100+pf1-pf4, use=vt220+vtedit,
+	use=vt220+ufkeys,
 
 vt220|vt200|DEC VT220,
 	use=vt220+cvis, use=vt220-base,
@@ -2745,20 +2742,20 @@ vt220-8bit|vt220-8|vt200-8bit|vt200-8|DEC VT220/200 in 8-bit mode,
 	il=\233%p1%dL, il1=\233L, ind=\ED,
 	is2=\233?7h\233>\233?1l\E F\233?4l, kbs=^H,
 	kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A,
-	kdch1=\2333~, kf1=\EOP, kf10=\23321~, kf11=\23323~,
-	kf12=\23324~, kf13=\23325~, kf14=\23326~, kf17=\23331~,
-	kf18=\23332~, kf19=\23333~, kf2=\EOQ, kf20=\23334~,
-	kf3=\EOR, kf4=\EOS, kf6=\23317~, kf7=\23318~, kf8=\23319~,
-	kf9=\23320~, kfnd=\2331~, khlp=\23328~, khome=\233H,
-	kich1=\2332~, knp=\2336~, kpp=\2335~, krdo=\23329~,
-	kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, mc0=\233i,
-	mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8, rev=\2337m, ri=\EM,
-	rmacs=\E(B, rmam=\233?7l, rmir=\2334l, rmso=\23327m,
-	rmul=\23324m, rs1=\233?3l, sc=\E7,
+	kdch1=\2333~, kf10=\23321~, kf11=\23323~, kf12=\23324~,
+	kf13=\23325~, kf14=\23326~, kf17=\23331~, kf18=\23332~,
+	kf19=\23333~, kf20=\23334~, kf6=\23317~, kf7=\23318~,
+	kf8=\23319~, kf9=\23320~, kfnd=\2331~, khlp=\23328~,
+	khome=\233H, kich1=\2332~, knp=\2336~, kpp=\2335~,
+	krdo=\23329~, kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3,
+	lf4=pf4, mc0=\233i, mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8,
+	rev=\2337m, ri=\EM, rmacs=\E(B, rmam=\233?7l, rmir=\2334l,
+	rmso=\23327m, rmul=\23324m, rs1=\233?3l, sc=\E7,
 	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m
 	    %?%p9%t\E(0%e\E(B%;$<2>,
 	sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, smir=\2334h,
-	smso=\2337m, smul=\2334m, tbc=\2333g, use=vt220+cvis8,
+	smso=\2337m, smul=\2334m, tbc=\2333g, use=vt100+pf1-pf4,
+	use=vt220+cvis8,
 
 # vt220d:
 # This VT220 description regards F6--F10 as the second block of function keys
@@ -2768,10 +2765,17 @@ vt220-8bit|vt220-8|vt200-8bit|vt200-8|DEC VT220/200 in 8-bit mode,
 # See vt220 for an alternate mapping.
 #
 vt220d|DEC VT220 in VT100 mode with DEC function key labeling,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
-	kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kf5@, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, use=vt220-old,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5@, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, use=vt220+sfkeys,
+	use=vt220-old,
+
+# These are often mapped to unshifted/shifted keys on PC-keyboards -TD
+vt220+ufkeys|first 8 function-keys for VT220,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5@, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+vt220+sfkeys|second 8 function-keys for VT220,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
 
 vt220-nam|v200-nam|VT220 in VT100 mode with no auto margins,
 	am@,
@@ -2796,18 +2800,18 @@ vt220-nam|v200-nam|VT220 in VT100 mode with no auto margins,
 vt200-js|vt220-js|DEC VT200 series with jump scroll,
 	am, msgr,
 	cols#80,
-	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
-	home=\E[H, ht=^I, il1=\E[L, ind=\ED,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\E[A,
+	dch1=\E[P, ht=^I, ind=\ED,
 	is2=\E[61"p\E[H\E[?3l\E[?4l\E[?1h\E[?5l\E[?6l\E[?7h\E[?8h\E[
 	    ?25h\E>\E[m,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED,
-	rf=/usr/share/tabset/vt100, ri=\EM, rmdc=, rmir=\E[4l,
-	rmkx=\E[?1l\E>, rmso=\E[27m$<5/>, rmul=\E[24m,
+	nel=\r\ED, rf=/usr/share/tabset/vt100, ri=\EM, rmdc=,
+	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m$<5/>,
 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smdc=,
 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m$<5/>, smul=\E[4m,
-	use=ansi+csr, use=ansi+erase, use=vt220+cvis,
+	use=ecma+underline, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl1, use=vt100+pf1-pf4,
+	use=vt220+cvis,
 
 # This was DEC's VT320.  Use the purpose-built one below instead
 #vt320|DEC VT320 in VT100 emulation mode,
@@ -2838,27 +2842,23 @@ vt320|vt300|DEC VT320 7 bit terminal,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
+	cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX,
+	el1=\E[1K, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
-	kbs=^?, kdch1=\E[3~, kel=\E[4~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, knxt=^I,
-	kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rev=\E[7m,
+	kbs=^?, kdch1=\E[3~, kel=\E[4~, kf12=\E[24~, khome=\E[1~,
+	kich1=\E[2~, knp=\E[6~, knxt=^I, kpp=\E[5~, kprv=\E[Z,
+	kslt=\E[4~, nel=\EE, rev=\E[7m,
 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
-	rmul=\E[m,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
 	    %p9%t\E(0%e\E(B%;$<2>,
 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	use=ansi+apparrows, use=ansi+csr, use=ansi+enq,
-	use=ansi+idl, use=ansi+local, use=dec+pp, use=vt220+cvis,
-	use=vt220+keypad, use=dec+sl,
+	smkx=\E[?1h\E=, tbc=\E[3g, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
+	use=ansi+sgrul, use=dec+pp, use=dec+sl, use=vt220+cvis,
+	use=vt220+keypad, use=vt220+sfkeys, use=vt220+ufkeys,
 
 vt320-nam|vt300-nam|DEC VT320 7 bit terminal with no am to make SAS happy,
 	am@,
@@ -2899,25 +2899,24 @@ vt340|dec-vt340|vt330|dec-vt330|DEC VT340 graphics terminal with 24 line page,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dsl=\E[2$~\r\E[1$}\E[K\E[$},
-	flash=\E[?5h$<200/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I,
-	hts=\EH, ich=\E[%p1%d@, ind=\ED,
+	dch=\E[%p1%dP, dch1=\E[P, dsl=\E[2$~\r\E[1$}\E[K\E[$},
+	flash=\E[?5h$<200/>\E[?5l, fsl=\E[$}, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, ind=\ED,
 	is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r
 	    \E[24;1H,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
-	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
+	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E[?3l,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rs1=\E[?3l,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
 	    %p9%t\E(0%e\E(B%;$<2>,
 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=vt220+cvis,
+	smkx=\E[?1h\E=, smul=\E[4m, tbc=\E[3g,
+	tsl=\E[2$~\E[1$}\E[1;%dH, use=ecma+underline,
+	use=ecma+standout, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=vt100+pf1-pf4, use=vt220+cvis,
 
 # Left/right margins are supported in xterm since patch #279 (2012/05/10)
 vt420+lrmm|VT420 left/right margins,
@@ -2947,7 +2946,7 @@ vt420+lrmm|VT420 left/right margins,
 # (vt400: string capability ":sb=\E[M:" corrected to ":sr=\E[M:";
 # also, added <rmam>/<smam> based on the init string -- esr)
 vt400|vt400-24|dec-vt400|DEC VT400 24x80 column autowrap,
-	am, eslok, mir, msgr, xenl, xon,
+	am, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<10/>, cr=\r,
@@ -2957,18 +2956,17 @@ vt400|vt400-24|dec-vt400|DEC VT400 24x80 column autowrap,
 	is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r
 	    \E[24;1H,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
-	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
+	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-	rs1=\E<\E[?3l\E[!p\E[?7h,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rs1=\E<\E[?3l\E[!p\E[?7h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
 	    %p9%t\E(0%e\E(B%;$<2>,
 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+cup,
-	use=ansi+idc, use=ansi+idl, use=ansi+local, use=dec+sl,
+	smul=\E[4m, tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH,
+	use=ecma+underline, use=ecma+standout, use=ansi+csr,
+	use=ansi+cup, use=ansi+idc, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso, use=dec+sl, use=vt100+pf1-pf4,
 	use=vt220+cvis,
 
 # (vt420: I removed <kf0>, it collided with <kf10>.  I also restored
@@ -2986,19 +2984,20 @@ vt420|DEC VT420,
 	hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt300,
 	ind=\ED, is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p,
 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~,
-	nel=\EE, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
-	ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+	kf10=\E[29~, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
+	kf8=\E[20~, kf9=\E[21~, nel=\EE, rev=\E[7m$<2>,
+	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
 	rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
-	rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p,
+	rs3=\E[?67h\E[64;1"p,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
 	    %p9%t\E(0%e\E(B%;$<2>,
 	sgr0=\E[m\E(B$<2>, smacs=\E(0$<2>, smam=\E[?7h,
-	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+pp,
-	use=ansi+local, use=dec+sl, use=vt220+cvis,
-	use=vt420+lrmm, use=vt220+vtedit,
+	smir=\E[4h, smkx=\E=, tbc=\E[3g, use=ecma+underline,
+	use=ecma+standout, use=ansi+csr, use=ansi+enq,
+	use=ansi+idl, use=ansi+pp, use=ansi+local, use=dec+sl,
+	use=vt100+pf1-pf4, use=vt220+cvis, use=vt420+lrmm,
+	use=vt220+vtedit,
 
 # DEC VT220 and up support DECUDK (user-defined keys).  DECUDK (i.e., pfx)
 # takes two parameters, the key and the string.  Translating the key is
@@ -3017,24 +3016,24 @@ vt420|DEC VT420,
 # application has to know it.
 #
 vt420pc|DEC VT420 w/PC keyboard,
-	kdch1=^?, kend=\E[4~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+	kdch1=^?, kend=\E[4~, kf10=\E[21~, kf11=\E[23~,
 	kf12=\E[24~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~,
 	kf16=\E[14;2~, kf17=\E[15;2~, kf18=\E[17;2~,
-	kf19=\E[18;2~, kf2=\E[12~, kf20=\E[19;2~, kf21=\E[20;2~,
+	kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~,
 	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[23~,
 	kf26=\E[24~, kf27=\E[25~, kf28=\E[26~, kf29=\E[28~,
-	kf3=\E[13~, kf30=\E[29~, kf31=\E[31~, kf32=\E[32~,
-	kf33=\E[33~, kf34=\E[34~, kf35=\E[35~, kf36=\E[36~,
-	kf37=\E[23;2~, kf38=\E[24;2~, kf39=\E[25;2~, kf4=\E[14~,
-	kf40=\E[26;2~, kf41=\E[28;2~, kf42=\E[29;2~,
-	kf43=\E[31;2~, kf44=\E[32;2~, kf45=\E[33;2~,
-	kf46=\E[34;2~, kf47=\E[35;2~, kf48=\E[36;2~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+	kf30=\E[29~, kf31=\E[31~, kf32=\E[32~, kf33=\E[33~,
+	kf34=\E[34~, kf35=\E[35~, kf36=\E[36~, kf37=\E[23;2~,
+	kf38=\E[24;2~, kf39=\E[25;2~, kf40=\E[26;2~,
+	kf41=\E[28;2~, kf42=\E[29;2~, kf43=\E[31;2~,
+	kf44=\E[32;2~, kf45=\E[33;2~, kf46=\E[34;2~,
+	kf47=\E[35;2~, kf48=\E[36;2~, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[H,
 	pctrm=USR_TERM:vt420pcdos:,
 	pfx=\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\\,
-	use=vt420,
+	use=xterm+r5+lockeys, use=vt420,
 
 vt420pcdos|DEC VT420 w/PC for DOS Merge,
 	lines#25,
@@ -3045,12 +3044,8 @@ vt420pcdos|DEC VT420 w/PC for DOS Merge,
 	sgr0=\E[m, smsc=\E[?1;2r\E[34h, use=vt420pc,
 
 vt420f|DEC VT420 with VT kbd; VT400 mode; F1-F5 used as Fkeys,
-	kdch1=^?, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-	kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[H, lf1=\EOP, lf2=\EOQ, lf3=\EOR, lf4=\EOS,
+	kdch1=^?, kf10=\E[21~, khome=\E[H, lf1=\EOP, lf2=\EOQ,
+	lf3=\EOR, lf4=\EOS, use=vt220+sfkeys, use=xterm+r5+fkeys,
 	use=vt420,
 
 vt510|DEC VT510,
@@ -3076,9 +3071,20 @@ vt510pcdos|DEC VT510 w/PC for DOS Merge,
 vt520|DEC VT520,
 	use=ansi+rca, use=vt420, use=ansi+tabs,
 
+vt520-w|DEC VT520 in wide mode,
+	cols#132, use=vt520,
+
+# See "4.7.5 Visual Attributes Control Functions" and
+# "Table 5-15 (Cont.) Visual Character Attribute Values"
+# in EK-VT520-RM
 vt525|DEC VT525,
+	colors#8, pairs#64,
+	op=\E[39;49m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	use=vt520,
 
+vt525-w|DEC VT525 in wide mode,
+	cols#132, use=vt525,
+
 # I just got a brand new Boundless VT520 with that company's "ANSI 2011"
 # Keyboard, which replaces the old LK41R-AA keyboard.
 #
@@ -3125,10 +3131,9 @@ z340-nam|ZSTEM VT340 terminal emulator 132col 42line (no automatic margins),
 # The missing "=" in smkx is not a typo (here), but an error in tkterm.
 tt|tkterm|Don Libes' tk text widget terminal emulator,
 	clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%p1%d;%p2%dH, cuu1=\E[A, ind=\n, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
-	kf9=\EOX, rmkx=\E[?1l\E>, rmso=\E[m, smkx=\E[?1h\E,
-	smso=\E[7m,
+	cup=\E[%p1%d;%p2%dH, cuu1=\E[A, ind=\n, kf5=\EOT, kf6=\EOU,
+	kf7=\EOV, kf8=\EOW, kf9=\EOX, rmkx=\E[?1l\E>,
+	smkx=\E[?1h\E, use=ansi+sgrso, use=vt100+pf1-pf4,
 
 ######## APPLE
 
@@ -3228,7 +3233,7 @@ tt|tkterm|Don Libes' tk text widget terminal emulator,
 #   my faulty memory, and the following online sources and references:
 #
 # [1] "Three Scotts and a Duane" by Simson L. Garfinkel
-# http://www.nextcomputers.org/NeXTfiles/Articles/NeXTWORLD/93.8/93.8.Dec.Community1.html
+# https://web.archive.org/web/20121019083801/http://www.nextcomputers.org/NeXTfiles/Articles/NeXTWORLD/93.8/93.8.Dec.Community1.html
 #
 # [2] NeXTSTEP entry from Wikipedia, the free encyclopedia
 # https://secure.wikimedia.org/wikipedia/en/wiki/Nextstep
@@ -3457,14 +3462,11 @@ nsterm-c-s|AppKit Terminal.app v51+ w/MacRoman charset (full color w/statusline)
 # vt52, vt100, vt102 and xterm.
 nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5,
 	bw@, mir, npc,
-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
-	kdch1=\E[3~, kend=\E[F, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-	kf16=\E[29~, kf17=\E[31~, kf18=\E[22~, kf19=\E[33~,
-	kf20=\E[34~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[H, knp=\E[6~, kpp=\E[5~,
-	vpa=\E[%i%p1%dd, kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc,
-	use=xterm+alt47, use=nsterm-c-s-acs, use=vt220+cvis,
+	flash=\E[?5h$<200/>\E[?5l, kdch1=\E[3~, kend=\E[F,
+	kf18=\E[22~, kf5=\E[15~, khome=\E[H, knp=\E[6~, kpp=\E[5~,
+	kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc, use=ansi+rca2,
+	use=vt220+cvis, use=vt220+sfkeys, use=vt220+ufkeys,
+	use=xterm+alt47, use=nsterm-c-s-acs,
 
 # The versions of Terminal.app in Mac OS X version 10.3.x seem to have
 # the background color erase feature. The newer version 240.2 in Mac OS X
@@ -3525,7 +3527,8 @@ nsterm-bce|AppKit Terminal.app v71+/v100.1.8+ with Mac OS X version 10.3/10.4 (b
 # Earlier reports state that these differences also apply to OS X 10.7 (Lion),
 #	TERM_PROGRAM_VERSION=303
 nsterm-build309|Terminal.app in OS X 10.8,
-	use=xterm+256setaf, use=nsterm-bce,
+	use=bracketed+paste, use=xterm+256setaf,
+	use=nsterm-bce,
 
 # removed bogus kDC7 -TD
 nsterm-build326|Terminal.app in OS X 10.9,
@@ -3585,8 +3588,9 @@ nsterm-build361|Terminal.app in OS X 10.11,
 #
 # Improved rmso/rmul -TD
 nsterm-build400|Terminal.app in OS X 10.13,
-	rmso=\E[27m, rmul=\E[24m, use=xterm+sm+1006,
-	use=ecma+italics, use=nsterm-build361,
+	use=ecma+underline, use=ecma+standout,
+	use=xterm+sm+1006, use=ecma+italics,
+	use=nsterm-build361,
 
 nsterm-build440|Terminal.app in MacOS 11.6.8,
 	use=xterm+alt1049, use=nsterm-build400,
@@ -3636,29 +3640,79 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 	wsl#50,
 	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K,
-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
-	kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~,
-	kend=\EOF, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	flash=\E[?5h$<200/>\E[?5l, kLFT=\E[1;2D, kRIT=\E[1;2C,
+	kbs=^?, kcbt=\E[Z, kdch1=\E[3~, kend=\EOF, knp=\E[6~,
+	kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM, rmam=\E[?7l,
+	rmkx=\E[?1l\E>,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
 	    %p9%t\016%e\017%;,
-	sgr0=\E[m\017, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, vpa=\E[%i%p1%dd, kEND5=\E[1;5F,
-	kHOM5=\E[1;5H, use=ansi+apparrows, use=ansi+csr,
-	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+local, use=vt100+4bsd, use=vt100+keypad,
-	use=vt100+pfkeys, use=xterm+alt47, use=xterm+sl-twm,
-	use=xterm+x11mouse, use=xterm+256setaf, use=vt220+cvis,
+	sgr0=\E[m\017, smam=\E[?7h, smkx=\E[?1h\E=,
+	kEND5=\E[1;5F, kHOM5=\E[1;5H, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+enq, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ansi+local, use=ansi+rca2,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt100+4bsd,
+	use=vt100+keypad, use=vt100+pfkeys, use=xterm+r5+fkeys,
+	use=xterm+alt47, use=xterm+sl-twm, use=xterm+x11mouse,
+	use=xterm+256setaf, use=vt220+cvis,
 
-# iTerm2 3.0.15
+# iTerm2
 #
 # https://iterm2.com/
 # https://github.com/gnachman/iTerm2
 # ~/Library/Preferences/com.googlecode.iterm2.plist
 # "iTerm" stalled in 2009.  A different set of developers began "iTerm2".
 #
+# iTerm2 3.5.0
+#
+# NOTES:
+# with esctest:
+#	365 tests passed, 196 known bugs, 2 tests fail intermittently
+#	the known bugs include several of the cursor-movement tests
+#	the ED, EL tests include those failing intermittently
+#	DECCOLM, DECERA, DECSED, DECSERA and SPA do not work
+#	most of the DECRPM, DECRQSS reports fail
+# with vttest:
+#	reports primary DA as VT420
+#	VT420 rectangular operations, as well as DECBI/DEVFI work with margins
+#	SRM does not work
+#	DECSED, and SPA do not work
+#	REP and SD work, SL/SR/SU do not work
+# with tack:
+#	status-line does not work
+#
+# The default settings have blinking-text and keypad-application mode disabled.
+# Enabling the latter make it half-working (numlock sends an escape character).
+# About half of the modified function-keys are untestable due to preassigned
+# features.
+#
+# iTerm2 3.5.0 comes with a 4-year-old copy of xterm's terminfo (June 2020),
+# which is modified, using the ncurses TERMINFO_DIRS variable to substitute
+# this locally:
+# + xterm-nrc and xterm+pcfN are removed
+# + the developer made changes to adapt it to the 16-year-old version of
+#   ncurses bundled with MacOS, i.e., changing the mouse protocol to the
+#   legacy X11 format and reducing the number of colors to 32k (in more than
+#   one place).  In the former case, the developer was confused about why that
+#   was necessary.  In the latter, the developer clearly misunderstood how the
+#   tools work.
+# + vt420+lrmm is modified, removing smglr and corrupting mgc (again, developer
+#   confusion).
+# + the developer added a couple of features, misnaming them as "xterm" blocks:
+#   + a copy of kitty+setal renamed to xterm+setulc (and Setulc) is added, but
+#     the feature is first mentioned in iTerm2 changes in May 2020, while
+#     it is first mention in kitty changes in December 2016.
+#   + Smulx is added
+#
+# iTerm2 3.4.0
+#
+# NOTES:
+# with esctest:
+#	293 tests pass, 270 tests fail
+# with tack:
+#	minor improvements which do not alter the terminfo
+#
+# iTerm2 3.0.15
+#
 # NOTES:
 # with vttest:
 #	reports primary DA as VT100 with AVO: \E[?1;2c
@@ -3692,21 +3746,24 @@ iTerm2.app|iterm2|terminal emulator for Mac OS X,
 	kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~,
 	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
 	kind=\E[1;2B, kri=\E[1;2A, nel=\EE, op=\E[39;49m,
-	rmso=\E[27m, rmul=\E[24m,
 	rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
-	kDN3=\E\E[B, kDN4=\E[1;10B, kDN5=\E[1;5B, kDN6=\E[1;6B,
-	kEND3=\E[1;9F, kEND4=\E[1;10F, kEND6=\E[1;6F,
-	kEND7=\E[1;13F, kEND8=\E[1;14F, kHOM3=\E[1;9H,
-	kHOM4=\E[1;10H, kHOM6=\E[1;6H, kHOM7=\E[1;13H,
-	kHOM8=\E[1;14H, kLFT3=\E\E[D, kLFT4=\E[1;10D,
-	kLFT5=\E[1;5D, kLFT6=\E[1;6D, kNXT3=\E\E[6~,
-	kPRV3=\E\E[5~, kRIT3=\E\E[C, kRIT4=\E[1;10C,
-	kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP3=\E\E[A, kUP4=\E[1;10A,
-	kUP5=\E[1;5A, kUP6=\E[1;6A, use=ecma+index,
+	Smulx=\E[4:%p1%dm, kDN3=\E\E[B, kDN4=\E[1;10B,
+	kDN5=\E[1;5B, kDN6=\E[1;6B, kEND3=\E[1;9F,
+	kEND4=\E[1;10F, kEND6=\E[1;6F, kEND7=\E[1;13F,
+	kEND8=\E[1;14F, kHOM3=\E[1;9H, kHOM4=\E[1;10H,
+	kHOM6=\E[1;6H, kHOM7=\E[1;13H, kHOM8=\E[1;14H,
+	kLFT3=\E\E[D, kLFT4=\E[1;10D, kLFT5=\E[1;5D,
+	kLFT6=\E[1;6D, kNXT3=\E\E[6~, kPRV3=\E\E[5~,
+	kRIT3=\E\E[C, kRIT4=\E[1;10C, kRIT5=\E[1;5C,
+	kRIT6=\E[1;6C, kUP3=\E\E[A, kUP4=\E[1;10A, kUP5=\E[1;5A,
+	kUP6=\E[1;6A, rv=\E\\[>64;[1-6][0-9];0c, smxx=\E[9m,
+	xr=\EP>\\|iTerm2 ([1-9][.0-9])\E\\\\,
+	use=ecma+underline, use=ecma+standout, use=ecma+index,
+	use=report+version, use=report+da2,
 	use=xterm+alt+title, use=ecma+italics, use=iterm,
-	use=bracketed+paste,
+	use=bracketed+paste, use=kitty+setal,
 
 # xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
 #
@@ -3806,15 +3863,15 @@ iTerm2.app|iterm2|terminal emulator for Mac OS X,
 xnuppc+basic|Darwin PowerPC console basic capabilities,
 	am, bce, mir, xenl, NQ,
 	it#8,
-	bold=\E[1m, cr=\r, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	dsl=\E]2;\007, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n,
-	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	bold=\E[1m, cr=\r, dsl=\E]2;\007, el1=\E[1K, ht=^I, hts=\EH,
+	ind=\n, kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+	kcuu1=\EOA, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g,
-	use=ansi+csr, use=ansi+erase, use=ansi+local,
-	use=ansi+sgrso, use=ansi+sgrul, use=vt100+keypad,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt100+keypad,
 
 xnuppc+c|Darwin PowerPC console ANSI color support,
 	ncv#32, use=klone+color,
@@ -3993,7 +4050,7 @@ crt|crt-vt220|CRT 2.3 emulating VT220,
 #	TN3270, TVI910, TVI925, Wyse 50/60, and ANSI.
 # Changes:
 #	Added ANSI sc/rc and REP in 2019/12/17
-#	Added TVI910/ TVI925 in 2019/11/20	
+#	Added TVI910/ TVI925 in 2019/11/20
 #
 # Default:
 #	Emulate "Xterm", using "ANSI with 256color"
@@ -4058,8 +4115,8 @@ scrt|securecrt|SecureCRT emulating xterm-256color,
 #	TERM=xterm
 #
 # vttest:
-#	DA1: \E[?62;1;2;6;7;8;9;15;22c (VT200 with DRCS, UDK, NRCS) 
-#	DA2: \E[>1;10;0c 
+#	DA1: \E[?62;1;2;6;7;8;9;15;22c (VT200 with DRCS, UDK, NRCS)
+#	DA2: \E[>1;10;0c
 #	However:
 #	+ NRCS tests do not work
 #	+ DECUDK test fails
@@ -4151,8 +4208,8 @@ putty|PuTTY terminal emulator,
 	am, bce, bw, ccc, mir, msgr, xenl, xon, XT,
 	it#8, ncv#22, U8#1,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, cr=\r, cub1=^H, cud1=\ED, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P,
+	bel=^G, cr=\r, cub1=^H, cud1=\ED, cuu1=\EM, dch=\E[%p1%dP,
+	dch1=\E[P,
 	dispc=%?%p1%{8}%=%t\E%%G\342\227\230\E%%@%e%p1%{10}%=%t\E%%G
 	      \342\227\231\E%%@%e%p1%{12}%=%t\E%%G\342\231\0\E%%@%e
 	      %p1%{13}%=%t\E%%G\342\231\252\E%%@%e%p1%{14}%=%t\E%%G
@@ -4160,26 +4217,26 @@ putty|PuTTY terminal emulator,
 	      %e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E
 	      %%G\340\202\242\E%%@%e%p1%c%;,
 	ech=\E[%p1%dX, el1=\E[1K, enacs=\E(B\E)0,
-	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ind=\n,
+	flash=\E[?5h$<100/>\E[?5l, ind=\n,
 	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/
 	      %02x%p4%{255}%*%{1000}%/%02x,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
 	kbs=^?, kcbt=\E[Z, khome=\E[1~, kind=\E[B, kri=\E[A, kspd=^Z,
 	nel=\r\n, oc=\E]R, op=\E[39;49m, ri=\EM, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-	rmul=\E[24m,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
 	rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l,
 	s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, vpa=\E[%i%p1%dd, E3=\E[3J,
-	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=ansi+tabs,
-	use=ansi+rep, use=bracketed+paste, use=ecma+index,
-	use=ecma+strikeout, use=klone+color, use=klone+sgr,
-	use=putty+cursor, use=putty+fnkeys, use=vt220+pcedit,
+	smkx=\E[?1h\E=, E3=\E[3J, rv=\E\\[>0;136;0c,
+	use=ecma+underline, use=ecma+standout,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+tabs, use=ansi+rep, use=bracketed+paste,
+	use=ecma+index, use=ansi+rca2, use=ecma+strikeout,
+	use=klone+color, use=klone+sgr, use=putty+cursor,
+	use=putty+fnkeys, use=report+da2, use=vt220+pcedit,
 	use=xterm+alt1049, use=vt102+enq, use=xterm+sm+1006,
 	use=xterm+sl, use=vt100+fnkeys, use=putty+keypad,
 	use=vt220+cvis,
@@ -4226,19 +4283,14 @@ putty+fnkeys|fn-keys for PuTTY,
 	use=putty+fnkeys+esc,
 
 putty+fnkeys+esc|ESC[n~ fn-keys for PuTTY,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~,
-	kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	use=vt220+sfkeys, use=xterm+r5+fkeys,
 
 putty+fnkeys+linux|Linux fn-keys for PuTTY,
 	kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
 	use=putty+fnkeys+esc,
 
 putty+fnkeys+xterm|Xterm R6 fn-keys for PuTTY,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	use=putty+fnkeys+esc,
+	use=vt100+pf1-pf4, use=putty+fnkeys+esc,
 
 putty+fnkeys+vt400|VT400 fn-keys for PuTTY,
 	use=putty+fnkeys+esc,
@@ -4246,9 +4298,9 @@ putty+fnkeys+vt400|VT400 fn-keys for PuTTY,
 # Shifted F1 is F11.  F13-F20 inherit from the defaults, and the last distinct
 # key is F20.
 putty+fnkeys+vt100|VT100+ fn-keys for PuTTY,
-	kf1=\EOP, kf10=\EOY, kf11=\EOZ, kf12=\EO[, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
-	kf9=\EOX, use=putty+fnkeys+esc,
+	kf10=\EOY, kf11=\EOZ, kf12=\EO[, kf5=\EOT, kf6=\EOU,
+	kf7=\EOV, kf8=\EOW, kf9=\EOX, use=vt100+pf1-pf4,
+	use=putty+fnkeys+esc,
 
 # Unlike xterm-sco, this leaves kmous ambiguous with kf1.
 #
@@ -4259,8 +4311,7 @@ putty+fnkeys+vt100|VT100+ fn-keys for PuTTY,
 # F37-F48 - control/shift
 #
 putty+fnkeys+sco|SCO fn-keys for PuTTY,
-	kbeg=\E[E, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
+	kbeg=\E[E, kdch1=^?, kf1=\E[M, kf10=\E[V, kf11=\E[W,
 	kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b,
 	kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f,
 	kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k,
@@ -4269,8 +4320,8 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY,
 	kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y,
 	kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\,
 	kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{,
-	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
-	kich1=\E[L, knp=\E[G, kpp=\E[I,
+	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L,
+	knp=\E[G, kpp=\E[I, use=vt100+noapp,
 
 #### mintty
 # https://github.com/mintty/mintty
@@ -4312,11 +4363,16 @@ mintty+common|shared capabilities for mintty,
 	rsupm=\E[75m, smm@, smpch=\E[11m, sshm=\E[1:2m,
 	ssubm=\E[74m, ssupm=\E[73m, Rmol=\E[55m, Smol=\E[53m,
 	Smulx=\E[4:%p1%dm, blink2=\E[6m, norm=\E[22m,
-	opaq=\E[28m, smul2=\E[21m, use=linux+kbs, use=ansi+rep,
-	use=ecma+strikeout, use=ecma+index, use=vt420+lrmm,
-	use=xterm+focus, use=xterm+sm+1006, use=xterm+pcfkeys,
-	use=xterm+tmux, use=ecma+italics, use=xterm-basic,
-	use=bracketed+paste, use=report+version,
+	opaq=\E[28m, rv=\E\\[>77;[0-9];0c, smul2=\E[21m,
+	xr=\EP>\\|mintty ([1-9][.0-9]+)\E\\\\, use=linux+kbs,
+	use=ansi+rep, use=ecma+strikeout, use=ecma+index,
+	use=mintty+keypad, use=vt420+lrmm, use=xterm+focus,
+	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
+	use=ecma+italics, use=xterm-basic, use=bracketed+paste,
+	use=report+version,
+mintty+keypad|mintty special numeric keypad,
+	kbeg=\EOE, kpADD=\EOk, kpDIV=\EOo, kpMUL=\EOj, kpSUB=\EOm,
+
 # 2019-06-09: These capabilities are commented-out for compatibility with
 # existing releases 5.9-6.1, and may be considered for inclusion after the
 # release of ncurses 6.2:
@@ -4377,7 +4433,7 @@ mintty+common|shared capabilities for mintty,
 # "resize -s"), though it does not pass SIGWINCH to the application if the
 # user resizes the window with the mouse.
 teraterm2.3|Tera Term Pro 2.3,
-	km,
+	km, npc,
 	ncv#43, vt@,
 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
@@ -4385,16 +4441,13 @@ teraterm2.3|Tera Term Pro 2.3,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
 	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
-	kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, op=\E[100m, rev=\E[7m, ri=\EM,
-	rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017, smso=\E[7m,
-	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+idl,
-	use=vt220+vtedit, use=vt100+enq, use=klone+color,
-	use=vt100, use=vt220+cvis,
+	flash=\E[?5h$<100/>\E[?5l, kf10=\E[21~, kf11=\E[23~,
+	kf12=\E[24~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+	kf9=\E[20~, op=\E[100m, rev=\E[7m, ri=\EM, sgr0=\E[0m\017,
+	smul=\E[4m, use=ecma+underline, use=ecma+standout,
+	use=ansi+idl, use=ansi+rca2, use=vt100+enq,
+	use=klone+color, use=vt220+cvis, use=vt220+vtedit,
+	use=vt220+sfkeys, use=xterm+r5+lockeys, use=vt100,
 
 # Version 4.59 has regular VT100 line-drawing (so it is no longer necessary
 # to choose a Windows OEM font).
@@ -4409,7 +4462,7 @@ teraterm2.3|Tera Term Pro 2.3,
 #	- it recognizes the dtterm window controls for reporting size in
 #	  characters and pixels.
 #	- it passes SIGWINCH.
-teraterm4.59|Tera Term Pro 4.59,
+teraterm4.59|Tera Term 4.59,
 	bce, xenl@,
 	ncv#41,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
@@ -4439,13 +4492,48 @@ teraterm4.59|Tera Term Pro 4.59,
 #	+ recognizes xterm's original direct-colors sequences, but result is
 #	  poor.
 #	+ no UTF-8 apparent when UTF-8 is set, with font Lucida Control
-teraterm4.97|Tera Term Pro 4.97,
+teraterm4.97|Tera Term 4.97,
 	XT, use=ecma+color, use=xterm+sm+1006, use=teraterm4.59,
 teraterm-256color|TeraTerm with xterm 256-colors,
 	use=xterm+256setaf, use=teraterm,
+teraterm5.0|Tera Term 5.0,
+	xenl,
+	rv=\E\\[>32;331;0c, use=bracketed+paste, use=dec+sl,
+	use=xterm+keypad, use=report+da2, use=teraterm4.97,
 
 teraterm|Tera Term,
-	use=teraterm4.97,
+	use=teraterm5.0,
+
+#### RLogin
+# RLogin 2.30.4
+# https://github.com/kmiya-culti/RLogin
+rlogin-color,
+	OTbs, OTpt, am, bce, km, mir, msgr, npc, xenl,
+	OTkn#12, colors#0x100, cols#80, lines#24, pairs#0x10000,
+	OTrs=\E[!p\E[?3;4l\E[4l\E>\E]104\007, bel=^G,
+	bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
+	cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
+	cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J,
+	el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
+	ich=\E[%p1%d@, ind=\n,
+	is2=\E[!p\E[?3;4l\E[4l\E>\E]104\007, kbeg=\EOE,
+	kcbt=\E[Z, kend=\EOF, kf5=\E[15~, kll=\EOF, kmous=\E[M,
+	kslt=\EOF, meml=\El, memu=\Em, op=\E[39;49m, rc=\E8, ri=\EM,
+	rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>,
+	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
+	setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+	sgr0=\E[m, smam=\E[?7h, smcup=\E[?1049h, smir=\E[4h,
+	smkx=\E[?1h\E=, rv=\E\\[>65;331;0c,
+	xr=\EP>\\|RLogin\\(([1-9][.0-9]+)\\)\E\\\\,
+	use=ansi+apparrows, use=ansi+cup, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+	use=ansi+sgrdim, use=bracketed+paste, use=ecma+index,
+	use=ecma+italics, use=ecma+strikeout, use=vt420+lrmm,
+	use=decid+cpr, use=report+da2, use=report+version,
+	use=vt100+pf1-pf4, use=vt220+pcedit, use=vt220+ufkeys,
+	use=xterm+acs,
 
 #### Command prompt
 
@@ -4525,8 +4613,8 @@ ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+,
 #
 # The cnorm/civis definitions added in 2015 are unrelated to any standard.
 ms-vt100-16color|VT-UTF-8 and VT100+,
-	civis=\E[?h, cnorm=\E[?l, rmso=\E[27m, rmul=\E[24m,
-	use=ibm+16color, use=ms-vt100+,
+	civis=\E[?h, cnorm=\E[?l, use=ecma+underline,
+	use=ecma+standout, use=ibm+16color, use=ms-vt100+,
 
 # Based on
 # https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
@@ -4582,11 +4670,45 @@ winconsole|Windows 10 new console,
 	use=ansi+local, use=ecma+sgr, use=ecma+color,
 	use=vt220+cvis, use=vt220+pcedit, use=xterm+nopcfkeys,
 
-# Windows Terminal (Preview)
+# Windows Terminal
 # https://github.com/microsoft/terminal
 #
+# Version 1.21.2911.0
+# 2024-10-17
+#
+# - The "About" dialog has a pointer to the release notes, but that turns out
+#   to be for all branches.  This particular version (unlike those previously
+#   tested) happens to be a non-preview version.
+# - Windows Terminal #2958 has relevant discussion.
+#
+# tack:
+# - keypad escapes still do not work
+# - meta mode does not work
+# - when running tests, the screen maximized and did not resume normal size
+#
+# vttest:
+# - identifies as a VT100-level terminal supporting Greek and Turkish (not
+#   applicable to a VT100), horizontal scrolling () and DRCS (seems to work)
+# - left/right margins work
+# - DECSCUSR is okay except for mode 1
+# - SL/SR fail
+# - does not support XTVERSION
+# - some mouse controls work, but not highlight tracking and X10 compatibility
+# - mouse focus events appear - but not in the test-screen (like VTE).
+# - cursor position after alternate screen is correct for 1049, not otherwise
+# - window reporting does not work
+#
+# wraptest:
+# - DECRC does not restore wrap
+#
+# other:
+# - change history says it supports bracketed paste
+# - Greek and Turkish character sets work with GL, not GR
+# - source code says it implements OSC 52, as well as 12, 112, but not 104.
+#
 # Windows 10 22H2 (also Windows 11)
 # Version 1.16.10261.0
+# 2020-01-25
 #
 # - Windows Terminal #1553: "Feature Request:  Mouse/Touch/Pointer Bindings
 #   (like middle-click paste, right-click context menu, etc.)", compare to
@@ -4597,6 +4719,7 @@ winconsole|Windows 10 new console,
 #
 # Windows 10 21H1
 # Version 1.9.1942.0
+# 2021-07-13
 #
 # This has longstanding issues with CR/LF mapping, e.g.,
 # - first reported by Juergen Pfeifer August 13, 2020, with workaround
@@ -4646,6 +4769,7 @@ winconsole|Windows 10 new console,
 #
 # Windows 10 1903
 # Version 0.2.1831.0
+# 2019-07-02
 #
 # The task manager shows this as "OpenConsole.exe", which differs
 # from the "Windows Command Processor" used for the command-prompt.
@@ -4682,13 +4806,19 @@ winconsole|Windows 10 new console,
 # - color palette can be altered, but OSC 104 for resetting does not work
 # - crashed with a script used for testing NRCS.
 # - does not recognize either xterm+direct or xterm+indirect escapes.
-ms-terminal|Windows10 terminal,
+ms-terminal|Windows terminal,
+	use=xterm+256color, use=ms+terminal,
+ms-terminal-direct|Windows terminal with direct-colors,
+	use=xterm+direct, use=ms+terminal,
+ms+terminal|building block for Windows terminal,
 	npc,
-	cud1=\E[B, kcbt=\E[Z, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@,
-	Cr@, Ms@, use=linux+kbs, use=xterm+256color,
-	use=xterm+pcfkeys, use=ansi+rep, use=xterm+sm+1006,
-	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
-	use=xterm-basic, use=xterm+tmux,
+	cud1=\E[B, kbeg=\EOE, kcbt=\E[Z, oc@, rmkx=\E[?1l, rmm@,
+	smkx=\E[?1h, smm@, rv=\E\\[>0;10;1c, use=linux+kbs,
+	use=bracketed+paste, use=xterm+pcfkeys, use=ansi+rep,
+	use=xterm+sm+1006, use=ecma+index, use=ecma+italics,
+	use=ecma+strikeout, use=report+da2, use=vt420+lrmm,
+	use=xterm-basic, use=xterm+focus, use=xterm+tmux,
+	use=xterm+sm+1003,
 
 #### Visual Studio
 # Visual Studio Code 1.45.0 uses xterm.js 12.8.1 (see https://xtermjs.org/).
@@ -4737,10 +4867,11 @@ ms-terminal|Windows10 terminal,
 # - color-palette cannot be changed
 vscode|xterm.js|Visual Studio Code terminal using xterm.js,
 	npc,
-	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=linux+kbs,
-	use=xterm+256setaf, use=ecma+index, use=xterm+focus,
-	use=xterm+sm+1006, use=xterm+pcfkeys, use=ecma+italics,
-	use=xterm-basic, use=bracketed+paste,
+	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, rv=\E\\[>0;276;0c,
+	use=linux+kbs, use=report+da2, use=xterm+256setaf,
+	use=ecma+index, use=xterm+focus, use=xterm+sm+1006,
+	use=xterm+pcfkeys, use=ecma+italics, use=xterm-basic,
+	use=bracketed+paste,
 vscode-direct|Visual Studio Code with direct-colors,
 	use=xterm+indirect, use=vscode,
 
@@ -4766,14 +4897,13 @@ x10term|vs100-x10|xterm terminal emulator (X10 window system),
 	OTbs, am, km, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#65,
 	bold=\E[1m, clear=\E[H\E[2J, csr=\E[%i%p1%d;%p2%dr,
-	cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K,
-	home=\E[H, ht=^I, ind=\n, is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, rmam=\E[?7l,
-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, use=ansi+idl,
+	cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\E[A, dch=\E[%p1%dP,
+	dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, ind=\n,
+	is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m, ri=\EM, rmam=\E[?7l,
+	rmir=\E[4l, rmkx=\E[?1l\E>, sgr0=\E[m, smam=\E[?7h,
+	smir=\E[4h, smkx=\E[?1h\E=, use=ansi+cup, use=ansi+idl,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
 
 # csl is extension which clears the status line
 x10term+sl|status-line for X10 xterm,
@@ -4789,20 +4919,25 @@ xterm-r5|xterm R5 version,
 	OTbs, am, km, msgr, xenl,
 	cols#80, it#8, lines#24,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	hts=\EH, ind=\n, kdl1=\E[31~, kel=\E[8~, kf0=\EOq,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
-	kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	ed=\E[J, el=\E[K, ht=^I, hts=\EH, ind=\n, kdl1=\E[31~,
+	kel=\E[8~, kf0=\EOq, khome=\E[1~, kil1=\E[30~, kmous=\E[M,
+	rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;m,
-	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, use=xterm+kbs, use=ansi+apparrows,
-	use=ansi+csr, use=ansi+idc, use=ansi+idl, use=ansi+local,
-	use=vt220+pcedit, use=vt100+enq,
+	sgr0=\E[m, smkx=\E[?1h\E=, tbc=\E[3g, use=xterm+kbs,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+idc, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt220+pcedit,
+	use=vt100+enq, use=xterm+r5+fkeys,
+
+# X11R5 used function-keys based on, but different from VT220, assigning keys
+# F1-R5 (unlike VT220), and limiting to F12 (perhaps influenced by other
+# keyboards).
+xterm+r5+fkeys|VT220-like function keys in X11R5 xterm,
+	use=xterm+r5+lockeys, use=vt220+ufkeys,
+xterm+r5+lockeys|XTerm "local" keys in vt220 scheme,
+	kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
 
 # Compatible with the R6 xterm
 # (from XFree86 3.2 distribution, <acsc> and <it> added, <blink@> removed)
@@ -4814,22 +4949,18 @@ xterm-r6|xterm X11R6 version,
 	cols#80, it#8, lines#24,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
-	dch1=\E[P, ed=\E[J, el=\E[K, enacs=\E)0, home=\E[H, ht=^I,
-	hts=\EH, ind=\n,
+	dch=\E[%p1%dP, dch1=\E[P, enacs=\E)0, ht=^I, hts=\EH, ind=\n,
 	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
-	kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, kmous=\E[M, meml=\El, memu=\Em,
-	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kmous=\E[M,
+	meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
+	rmkx=\E[?1l\E>,
 	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
 	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
-	use=xterm+alt47, use=ansi+csr, use=ansi+idl,
-	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
-	use=vt220+vtedit, use=xterm+kbs, use=vt100+enq,
+	use=xterm+alt47, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt220+vtedit,
+	use=xterm+kbs, use=vt100+enq, use=vt220+sfkeys,
+	use=xterm+r5+fkeys,
 
 xterm-old|antique xterm version,
 	use=xterm-r6,
@@ -4849,18 +4980,12 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	cols#80, lines#24, ncv@,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
-	home=\E[H, hpa=\E[%i%p1%dG, ind=\n,
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
+	flash=\E[?5h$<100/>\E[?5l, ind=\n,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
-	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
-	kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, kmous=\E[M, kslt=\E[4~,
-	meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=^O,
+	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, kfnd=\E[1~,
+	kmous=\E[M, kslt=\E[4~, meml=\El, memu=\Em, rev=\E[7m,
+	ri=\EM, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rs1=^O,
 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
 	     %=%t3%e%p1%d%;m,
@@ -4869,17 +4994,18 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
-	use=ansi+apparrows, use=ansi+csr, use=ansi+idc,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=xterm+alt47, use=xterm+kbs, use=vt100+enq,
+	smul=\E[4m, use=ecma+underline, use=ecma+standout,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
+	use=ansi+local, use=ansi+rca2, use=xterm+alt47,
+	use=xterm+kbs, use=vt100+enq, use=xterm+r5+fkeys,
 	use=ecma+color, use=vt220+cvis, use=vt220+keypad,
-	use=vt220+pcedit,
+	use=vt220+pcedit, use=vt220+sfkeys,
 
 # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
 # codes for F1-F4 except while in VT220 mode.
 xterm-xf86-v33|xterm terminal emulator (XFree86 3.3 Window System),
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-xf86-v32,
+	use=vt100+pf1-pf4, use=xterm-xf86-v32,
 
 # This version was released in XFree86 3.3.3 (November 1998).
 # Besides providing printer support, it exploits a new feature that allows
@@ -4935,7 +5061,7 @@ vt220+cvis8|8-bit DECTCEM VT220 cursor-visibility,
 att610+cvis0|AT&T 610 cursor-visibility,
 	civis=\E[?25l, cnorm=\E[?12l\E[?25h,
 att610+cvis|AT&T 610 cursor-visibility with blink,
-	civis=\E[?25l, cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h,
+	cvvis=\E[?12;25h, use=att610+cvis0,
 
 # This version was released in XFree86 4.4.
 xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
@@ -4952,8 +5078,8 @@ xterm+nofkeys|building block for xterm fkey-variants,
 	use=xterm+keypad, use=xterm-basic,
 
 xterm-p370|xterm patch #370,
-	rv=\E\\[41;[1-6][0-9][0-9];0c,
-	xr=\EP>\\|XTerm\\([1-9][0-9]+\\)\E\\\\,
+	rv=\E\\[>41;[1-6][0-9][0-9];0c,
+	xr=\EP>\\|XTerm\\(([1-9][0-9]+)\\)\E\\\\,
 	use=ecma+index, use=ansi+rep, use=ecma+strikeout,
 	use=xterm+pcfkeys, use=xterm+nofkeys,
 	use=bracketed+paste, use=report+version,
@@ -4974,7 +5100,7 @@ xterm+kbs|fragment for backspace key,
 	kbs=^H,
 
 # Use this fragment for terminals that always use DEL for "backspace".
-linux+kbs|fragment for "backspace" key,
+linux+kbs|Linux fragment for "backspace" key,
 	kbs=^?,
 #
 # This fragment describes as much of XFree86 xterm's "pc-style" function
@@ -5005,25 +5131,20 @@ xterm+pcfkeys|xterm fragment for PC-style fkeys,
 # kf21 control f1       = \E[42~
 # kf31 shift control f1 = \E[52~
 xterm+nopcfkeys|fragment without PC-style fkeys,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~,
-	kf20=\E[34~, kf21=\E[42~, kf22=\E[43~, kf23=\E[44~,
-	kf24=\E[45~, kf25=\E[46~, kf26=\E[47~, kf27=\E[48~,
-	kf28=\E[49~, kf29=\E[50~, kf3=\E[13~, kf30=\E[51~,
-	kf31=\E[52~, kf32=\E[53~, kf33=\E[54~, kf34=\E[55~,
-	kf35=\E[56~, kf36=\E[57~, kf37=\E[58~, kf38=\E[59~,
-	kf39=\E[60~, kf4=\E[14~, kf40=\E[61~, kf41=\E[62~,
-	kf42=\E[63~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~,
+	kf21=\E[42~, kf22=\E[43~, kf23=\E[44~, kf24=\E[45~,
+	kf25=\E[46~, kf26=\E[47~, kf27=\E[48~, kf28=\E[49~,
+	kf29=\E[50~, kf30=\E[51~, kf31=\E[52~, kf32=\E[53~,
+	kf33=\E[54~, kf34=\E[55~, kf35=\E[56~, kf36=\E[57~,
+	kf37=\E[58~, kf38=\E[59~, kf39=\E[60~, kf40=\E[61~,
+	kf41=\E[62~, kf42=\E[63~, use=vt220+sfkeys,
+	use=xterm+r5+fkeys,
 
 vt100+noapp|fragment with cursor keys in normal mode,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	use=vt100+noapp+pc,
 
-xterm+noapp|fragment with cursor keys in normal mode,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[F,
-	khome=\E[H,
+xterm+noapp|alias for vt100+noapp,
+	use=vt100+noapp,
 
 xterm+app|fragment with cursor keys in application mode,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
@@ -5106,41 +5227,39 @@ xterm+pcc0|fragment with modifyCursorKeys:0,
 # Here are corresponding fragments from xterm patch #216:
 #
 xterm+pcf0|fragment with modifyFunctionKeys:0,
-	kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S,
-	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
+	kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S,
+	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
 	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
 	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\EO5P, kf26=\EO5Q,
-	kf27=\EO5R, kf28=\EO5S, kf29=\E[15;5~, kf3=\EOR,
-	kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~,
-	kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
-	kf36=\E[24;5~, kf37=\EO6P, kf38=\EO6Q, kf39=\EO6R,
-	kf4=\EOS, kf40=\EO6S, kf41=\E[15;6~, kf42=\E[17;6~,
-	kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~,
-	kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~, kf49=\EO3P,
-	kf50=\EO3Q, kf51=\EO3R, kf52=\EO3S, kf53=\E[15;3~,
-	kf54=\E[17;3~, kf55=\E[18;3~, kf56=\E[19;3~,
-	kf57=\E[20;3~, kf58=\E[21;3~, kf59=\E[23;3~,
-	kf60=\E[24;3~, kf61=\EO4P, kf62=\EO4Q, kf63=\EO4R,
-	use=xterm+nopcfkeys,
-#
-xterm+pcf2|fragment with modifyFunctionKeys:2,
-	kf1=\EOP, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R,
-	kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
-	kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~,
-	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
-	kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S,
-	kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~,
-	kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~,
-	kf35=\E[23;5~, kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q,
-	kf39=\E[1;6R, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~,
+	kf27=\EO5R, kf28=\EO5S, kf29=\E[15;5~, kf30=\E[17;5~,
+	kf31=\E[18;5~, kf32=\E[19;5~, kf33=\E[20;5~,
+	kf34=\E[21;5~, kf35=\E[23;5~, kf36=\E[24;5~, kf37=\EO6P,
+	kf38=\EO6Q, kf39=\EO6R, kf40=\EO6S, kf41=\E[15;6~,
 	kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~,
 	kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~,
-	kf48=\E[24;6~, kf49=\E[1;3P, kf50=\E[1;3Q, kf51=\E[1;3R,
-	kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
+	kf48=\E[24;6~, kf49=\EO3P, kf50=\EO3Q, kf51=\EO3R,
+	kf52=\EO3S, kf53=\E[15;3~, kf54=\E[17;3~, kf55=\E[18;3~,
+	kf56=\E[19;3~, kf57=\E[20;3~, kf58=\E[21;3~,
+	kf59=\E[23;3~, kf60=\E[24;3~, kf61=\EO4P, kf62=\EO4Q,
+	kf63=\EO4R, use=vt100+pf1-pf4, use=xterm+nopcfkeys,
+#
+xterm+pcf2|fragment with modifyFunctionKeys:2,
+	kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
+	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
+	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
+	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q,
+	kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf30=\E[17;5~,
+	kf31=\E[18;5~, kf32=\E[19;5~, kf33=\E[20;5~,
+	kf34=\E[21;5~, kf35=\E[23;5~, kf36=\E[24;5~,
+	kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R, kf40=\E[1;6S,
+	kf41=\E[15;6~, kf42=\E[17;6~, kf43=\E[18;6~,
+	kf44=\E[19;6~, kf45=\E[20;6~, kf46=\E[21;6~,
+	kf47=\E[23;6~, kf48=\E[24;6~, kf49=\E[1;3P, kf50=\E[1;3Q,
+	kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
 	kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
 	kf58=\E[21;3~, kf59=\E[23;3~, kf60=\E[24;3~,
 	kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R,
-	use=xterm+nopcfkeys,
+	use=vt100+pf1-pf4, use=xterm+nopcfkeys,
 #
 # Chunks from xterm #230:
 xterm+pce2|fragment with modifyCursorKeys:2 editing-keys,
@@ -5160,8 +5279,7 @@ xterm+edit|fragment for 6-key editing-keypad,
 	use=xterm+pc+edit, use=vt220+pcedit,
 
 xterm+decedit|fragment for vt220 6-key editing-keypad,
-	kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	use=xterm+vt+edit,
+	use=vt220+vtedit, use=xterm+vt+edit,
 
 xterm+pc+edit|fragment for pc-style editing keypad,
 	kend=\E[4~, khome=\E[1~,
@@ -5251,14 +5369,13 @@ xterm-basic|modern xterm terminal emulator - common,
 	OTbs, am, bce, mir, msgr, xenl, AX, XT,
 	colors#8, cols#80, lines#24, pairs#64,
 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+	ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
 	ich=\E[%p1%d@, ind=\n, is2=\E[!p\E[?3;4l\E[4l\E>,
 	kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, ri=\EM,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rs1=\Ec,
+	rs2=\E[!p\E[?3;4l\E[4l\E>, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm,
 	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}
@@ -5266,9 +5383,10 @@ xterm-basic|modern xterm terminal emulator - common,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
 	sgr0=\E(B\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
-	vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+csr, use=ansi+enq,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp, use=ansi+sgrbold, use=xterm+kbs,
+	E3=\E[3J, use=ecma+underline, use=ecma+standout,
+	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+	use=ansi+rca2, use=ansi+sgrbold, use=xterm+kbs,
 	use=xterm+alt+title, use=att610+cvis, use=xterm+acs,
 	use=xterm+meta,
 
@@ -5338,6 +5456,10 @@ xterm+256setaf|xterm 256-color (set-only),
 	      ;%p1%d%;m,
 	setb@, setf@,
 
+xterm+256setaf2|xterm 256-color (set-only with colon),
+	ccc@,
+	initc@, use=xterm+256setaf,
+
 # 88-colors is a compile-time feature of XFree86 xterm beginning with
 # xterm patch #115 (1999/9/18) -TD
 #
@@ -5609,14 +5731,11 @@ xterm-sco|xterm with SCO function keys,
 #
 xterm-vt220|xterm emulating VT220,
 	npc,
-	kcbt=\E[Z, kend=\E[4~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-	kf20=\E[34~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kmous=\E[M, nel=\EE,
+	kcbt=\E[Z, kend=\E[4~, khome=\E[1~, kmous=\E[M, nel=\EE,
 	use=xterm+app, use=xterm+edit, use=vt220+keypad,
 	use=ecma+italics, use=ecma+index, use=ansi+rep,
-	use=ecma+strikeout, use=xterm+focus, use=xterm+sm+1006,
+	use=ecma+strikeout, use=vt220+sfkeys,
+	use=xterm+r5+fkeys, use=xterm+focus, use=xterm+sm+1006,
 	use=xterm+tmux, use=xterm+keypad, use=xterm-basic,
 
 xterm-vt52|xterm emulating DEC VT52,
@@ -5652,7 +5771,7 @@ xterm-utf8|xterm with no VT100 line-drawing in UTF-8 mode,
 # c) fsl ends the escape sequence begun by tsl.  Printable characters between
 #    those (probably) will appear in the window title.  Nonprintable characters
 #    may cause the escape sequence to end with an error.
-# d) the BEL (^G or \007) used in the original title-as-statusline came from 
+# d) the BEL (^G or \007) used in the original title-as-statusline came from
 #    David J. MacKenzie's "pseudo-color" entry in 20 Apr 1995.  At that time
 #    xterm used BEL as the string-terminator rather than ST (\E\\).  Either
 #    BEL or ST has worked since xterm patch #28 in 1996, but most uses of
@@ -5742,6 +5861,8 @@ bracketed+paste|xterm bracketed paste,
 # The response is a DSR sequence identifying the version: DCS > | text ST
 # For example:
 #	^[P>|XTerm(354)^[\
+# tack expects this string to be a regular expression, so some characters such
+# as "|" are escaped.
 report+version|Report xterm name and version (XTVERSION),
 	XR=\E[>0q, xr=\EP>\\|[ -~]+\E\\\\, use=report+da2,
 
@@ -5750,8 +5871,10 @@ report+version|Report xterm name and version (XTVERSION),
 # - the second as the patch number for xterm, and
 # - the third parameter as zero.
 # Other terminals may provide useful responses, though few are documented.
+# Some are hardcoded to match some (usually old) version of xterm.  For the
+# others, rv is a regular expression which tack can match.
 report+da2|report secondary device attributes (DA2),
-	RV=\E[>c, rv=\E\\[[0-9]+;[0-9]+;[0-9]+c,
+	RV=\E[>c, rv=\E\\[>[0-9]+;[0-9]+;[0-9]+c,
 
 #### XTERM Mouse
 # The xterm mouse protocol is used by other terminal emulators.
@@ -5975,10 +6098,10 @@ xterm-pcolor|xterm with color used for highlights and status line,
 #	http://nion.modprobe.de/blog/archives/569-colored-manpages.html
 #	(blog posting by Nico Golde, June 24 2007)
 # archive:
-#	https://web-beta.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt
+#	https://web.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt
 # The comment hints where it started, but there are differences:
 #	Reconstructed via infocmp from file: /usr/share/terminfo/x/xterm-pcolor
-mostlike|manpages with color looking like most,
+mostlike|man pager with color looking like most,
 	OTbs@,
 	bold=\E[1m\E[31m,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^H,
@@ -5997,23 +6120,21 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X,
 	cols#80, it#8, lines#65, ncv@,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
-	el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=^I,
-	ich=\E[%p1%d@, ind=\n, is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l,
-	kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K,
+	enacs=\E(B\E)0, ht=^I, ich=\E[%p1%d@, ind=\n,
+	is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l, kend=\E[8~,
 	khome=\E[7~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
 	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
-	rmcup=\E>\E[?41;1r, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	rmcup=\E>\E[?41;1r, rmir=\E[4l,
 	rs1=\E(B\017\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
 	sgr0=\E[0m\017, smacs=^N, smam=\E[?7h,
-	smcup=\E[?1;41s\E[?1;41h\E=, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, use=ansi+apparrows, use=ansi+csr,
-	use=ansi+idl, use=ansi+local, use=decid+cpr,
-	use=ecma+color, use=vt220+keypad,
+	smcup=\E[?1;41s\E[?1;41h\E=, smir=\E[4h, smul=\E[4m,
+	use=ecma+underline, use=ecma+standout,
+	use=xterm+r5+fkeys, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+idl, use=ansi+local,
+	use=decid+cpr, use=ecma+color, use=vt220+keypad,
 
 # The IRAF source has a terminfo using "xterm-r5", but line-drawing does not
 # work in that case.  This entry uses xterm+acs, to work around that problem.
@@ -6087,8 +6208,8 @@ xterms-sun|small (80x24) xterm with sunFunctionKeys true,
 # this describes the alpha-version of GNOME terminal shipped with Redhat 6.0
 gnome-rh62|GNOME terminal,
 	bce,
-	kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	use=linux+kbs, use=xterm-color,
+	kdch1=^?, use=linux+kbs, use=vt100+pf1-pf4,
+	use=xterm-color,
 
 # GNOME Terminal 1.4.0.4 (Redhat 7.2)
 #
@@ -6110,11 +6231,11 @@ gnome-rh62|GNOME terminal,
 #	it hangs in tack after running function-keys test.
 gnome-rh72|GNOME Terminal in RedHat 7,
 	bce, km@,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rmam=\E[?7l,
+	rmam=\E[?7l,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e
 	    \017%;,
-	sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=vt220+cvis,
-	use=linux+kbs, use=xterm-color,
+	sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=linux+kbs,
+	use=vt100+pf1-pf4, use=vt220+cvis, use=xterm-color,
 
 # GNOME Terminal 2.0.1 (Redhat 8.0)
 #
@@ -6139,9 +6260,9 @@ gnome-rh80|GNOME Terminal in RedHat 8,
 # bce and msgr are repaired.
 gnome-rh90|GNOME Terminal in RedHat 9,
 	bce, msgr, XT,
-	hpa=\E[%i%p1%dG, kLFT=\EO2D, kRIT=\EO2C, kb2=\E[E,
-	kcbt=\E[Z, tbc=\E[3g, vpa=\E[%i%p1%dd, use=xterm+pcf0,
-	use=xterm+pcfkeys, use=gnome-rh80,
+	kLFT=\EO2D, kRIT=\EO2C, kb2=\E[E, kcbt=\E[Z, tbc=\E[3g,
+	use=ansi+rca2, use=xterm+pcf0, use=xterm+pcfkeys,
+	use=gnome-rh80,
 
 # GNOME Terminal 2.14.2 (Fedora Core 5)
 # Ed Catmur notes that gnome-terminal has recognized soft-reset since May 2002.
@@ -6184,9 +6305,10 @@ gnome-2008|GNOME Terminal snapshot 2.22.3,
 # Testing with tack shows that flash does not/has not worked -TD
 vte-2012|VTE 0.34.1,
 	ncv#16,
-	dim=\E[2m, flash@, invis=\E[8m, rmso=\E[27m, rmul=\E[24m,
+	dim=\E[2m, flash@, invis=\E[8m,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p7%t;8%;%?%p1%p3
 	    %|%t;7%;m%?%p9%t\016%e\017%;,
+	use=ecma+underline, use=ecma+standout,
 	use=ecma+italics, use=vte-2008,
 # Version 3.6.1 sets TERM to xterm-256color (still hardcoded), which has
 # 61 differences from a correct entry for gnome terminal.
@@ -6278,8 +6400,12 @@ vte-2018|VTE 0.51.2,
 # - AT&T cursor-blinking
 # - meta mode, as documented in terminfo(5)
 # - xterm's extension to clear scrollback
+vte-2022|VTE aka GNOME Terminal,
+	xr=\EP>\\|VTE\\(([0-9])\\)\E\\\\, use=report+version,
+	use=report+da2, use=vte-2018,
+
 vte|VTE aka GNOME Terminal,
-	use=vte-2018,
+	use=vte-2022,
 
 vte-256color|VTE with xterm 256-colors,
 	use=xterm+256color, use=vte,
@@ -6342,22 +6468,21 @@ termite|VTE-based terminal,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
-	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
-	hpa=\E[%i%p1%dG, ind=\n, invis=\E[8m,
-	is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kbs=^?, kcbt=\E[Z,
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+	flash=\E[?5h$<100/>\E[?5l, ind=\n, invis=\E[8m,
+	is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kcbt=\E[Z,
 	kent=\EOM, kmous=\E[M, rev=\E[7m, ri=\EM, rmacs=\E(B,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rs1=\Ec,
+	rs2=\E[!p\E[?3;4l\E[4l\E>,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
 	    %t;7%;%?%p7%t;8%;m,
 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr,
-	use=ansi+enq, use=ansi+idc, use=ansi+idl,
-	use=ansi+inittabs, use=ecma+index, use=ecma+italics,
-	use=ansi+local, use=xterm+alt1049, use=xterm+256color,
-	use=ecma+color, use=vt220+cvis, use=xterm+pcfkeys,
-	use=xterm+sl-twm,
+	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+idc,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rca2, use=ecma+index, use=ecma+italics,
+	use=ecma+underline, use=ecma+standout, use=linux+kbs,
+	use=xterm+alt1049, use=xterm+256color, use=ecma+color,
+	use=vt220+cvis, use=xterm+pcfkeys, use=xterm+sl-twm,
 
 #### Other GNOME
 # Multi-GNOME-Terminal 1.6.2
@@ -6431,20 +6556,21 @@ kvt|KDE terminal,
 konsole-base|KDE console window (common),
 	bce, km@, npc, XT,
 	ncv@,
-	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
-	hpa=\E[%i%p1%dG, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@,
-	kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@,
-	kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, kslt@,
-	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, kf1@, kf10@,
+	kf11@, kf12@, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2@,
+	kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@, kslt@,
+	rmam=\E[?7l, rs1=\Ec,
 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd,
+	sgr0=\E[0m\017, smam=\E[?7h, rv=\E\\[>1;115;0c,
+	xr=\EP>\\|Konsole ([1-9][.0-9])\E\\\\,
+	use=ecma+underline, use=ecma+standout, use=ansi+rca2,
 	use=ansi+sgrdim, use=ecma+index, use=xterm+focus,
 	use=xterm+sm+1006, use=ecma+strikeout,
 	use=ecma+italics, use=ecma+color, use=xterm-r6,
 	use=vt220+cvis, use=bracketed+paste,
-	use=report+version,
+	use=report+version, use=xterm+pc+edit,
 
 # The keytab feature was introduced in 0.9.12 (February 2000) with "linux" and
 # "vt100" key-table files along with a compiled-in default key-table.
@@ -6530,11 +6656,10 @@ konsole+pcfkeys|konsole subset of xterm+pcfkeys,
 # it is still useful for deriving the other entries, since the developer
 # provided function-keys based on xterm.
 konsole-vt100|KDE console window with VT100 (sic) keyboard,
-	kend=\E[F, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@,
-	kf2=\E[12~, kf20@, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
-	use=konsole-base,
+	kend=\E[F, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13@,
+	kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf20@, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+	use=xterm+r5+lockeys, use=konsole-base,
 
 # Obsolete: vt420pc.keytab was added in June 2000, dropped from the install in
 # September 2008 and removed in June 2016.  The developer who removed it stated
@@ -6599,6 +6724,8 @@ mlterm3|multi lingual terminal emulator 3.x,
 	is2=\E[!p\E[?3;4l\E>, rs2=\E[!p\E[?3;4l\E>,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;%?
 	    %p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+	rv=\E\\[>24;279;0c,
+	xr=\EP>\\|mlterm\\([0-9][.0-9](-.*)?\\)?\E\\\\,
 	use=ansi+enq, use=ansi+rep, use=ecma+italics,
 	use=ecma+strikeout, use=xterm+app, use=xterm+pcf2,
 	use=xterm+pcc2, use=xterm+pce2, use=xterm+meta,
@@ -6630,25 +6757,24 @@ mlterm2|multi lingual terminal emulator 2.x,
 	colors#8, cols#80, lines#24, pairs#64,
 	acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
-	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=, ich=\E[%p1%d@, ind=\n,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
 	kcbt=\E[Z, kend=\EOF, kent=\EOM, kind=\EO1;2B, kmous=\E[M,
 	kri=\EO1;2A, mc0=\E[i, nel=\EE, op=\E[39;49m, rev=\E[7m,
 	ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+	rmkx=\E[?1l\E>, rs1=\Ec,
 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
 	    \E(B%;,
 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u8=\E[?1;2c,
-	vpa=\E[%i%p1%dd, use=ansi+apparrows, use=ansi+csr,
-	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=vt220+vtedit, use=xterm+alt1049,
-	use=ecma+index, use=mlterm+pcfkeys, use=vt220+cvis,
-	use=xterm+r6f2,
+	smkx=\E[?1h\E=, u8=\E[?1;2c, use=ecma+underline,
+	use=ecma+standout, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+enq, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+	use=vt220+vtedit, use=xterm+alt1049, use=ecma+index,
+	use=mlterm+pcfkeys, use=vt220+cvis, use=xterm+r6f2,
 
 # The insert/delete/home/end keys do not respond to modifiers because mlterm
 # looks in its termcap to decide which string to send.  If it used terminfo
@@ -6697,17 +6823,18 @@ rxvt-basic|rxvt terminal base (X Window System),
 	is1=\E[?47l\E=\E[?1l,
 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
 	kcbt=\E[Z, kmous=\E[M, rev=\E[7m, ri=\EM, rmir=\E[4l,
-	rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
+	rmkx=\E>,
 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
 	    25h,
 	s0ds=\E(B, s1ds=\E(0,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
 	    %p9%t\016%e\017%;,
-	sgr0=\E[0m\017, smir=\E[4h, smkx=\E=, smso=\E[7m,
-	smul=\E[4m, use=ansi+csr, use=ansi+idl, use=ansi+local,
-	use=xterm+alt47, use=vt100+enq, use=vt100+4bsd,
-	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad,
+	sgr0=\E[0m\017, smir=\E[4h, smkx=\E=, smul=\E[4m,
+	use=ecma+underline, use=ecma+standout, use=ansi+csr,
+	use=ansi+idl, use=ansi+local, use=xterm+alt47,
+	use=vt100+enq, use=vt100+4bsd, use=rxvt+pcfkeys,
+	use=vt220+cvis, use=vt220+keypad,
 
 # Key Codes from rxvt reference:
 #
@@ -6791,8 +6918,7 @@ rxvt-basic|rxvt terminal base (X Window System),
 # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
 rxvt+pcfkeys|rxvt fragment for PC-style fkeys,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
-	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~,
+	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kel=\E[8\^, kend=\E[8~,
 	kf21=\E[23$, kf22=\E[24$, kf23=\E[11\^, kf24=\E[12\^,
 	kf25=\E[13\^, kf26=\E[14\^, kf27=\E[15\^, kf28=\E[17\^,
 	kf29=\E[18\^, kf30=\E[19\^, kf31=\E[20\^, kf32=\E[21\^,
@@ -6804,10 +6930,9 @@ rxvt+pcfkeys|rxvt fragment for PC-style fkeys,
 	kHOM5=\E[7\^, kHOM6=\E[7@, kIC5=\E[2\^, kIC6=\E[2@,
 	kLFT5=\EOd, kNXT5=\E[6\^, kNXT6=\E[6@, kPRV5=\E[5\^,
 	kPRV6=\E[5@, kRIT5=\EOc, kUP=\E[a, kUP5=\EOa,
-	use=vt220+vtedit, use=xterm+nopcfkeys,
+	use=vt100+noapp, use=vt220+vtedit, use=xterm+nopcfkeys,
 
 # rxvt was originally "xvt", first announced in April 1993:
-#	http://www.krsaborio.net/linux-desktops/research/1993/0416.html
 #------------------------------------------------------------------------------
 # Article: 567 of comp.os.linux.announce
 # Path: pavo.csi.cam.ac.uk!warwick!uknet!pipex!uunet!zaphod.mps.ohio-state.edu!
@@ -6857,8 +6982,8 @@ rxvt+pcfkeys|rxvt fragment for PC-style fkeys,
 # with the default background color.
 rxvt|rxvt-color|rxvt terminal emulator (X Window System),
 	ncv@,
-	hpa=\E[%i%p1%dG, kf0=\E[21~, sgr0=\E[m\017,
-	vpa=\E[%i%p1%dd, use=rxvt-basic, use=ecma+color,
+	kf0=\E[21~, sgr0=\E[m\017, use=ansi+rca2, use=rxvt-basic,
+	use=ecma+color,
 rxvt-256color|rxvt 2.7.9 with xterm 256-colors,
 	use=xterm+256color, use=rxvt,
 rxvt-88color|rxvt 2.7.9 with xterm 88-colors,
@@ -6932,22 +7057,21 @@ Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H,
 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, is1=\E[?47l\E>\E[?1l,
+	ich=\E[%p1%d@, is1=\E[?47l\E>\E[?1l,
 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
 	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kc1=\E[8~,
 	kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i,
 	mc5=\E[5i, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=,
-	rmso=\E[27m, rmul=\E[24m,
 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
 	    25h,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=, smso=\E[7m,
-	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
-	use=ansi+local, use=xterm+alt47, use=vt100+enq,
-	use=rxvt+pcfkeys, use=ecma+color, use=vt100+4bsd,
-	use=vt220+cvis,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=, smul=\E[4m,
+	use=ecma+underline, use=ecma+standout, use=ansi+csr,
+	use=ansi+idl, use=ansi+local, use=ansi+rca2,
+	use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys,
+	use=ecma+color, use=vt100+4bsd, use=vt220+cvis,
 
 Eterm-256color|Eterm with xterm 256-colors,
 	use=xterm+256color, use=Eterm,
@@ -6959,7 +7083,7 @@ Eterm-88color|Eterm with 88 colors,
 # Based on rxvt 2.4.8, it has a few differences in key bindings
 aterm|AfterStep terminal,
 	XT,
-	kbs=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=rxvt,
+	kbs=^?, use=vt100+pf1-pf4, use=rxvt,
 
 #### XITERM
 # xiterm  0.5-5.2
@@ -7009,7 +7133,7 @@ hpterm-color|HP X11 terminal emulator with color,
 # This article does not cover the HP 46020A keyboard that is used by the Model
 # 217 and 237 computers.  For information on this keyboard read the article,
 # "The Series 300 ITE as System Console" found in the manual, HP-UX Concepts
-# and Tutorials, Vol.  7. 
+# and Tutorials, Vol.  7.
 #
 # Possibly:
 # http://bitsavers.trailing-edge.com/pdf/hp/9000_hpux/1986/97089-90042_198608_HP-UX_Concepts_and_Tutorials.pdf
@@ -7093,10 +7217,9 @@ emu-220|Emu-220 (vt200-7bit mode),
 	cols#80, it#8, lines#24, vt#200,
 	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
 	blink=\E[0;5m, bold=\E[0;1m, clear=\E[2J\E[H, cr=\r,
-	cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch=\E[%p1%dP,
-	dch1=\E[1P, dl=\E[%p1%dM, dl1=\E[1M, ed=\E[0J, el=\E[0K,
-	el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I, hts=\EH,
+	cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C, cuu1=\E[1A,
+	dch=\E[%p1%dP, dch1=\E[1P, dl=\E[%p1%dM, dl1=\E[1M,
+	ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E)0, ht=^I, hts=\EH,
 	if=/usr/share/tabset/vt300, il=\E[%p1%dL, il1=\E[1L,
 	ind=\ED, is2=\E>\E[?1l\E[?3l\E[4l\E[?7h, kbs=^H,
 	kcmd=\E[29~, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
@@ -7113,7 +7236,8 @@ emu-220|Emu-220 (vt200-7bit mode),
 	    2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smcup=\E[?1l\E=, smkx=\E=,
 	smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, use=ansi+csr,
-	use=ansi+local, use=vt220+vtedit, use=vt220+cvis,
+	use=ansi+cup, use=ansi+local, use=vt220+vtedit,
+	use=vt220+cvis,
 
 #### MVTERM
 # A commercial product, Reportedly a version of Xterm with an OPEN LOOK UI,
@@ -7133,13 +7257,13 @@ mvterm|vv100|SwitchTerm aka mvTERM,
 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
 	el=\E[K, ich=\E[%p1%d@, ich1=\E[@, kcub1=\EOD, kcud1=\EOB,
 	kcuf1=\EOC, kcuu1=\EOA, op=\E[100m, rev=\E[7m, ri=\EM,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	rmkx=\E[?1l\E>, rmso=\E[m,
 	rs2=\E>\E[1;3;4;5;6l\E[?7h\E[100m\E[m\E[r\E[2J\E[H,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	sgr0=\E[m\017, smkx=\E[?1h\E=, smso=\E[7m, use=ansi+csr,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrul,
 	use=xterm+alt47, use=vt100+fnkeys, use=vt100+4bsd,
 	use=x10term+sl,
 
@@ -7152,15 +7276,15 @@ mterm-ansi|ANSI emulation,
 	am, bw, mir, msgr,
 	it#8,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dim=\E[2m, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%d`,
-	ht=^I, ich1=, ind=\E[S, is2=\E)0\017, kbs=^H, nel=\EE, ri=\E[T,
-	rmacs=^O, rmso=\E[27m, rmul=\E[24m,
+	bel=^G, cr=\r, dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX,
+	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\017,
+	kbs=^H, nel=\EE, ri=\E[T, rmacs=^O,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, vpa=\E[%i%p1%dd, use=ansi+erase,
-	use=ansi+idc1, use=ansi+idl, use=ansi+local,
-	use=ansi+sgrbold, use=ecma+index,
+	sgr0=\E[m\017, smacs=^N, vpa=\E[%i%p1%dd,
+	use=ecma+underline, use=ecma+standout, use=ansi+cup,
+	use=ansi+erase, use=ansi+idc1, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrbold, use=ecma+index,
 
 # mterm normally sets $TERM to "mterm"
 mterm|mouse-sun|Der Mouse term,
@@ -7177,25 +7301,20 @@ decansi|ANSI emulation with DEC compatibility hacks,
 	am, mir, msgr, xenl,
 	colors#8, it#8, pairs#64,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0, home=\E[H,
-	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\E[r\017,
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~,
-	kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, nel=\EE,
-	op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m, setab=\E[4%p1%dm,
+	bel=^G, cr=\r, dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX,
+	enacs=\E(B\E)0, hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S,
+	is2=\E)0\E[r\017, kbs=^H, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, setab=\E[4%p1%dm,
 	setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
-	vpa=\E[%i%p1%dd, use=ansi+cpr, use=ansi+csr,
-	use=ansi+erase, use=ansi+idc1, use=ansi+idl,
-	use=ansi+local, use=ansi+sgrbold, use=vt220+vtedit,
-	use=ecma+index, use=vt220+cvis,
+	vpa=\E[%i%p1%dd, use=ecma+underline, use=ecma+standout,
+	use=ansi+cpr, use=ansi+csr, use=ansi+cup, use=ansi+erase,
+	use=ansi+idc1, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrbold, use=vt220+vtedit, use=ecma+index,
+	use=vt220+cvis, use=vt220+sfkeys, use=xterm+r5+fkeys,
 
 #### VWM
 # http://vwm.sourceforge.net/
@@ -7207,20 +7326,18 @@ vwmterm|VWM terminal,
 	am, bce, ccc, mir, msgr, npc, xenl, xon,
 	colors#8, pairs#64,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L, ind=\n,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~,
-	kf11=\E[22~, kf12=\E[23~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D,
-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rmacs=\E[10m,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cvvis=\E[?25h, dim=\E[2m,
+	il1=\E[L, ind=\n, kdch1=\E[3~, kend=\E[4~, kf11=\E[22~,
+	kf12=\E[23~, khome=\E[1~, knp=\E[6~, kpp=\E[5~,
 	rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
 	setaf=\E[3%p1%dm,
 	sgr=\E[0;10%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
-	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, smso=\E[3m,
-	smul=\E[4m, use=ansi+erase, use=ansi+local, use=ansi+sgr,
-	use=vt220+cvis, use=xterm+alt1049,
+	sgr0=\E[0;10m, smam=\E[?7h, smso=\E[3m, smul=\E[4m,
+	use=ansi+cup, use=ansi+erase, use=ansi+local,
+	use=ansi+sgr, use=klone+acs, use=linux+lockeys,
+	use=vt100+noapp, use=vt220+cvis, use=vt220+ufkeys,
+	use=xterm+alt1049,
 
 #### MGR
 #
@@ -7251,16 +7368,35 @@ mgr-sun|Mgr window with Sun keyboard,
 	kopn=\E[198z, kpp=\E[216z, kund=\E[195z, use=mgr,
 mgr-linux|Mgr window with Linux keyboard,
 	ka1=\E[H, ka3=\E[5~, kb2=\E[G, kc1=\E[Y, kc3=\E[6~,
-	kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, kf1=\E[[A, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D,
-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, knp=\E[6~, kpp=\E[5~, use=mgr,
+	kdch1=\E[3~, kf0=\E[[J, knp=\E[6~, kpp=\E[5~,
+	use=linux+lockeys, use=vt220+ufkeys, use=xterm+pc+edit,
+	use=mgr,
 
 #### SIMPLETERM
 # st.suckless.org
 
 st|stterm|aka simpleterm,
-	use=st-0.8,
+	use=st-0.8.5,
+
+# Reviewed 0.9.2 (Debian testing package "stterm"):
+# Inspected source, saw nothing to change in terminfo.
+#
+# Reviewed 0.8.5 (Debian stable package "stterm"):
+# In tack,
+#	sends nothing for control- and alt-modifiers to function-keys
+#	does not support application-mode for numeric keypad
+# In vttest,
+#	identifies as a VT102
+#	SRM, DECTCEM and ECH work, but not DECSCA
+#	incomplete DECSCUSR, shapes work but no blinking cursor
+#	SD and SL work, but not SL or SR
+#	supports normal, button-event and any-event mouse
+#	focus events are unreliable
+# Other:
+#	supports xterm OSC 12, but not 112, so Cs applies but not Cr
+#	OSC allows ST \E\\ in addition to \007
+st-0.8.5|simpleterm 0.8.5,
+	Cs=\E]12;%p1%s\007, use=ansi+rep, use=st-0.8,
 
 # Reviewed 0.8.2:
 # In tack,
@@ -7335,18 +7471,17 @@ st-0.6|simpleterm 0.6,
 	clear=\E[H\E[2J, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
 	ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
-	flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%dG,
-	ich=\E[%p1%d@, is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~,
-	kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D,
-	kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~,
-	ka3=\E[5~, kb2=\EOu, kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z,
-	kclr=\E[3;5~, kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F,
-	khome=\E[1~, kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M,
-	kri=\E[1;2A, krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
+	flash=\E[?5h$<100/>\E[?5l, ich=\E[%p1%d@,
+	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
+	kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~,
+	kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~, ka3=\E[5~, kb2=\EOu,
+	kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z, kclr=\E[3;5~,
+	kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F, khome=\E[1~,
+	kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M, kri=\E[1;2A,
+	krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
 	op=\E[39;49m, ri=\EM, rmacs=\E(B, rmir=\E[4l,
-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
-	rs2=\E[4l\E>\E[?1034l, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	rmkx=\E[?1l\E>, rs1=\Ec, rs2=\E[4l\E>\E[?1034l,
+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	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}
@@ -7354,14 +7489,14 @@ st-0.6|simpleterm 0.6,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
 	    %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
 	smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=, u8=\E[?1;2c,
-	vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q,
-	use=ansi+apparrows, use=ansi+csr, use=ansi+enq,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+sgrbold, use=vt100+4bsd, use=vt100+pfkeys,
-	use=vt220+pcedit, use=ecma+index, use=xterm+alt1049,
-	use=vt220+cvis, use=xterm+sl, use=ecma+italics,
-	use=ecma+strikeout, use=bracketed+paste,
-	use=xterm+pcf2,
+	Se=\E[2 q, Ss=\E[%p1%d q, use=ecma+underline,
+	use=ecma+standout, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
+	use=ansi+local, use=ansi+rca2, use=ansi+sgrbold,
+	use=vt100+4bsd, use=vt100+pfkeys, use=vt220+pcedit,
+	use=ecma+index, use=xterm+alt1049, use=vt220+cvis,
+	use=xterm+sl, use=ecma+italics, use=ecma+strikeout,
+	use=bracketed+paste, use=xterm+pcf2,
 #
 # st-0.1.1
 #
@@ -7386,19 +7521,16 @@ simpleterm|old-st|simpleterm 0.1.1,
 	cols#80, it#8, lines#24,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	dch1=\E[P, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?, kdch1=\E[3~,
-	kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmso=\E[m,
-	rmul=\E[m,
+	cuu=\E[%p1%dA, cuu1=\E[A, dch1=\E[P, ed=\E[J, el=\E[K,
+	hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?,
+	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, knp=\E[6~, kpp=\E[5~,
+	rev=\E[7m,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
 	    %t;7%;m,
-	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+csr, use=ansi+idl, use=vt220+cvis,
-	use=ecma+index, use=klone+color, use=xterm+acs,
+	sgr0=\E[0m, use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+idl, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt220+cvis, use=ecma+index, use=klone+color,
+	use=vt100+pf1-pf4, use=xterm+r5+fkeys, use=xterm+acs,
 
 st-16color|stterm-16color|simpleterm with 16-colors,
 	use=ibm+16color, use=st,
@@ -7490,25 +7622,24 @@ terminator|Terminator no line wrap,
 	cols#80, it#8, lines#24, lm#0,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
-	flash=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=\E(B\E)0, flash=^G, ht=^I, hts=\EH, ind=\n,
 	is1=\E[?47l\E=\E[?1l,
 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?,
-	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
 	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, rev=\E[7m,
-	ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	khome=\E[1~, rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l,
 	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7
 	    %;m%?%p9%t\E(0%e\E(B%;,
-	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+local,
-	use=vt220+pcedit, use=ecma+italics, use=ecma+index,
+	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smul=\E[4m,
+	tbc=\E[3g, use=ecma+underline, use=ecma+standout,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+enq, use=ansi+idl, use=ansi+local,
+	use=ansi+rca2, use=bracketed+paste, use=ecma+italics,
+	use=ecma+index, use=vt100+pf1-pf4, use=vt220+cvis,
+	use=vt220+pcedit, use=xterm+r5+fkeys,
 	use=xterm+256setaf, use=xterm+sl-twm,
-	use=xterm+alt1049, use=vt220+cvis, use=bracketed+paste,
+	use=xterm+alt1049,
 
 #### TERMINOLOGY
 # https://www.enlightenment.org/about-terminology
@@ -7573,8 +7704,9 @@ terminology-0.6.1|EFL-based terminal emulator (0.6.1),
 	kLFT3=\E[1;3D, kLFT4=\E[1;4D, kLFT5=\E[1;5D,
 	kLFT6=\E[1;6D, kLFT7=\E[1;7D, kRIT3=\E[1;3C,
 	kRIT4=\E[1;4C, kRIT5=\E[1;5C, kRIT6=\E[1;6C,
-	kRIT7=\E[1;7C, kUP=\E[1;2A, use=ansi+enq, use=xterm+pcf0,
-	use=vt100, use=xterm+256setaf,
+	kRIT7=\E[1;7C, kUP=\E[1;2A, use=ansi+enq,
+	use=bracketed+paste, use=xterm+pcf0, use=vt100,
+	use=xterm+256setaf,
 
 # 2017-11-11:
 # Tested terminology 1.0.0
@@ -7607,7 +7739,7 @@ terminology-1.0.0|EFL-based terminal emulator (1.0.0),
 #	italics and crossed-out text work
 #	no meta mode
 # vttest -
-#	DA1 says this is a VT420 with with 132 columns, NRCS, horizontal scrolling
+#	DA1 says this is a VT420 with 132 columns, NRCS, horizontal scrolling
 #	DA2 says this is a VT510, version 33.7
 #	NRCS does not work, program hangs in the locking shift test.
 #	some of the VT420 rectangle operations work
@@ -7690,7 +7822,8 @@ alacritty-direct|alacritty with direct color indexing,
 alacritty+common|base fragment for alacritty,
 	km@, npc,
 	kb2=\EOE, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
-	Smulx=\E[4:%p1%dm, use=ecma+index, use=xterm+focus,
+	Smulx=\E[4:%p1%dm, rv=\E\\[>0;25[0-9][0-9];1c,
+	use=ecma+index, use=report+da2, use=xterm+focus,
 	use=xterm+sm+1006, use=xterm-basic, use=xterm+app,
 	use=ansi+rep, use=xterm+tmux, use=ecma+strikeout,
 	use=xterm+sl-twm, use=ecma+italics, use=xterm+pce2,
@@ -7700,7 +7833,7 @@ alacritty+common|base fragment for alacritty,
 # derived from alacritty
 rio|fork of alacritty,
 	use=alacritty,
-rio-direct|fork of alacritty,
+rio-direct|rio with direct-colors,
 	use=alacritty-direct,
 
 #### Kitty
@@ -7825,22 +7958,24 @@ kitty+common|KovId's TTY common properties,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ich=\E[%p1%d@, ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kbs=^?,
-	kcbt=\E[Z, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E]\E\\\Ec,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+	ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
+	ich=\E[%p1%d@, ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kcbt=\E[Z,
+	op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
+	rmir=\E[4l, rmkx=\E[?1l, rs1=\E]\E\\\Ec,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
 	    %?%p1%p3%|%t;7%;m,
 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
-	Smulx=\E[4:%p1%dm, use=ansi+csr, use=ansi+enq,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	smkx=\E[?1h, Smulx=\E[4:%p1%dm,
+	rv=\E\\[>1;4[0-9][0-9][0-9];41c,
+	xr=\EP>\\|kitty\\([0-9]+\\.[0-9]+\\.[0-9]+\\)\E\\
+	   \\,
+	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
 	use=ansi+rep, use=xterm+focus, use=xterm+sm+1006,
-	use=ecma+index, use=xterm+pcfkeys, use=xterm+sl-twm,
-	use=ecma+strikeout, use=ecma+italics,
+	use=ecma+index, use=ecma+strikeout, use=ecma+italics,
+	use=ecma+standout, use=ecma+underline, use=linux+kbs,
+	use=report+da2, use=xterm+pcfkeys, use=xterm+sl-twm,
 	use=xterm+alt1049, use=att610+cvis, use=xterm+tmux,
 	use=bracketed+paste, use=report+version,
 
@@ -7852,7 +7987,15 @@ kitty+setal|set underline colors (nonstandard),
 
 #### Foot
 # https://codeberg.org/dnkl/foot/
-# Version 1.8.2
+# Version 1.18.1 2024/08/17
+#
+# vttest:
+#	device attributes list 28=rectangular editing
+#	supports rectangle operations, but problems with left/right margins
+#	reports window-size, but not icon or window label
+#	numeric keypad has no application-mode
+#
+# Version 1.8.2 2021/07/31
 #
 # This identifies as a VT220 with 4=sixel and 22=color, however:
 # tack:
@@ -7871,7 +8014,7 @@ kitty+setal|set underline colors (nonstandard),
 #	otherwise few reports, except cursor-position and mouse and some dtterm
 #	VT520 cursor-movement works, except for left/right margins
 #	supports xterm/DECSCUSR, though default case in vttest does not blink
-#		Send: <27> [ 0 <32> q 
+#		Send: <27> [ 0 <32> q
 #		Text: The cursor should be a blinking rectangle
 #	partial support for xterm mouse any-event mode and button-event mode:
 #	+ does not report focus-in/focus-out
@@ -7889,20 +8032,24 @@ foot+base|foot base fragment,
 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
 	flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?,
-	kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+	kcbt=\E[Z, nel=\EE, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmm=\E[?1036h\E[?1034l,
 	rs1=\Ec, rs2=\E[!p\E[4l\E>,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
-	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, E3=\E[3J,
-	use=att610+cvis, use=ansi+csr, use=ansi+cup,
-	use=ansi+enq, use=ansi+local, use=ansi+idc, use=ansi+idl,
-	use=ansi+rca2, use=ansi+rep, use=ansi+tabs,
-	use=ansi+sgrbold, use=ecma+index, use=ecma+italics,
-	use=ecma+strikeout, use=xterm+acs, use=xterm+alt+title,
-	use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
-	use=xterm+sl-alt, use=bracketed+paste,
-	use=report+version, use=xterm+focus,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=,
+	smm=\E[?1036l\E[?1034h, E3=\E[3J, Smulx=\E[4:%p1%dm,
+	rv=\E\\[>1;[0-9];0c,
+	xr=\EP>\\|foot\\([0-9][.0-9](-.*)?\\)?\E\\\\,
+	use=ecma+underline, use=ecma+standout, use=att610+cvis,
+	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local,
+	use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep,
+	use=ansi+tabs, use=ansi+sgrbold, use=ecma+index,
+	use=ecma+italics, use=ecma+strikeout, use=kitty+setal,
+	use=xterm+acs, use=xterm+alt+title, use=xterm+pcfkeys,
+	use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt,
+	use=bracketed+paste, use=report+version,
+	use=xterm+focus,
 
 ######## WEB CLIENTS
 
@@ -7918,6 +8065,30 @@ foot+base|foot base fragment,
 # it can connect to, and display in, a web browser, or as a standalone Qt
 # application.  Either way, it displays in the current desktop session.
 #
+# Testing AppImage for 3.2.0, on Fedora 40:
+# + appears to implement erase-display by painting a double-line on the screen,
+#   doesn't use full screen for ded though it sort-of works for vi.
+# + sets TERMINFO in its shell (imitating iTerm2), and TERM=domterm-xterm which
+#   doesn't work when doing sudo.  According to the git log, that was April 1,
+#   2023.  The VTE developers copied the feature (i.e., a partially workable
+#   private terminal database) in February 2024.
+# + the canonical name for the terminal description is still "domterm", and
+#   presumably the "domterm-xterm" alias is a workaround for hardcoded scripts
+#   that look for "xterm".
+# + almost all of the differences between ncurses's "domterm" and DomTerm's
+#   are additions, but (read further) most are untestable due to breakage in
+#   the program.
+# + DomTerm's updated terminal description says it implements italics, but
+# + hangs in tack when doing blink (just before testing italics)
+# + vttest, ncurses test-program also fare badly, e.g., due to improper line
+#   wrapping and/or inability to consistently clear the screen.
+#
+# The review of DomTerm 3.2.0 was prompted by noticing this page
+#     https://domterm.org/Wire-byte-protocol.html
+# which goes on at length for extensions which collide with a commonly-used
+# control for restoring a saved cursor position:
+#     CSI u     Restore cursor (SCORC, also ANSI.SYS).
+#
 # Testing current code (2019/07/06) with Fedora 30:
 # tack
 #	no flash
@@ -7956,13 +8127,87 @@ domterm|DomTerm web client,
 	bel@, blink@, dim@, invis@, kcbt=\E[Z, ritm@, rmkx=\E[?1l,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
 	    %t;7%;m,
-	sitm@, smkx=\E[?1h, use=linux+kbs, use=xterm+256setaf,
-	use=ecma+index, use=xterm+focus, use=xterm+sm+1006,
-	use=xterm+pcfkeys, use=xterm-basic,
-	use=bracketed+paste,
+	sitm@, smkx=\E[?1h, rv=\E\\[>990;[0-9];0c,
+	xr=\EP>\\|DomTerm\\([0-9][.0-9]\\)?\E\\\\,
+	use=bracketed+paste, use=linux+kbs, use=xterm+256setaf,
+	use=ecma+index, use=report+da2, use=report+version,
+	use=xterm+focus, use=xterm+sm+1006, use=xterm+pcfkeys,
+	use=xterm-basic,
 
 ######## Miscellaneous
 
+#### pangoterm
+# https://www.leonerd.org.uk/code/pangoterm/
+# https://github.com/bfredl/pangoterm
+# https://github.com/neovim/libvterm
+#
+# which says:
+# "A GTK/Pango-based terminal that uses libvterm to provide terminal
+# emulation."
+#
+# This probably has few users, because it cannot put the cursor reliably in the
+# right place (i.e., it appears several columns to the right).  It is included
+# here because it implements what Evans refers to as "fixterms" but sets TERM
+# to "xterm".
+#
+# vttest:
+# - no 80/132 column mode
+# - no blink mode
+# - no protected modes
+# - fails wrapping tests
+# - no VT52
+# - responds to ENQ with illegal character
+# - no SRM
+# - no origin mode
+# - identifies as VT100 with AVO
+# - responds to secondary DA as \E[>0;100;0c
+# - responds to DECREQTPARM with illegal character
+# - no application-keypad
+# - has application cursor-keys
+# - backspace key sends DEL, does not support toggle for BS
+# - keyboard does not provide LF
+# - has DECTCEM and ECH
+# - has REP, SD and SL
+# - has CBT, CHT, CNL, CPL
+# - has ISO 6429 colors
+# - BCE tests partially work (text is cleared incorrectly)
+# - lacks any other VT220 or higher features.
+# - xterm mouse except for modes 9 and 1001
+# wraptest:
+# - 6/25 differences from xterm
+# tack:
+# - no dim mode
+# - no invisible mode
+# - has italics
+# - has strike-out mode
+pangoterm|terminal using libvterm,
+	am, bce, mir, msgr, npc, xenl, AX, XT,
+	colors#8, cols#80, lines#24, pairs#64,
+	bel=^G, blink@, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ich=\E[%p1%d@,
+	ind=\n, invis@, is2=\E[!p, kbs=^?, kcbt=\E[Z, nel=\EE,
+	op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
+	rs1=\Ec, rs2=\E[!p, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+	    %t;7%;m,
+	sgr0=\E(B\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h,
+	rv=\E\\[>0;100;0c, use=ecma+underline,
+	use=ecma+standout, use=ecma+index, use=ansi+rep,
+	use=ecma+strikeout, use=xterm+pcfkeys,
+	use=bracketed+paste, use=vt420+lrmm, use=xterm+focus,
+	use=xterm+sm+1006, use=ecma+italics, use=ansi+csr,
+	use=ansi+cup, use=ansi+enq, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+	use=ansi+sgrbold, use=xterm+alt+title, use=att610+cvis,
+	use=xterm+acs,
+
+pangoterm-256color|pangoterm with 256-colors,
+	use=xterm+256setaf2, use=pangoterm,
+
+pangoterm-direct|pangoterm with direct-colors,
+	use=xterm+direct, use=pangoterm,
+
 #### WezTerm
 # https://wezfurlong.org/wezterm/
 # https://github.com/wez/wezterm
@@ -7971,6 +8216,27 @@ domterm|DomTerm web client,
 # "wezterm is a terminal emulator with support for modern features
 #  such as fonts with ligatures, hyperlinks, tabs and multiple windows."
 #
+# The documentation bears mention.  It refers to the "ANSI" standard and
+# 	https://wezfurlong.org/wezterm/what-is-a-terminal.html#ansi-and-ecma-48
+# X3.64 (withdrawn long ago).  A related website
+#	https://github.com/wez/ecma48
+# states that ECMA-48 was issued in 1979 and not revised since.  Actually that
+# was the second revision; the fifth revision in 1991 is current.  The source
+# code refers to the second revision in a half-dozen places.  Further, there
+# are three times as many references to Wikipedia as to xterm's documentation.
+# The git commit comments in several instances hint at an incomplete reading
+# of the relevant standards.
+#
+# wezterm-20240203-110809-5046fc22 tested with MacOS
+# General:
+# + initial screensize is now 80x24
+# tack:
+# + no change
+# wraptest:
+# + erasures (EL, ED, DCH, ICH, ESC) do not cancel wrap
+# vttest:
+# + some of the problems with debris have been fixed
+#
 # wezterm-20230712_072601_f4abf8fd-1.fedora38.x86_64
 # tested with MacOS and Fedora 38/39.
 #
@@ -7995,7 +8261,7 @@ domterm|DomTerm web client,
 # + poor (doesn't copy anyone, most of the results are wrong)
 # vttest:
 # + DA is VT5xx with sixel, selective erase, user windows, color
-# + DA2 is VT220 version 277
+# + DA2 is VT220 version 277, perhaps a reference to xterm #277
 # + only the VT100 character set works, contrary to DA/DA2.
 # + no NRCS, either
 # + double-sized character work, with some debris
@@ -8017,9 +8283,28 @@ domterm|DomTerm web client,
 # + implements xterm normal, any-event and button-event mouse, none of the rest
 # + reports window size, none of the other window reports
 wezterm|Wez's Terminal Emulator,
-	km@, xenl@,
-	cvvis@, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@,
-	use=xterm-256color,
+	am, bce, km, mir, msgr, npc, xenl,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, ech=\E[%p1%dX,
+	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ind=\n,
+	is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, kend=\EOF,
+	op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>,
+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, Smol=\E[53m,
+	Smulx=\E[4:%p1%dm, rv=\E\\[>1;277;0c,
+	xr=\EP>\\|WezTerm ([0-9]+)(-[[:xdigit:]]+)+\E\\\\,
+	use=ecma+underline, use=ecma+standout,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
+	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
+	use=report+da2, use=report+version, use=vt220+cvis,
+	use=xterm+256color2, use=xterm+acs,
+	use=xterm+alt+title, use=xterm+focus, use=xterm+pcc2,
+	use=xterm+pce2, use=xterm+pcf2, use=xterm+sl-alt,
+	use=xterm+sm+1006, use=xterm+tmux,
 
 #### Contour
 # https://github.com/contour-terminal/contour
@@ -8034,6 +8319,21 @@ wezterm|Wez's Terminal Emulator,
 # - cannot run, because the package is not signed.
 #
 # Fedora rawhide
+# contour-terminal-0.6.1.7494-2.fc42.x86_64
+# - most core dumps are finally gone, works when 3D acceleration is disabled.
+# - fails mir and related "in" tests in tack.
+# - function-keys do not match developer's version.
+# - sitm/ritm (italics) still do not work.
+# - private mode 12 (cursor) does not work.
+# - source code references Unicode values to a page which has none:
+#   https://vt100.net/docs/vt102-ug/chapter5.html#T5-13
+#   (actual source for this information is xterm)
+# - identifies as a VT525 with sixel graphics, UDK, rectangle editing and color.
+# - adds a control sequence to retrieve contents of entire screen.
+# - dumps core in vttest for rectangle editing
+# - UDK feature does not work
+# - fails vttest for REP, SL, SR, CBT, CHT, VPR
+# - sixel feature needs some work (most of my testcases do not work) -TD
 # contour-terminal-0.3.12.262-6.fc39.x86_64
 # - dumps core, cannot test
 #
@@ -8075,32 +8375,198 @@ wezterm|Wez's Terminal Emulator,
 #
 # Developer's terminfo (compiled-in) uses some extensions.
 contour|contour-latest|Contour Terminal Emulator,
-	am, bce, eslok, hs, km, mc5i, mir, msgr, npc, xenl, xvpa,
+	am, bce, mc5i, msgr, npc, xenl, xvpa, AX, XT,
 	cols#80, lines#24, pairs#0x7fff,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	dim=\E[2m, dsl=\E[$~, ech=\E[%p1%dX, el1=\E[1K,
-	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, hpa=\E[%i%p1%dG,
-	ind=\n, indn=\E[%p1%dS, invis=\E[8m, ka1=, ka3=, kbs=^?, kc1=,
-	kc3=, kcbt=\E[Z, kend=\EOF, khlp=, kmous=\E[M, kund=,
-	oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM,
-	rin=\E[%p1%dT, rmam=\E[?7l, rmkx=\E[?1l, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E]\E\\\Ec,
-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
-	    %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
-	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h, smso=\E[7m,
-	smul=\E[4m, tsl=\E[2$~\E[1$}\E[H\E[2J, vpa=\E[%i%p1%dd,
+	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
+	ech=\E[%p1%dX, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
+	ind=\n, ka1=, ka3=, kbs=^?, kc1=, kc3=, kcbt=\E[Z, kend=\EOF,
+	kf13=\E[O2P, kf14=\E[O2Q, kf15=\E[O2R, kf16=\E[O2S,
+	kf25=\E[O5P, kf26=\E[O5Q, kf27=\E[O5R, kf28=\E[O5S,
+	kf37=\E[O6P, kf38=\E[O6Q, kf39=\E[O6R, kf40=\E[O6S,
+	kf49=\E[O3P, kf50=\E[O3Q, kf51=\E[O3R, kf52=\E[O3S,
+	kf61=\E[O4P, kf62=\E[O4Q, kf63=\E[O4R, khlp=, kmous=\E[M,
+	kund=, oc=\E]104\E\\, op=\E[39;49m, ri=\EM, rmam=\E[?7l,
+	rmkx=\E[?1l, rs1=\E]\E\\\Ec,
+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;
+	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h,
 	Cs=\E]12;%p1%s\E\\, E3=\E[3J, Rmol=\E[55m, Se=\E[ q,
 	Smol=\E[53m, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
+	xr=\EP>\\|contour ([0-9]\\.[0-9]\\.[0-9])\E\\\\,
+	use=ecma+underline, use=ecma+standout,
 	use=ansi+apparrows, use=ansi+cup, use=ansi+csr,
-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
-	use=att610+cvis, use=ecma+italics, use=ecma+strikeout,
+	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+	use=ansi+sgrbold, use=bracketed+paste, use=dec+sl,
+	use=ecma+index, use=vt220+cvis, use=ecma+strikeout,
 	use=xterm+256color, use=xterm+acs, use=xterm+alt1049,
 	use=xterm+pcc2, use=xterm+pce2, use=xterm+pcf2,
+	use=report+version,
 
 contour-direct|Contour terminal with direct colors,
 	use=xterm+direct, use=contour,
 
+#### Ghostty
+# https://github.com/ghostty-org/ghostty
+#
+# Its readme and man page begin with a lot of hype, concluding with
+#
+#	While aiming for this ambitious goal, our first step is to make Ghostty
+#	one of the best fully standards compliant terminal emulator, remaining
+#	compatible with all existing shells and software while supporting all
+#	of the latest terminal innovations in the ecosystem.  You can use
+#	Ghostty as a drop-in replacement for your existing terminal emulator.
+#
+# However, it uses xterm as a standard:
+#
+#	We believe Ghostty is one of the most compliant terminal emulators
+#	available.  Terminal behavior is partially a de jure standard (i.e.
+#	[ECMA-48](https://ecma-international.org/publications-and-standards/stand>
+#	but mostly a de facto standard as defined by popular terminal emulators
+#	worldwide.  Ghostty takes the approach that our behavior is defined by
+#	(1) standards, if available, (2) xterm, if the feature exists, (3)
+#	other popular terminals, in that order.  This defines what the Ghostty
+#	project views as a "standard."
+#
+# while xterm uses ECMA-48 and DEC 070 along with related documentation such as
+# the DEC terminal reference manuals.  xterm's documentation does not attempt
+# to duplicate those sources of information, so that developers should rely
+# upon both xterm's documentation and the published standards.
+#
+# Comments in ghostty's source code and commits demonstrate that the developers
+# study xterm's source code closer than xterm's documentation.  The quote above
+# is the only mention of ECMA-48.
+#
+# ghostty 1.1.0 tested with Arch Linux:
+# -------------
+# The issue with vttest is repaired.  Other issues remain.  The reader may not
+# have noticed, but the ghostty developers disallow direct bug reports.
+# Quoting the developers:
+#
+#	https://github.com/ghostty-org/ghostty/issues/3558
+#	Users are not allowed to create Issues directly in this repository - we
+#	ask that you create a Discussion first.
+#	...
+#	Any Discussion which clearly identifies a problem in Ghostty and can be
+#	confirmed or reproduced will be converted to an Issue by a maintainer,
+#	so as a user finding a valid problem you don't do any extra work
+#	anyway.  Thank you.
+#
+# As a direct consequence, details and attribution in those "Discussion" notes
+# may be omitted, as in this instance.
+#
+# https://web.archive.org/web/20250124124041/https://github.com/ghostty-org/ghostty/issues/2542
+# ghostty #2542 Publish ghostty terminfo to ncurses terminal database
+# Opened October 30, 2024, this terminal description is mentioned December 31.
+#
+# https://web.archive.org/web/20250115170223/https://github.com/ghostty-org/ghostty/issues/4523
+# ghostty #4523 Renderers (Metal and OpenGL) should clip terminal if terminal
+#		grid size mismatches physical window
+# Opened January 3, 2025, with a note
+#	The only known way to trigger this is DECCOLM, so it's low priority
+#	since almost nothing uses this.  But notably vtetest uses this and it
+#	makes it appear like we perform much worse than we do.
+#
+# Issue #4523 does not mention the bug report (nor, as in some other instances
+# refer obliquely to a discussion on "Discord").  vttest sends a DECCOLM to
+# ensure that the screen is not in 132-column mode.  That is the case for the
+# testing reported.  If ghostty were implementing DECCOLM correctly, it would
+# not have decided that the screensize changed.  The fix in #4523 is a
+# workaround masking other potential issues.
+#
+# By the way, that should be "vttest" (there is no such program as "vtetest").
+#
+# ghostty 1.0.0 tested with Arch Linux:
+# -------------
+# tack:
+# - does not implement blinking text
+# - does not implement meta mode (kmm).
+# - implements VT100-style alternate character set
+# - testing video-attributes unexpectedly clears the display before acsc
+# - italics and strike-out work
+# - function-keys mostly match; however because this client (unlike X11
+#   clients) does not work with a remote display, some (such as control/alt key
+#   combinations, and the shifted editing keys) are untestable because
+# - numeric keypad does not send VT100-style escapes
+# wraptest:
+# - matches xterm
+# vttest:
+# - ghostty hangs in more than one menu, making it impossible to test more than
+#   a small part of the program.  In particular, these are untestable:
+#	1. Test of cursor movements
+#	2. Test of screen features
+#	4. Test of double-sized characters
+# - ghostty has tabs (imitating gnome-terminal); when closing a tab with a
+#   running process (e.g., a hung vttest), ghostty does not prompt about the
+#   process to be killed.
+# - identifies as a "VT220 with color":
+#	<27> [ ? 6 2 ; 2 2 c
+# - although claiming to be a VT220, it does not support NRCS.  Actually, it
+#   fails the VT100 character set test as well.  This is a complete failure:
+#	3. Test of character sets
+# - it does not hang in this menu entry:
+#	8. Test of VT102 features (Insert/Delete Char/Line)
+#   although because it does not implement double-sized characters, most of
+#   that test counts as a failure.
+# - implements VT220 DECTCEM and ECH, but not SRM or DECSCA
+# - implements VT420 left/right margins
+# - does not implement VT420 rectangle operations
+# - does not implement 8-bit controls
+# - does implement ISO-6429 cursor-movement
+# - supports BCE partially: ED/EL work, but not ECH and indexing.
+# - does not support blinking text
+# - responds to XTVERSION
+# - responds to DECRPM controls, though many are "unknown"
+# - does not respond to most DECRQSS except for SGR, DECSCUSR, DECSTBM
+# - implements most of xterm mouse protocol except for
+#   - Mouse Highlight Tracking
+#   - DEC Locator Events
+# - some window reporting works:
+#   14 - size of text area in pixels
+#   16 - size of character in pixels
+#   18 - size of window in chars
+#   21 - report window label
+# - window-modifying does not work
+# - cursor position is incorrect after switching to/from alternate screen
+#
+# The developers set "Tc" in their terminal description to hint that it
+# supports direct-colors, but the feature did not work with this version -TD
+ghostty|Ghostty terminal emulator,
+	am, bce, km, mc5i, mir, msgr, npc, xenl, AX, XT,
+	cols#80, lines#24, pairs#0x7fff,
+	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+	     yzz{{||}}~~,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J,
+	cnorm=\E[?12l\E[?25h, cr=\r, cub1=^H, cud1=\n,
+	cvvis=\E[?12;25h, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
+	flash=\E[?5h$<100/>\E[?5l, ind=\n, invis=\E[8m, kbs=^?,
+	kcbt=\E[Z, kend=\EOF, kent=\EOM, op=\E[39;49m, rev=\E[7m,
+	ri=\EM, rmam=\E[?7l, rmcup=\E[?1049l, rmkx=\E[?1l\E>,
+	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
+	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
+	      5;%p1%d%;m,
+	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5
+	      ;%p1%d%;m,
+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+	    %t;7%;%?%p5%t;2%;%?%p7%t;8%;m,
+	sgr0=\E(B\E[m, smam=\E[?7h, smcup=\E[?1049h,
+	smkx=\E[?1h\E=, E3=\E[3J, Ms=\E]52;%p1%s;%p2%s\007,
+	Se=\E[2 q, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
+	rv=\E\\[>[0-9];[0-9];[0-9]c,
+	xr=\EP>\\|ghostty %[0-9.]([[:print:]])*\E\\\\,
+	use=linux+kbs, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+enq, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rca2, use=ansi+rep, use=ansi+sgrso,
+	use=ansi+sgrul, use=ansi+tabs, use=ecma+index,
+	use=ecma+italics, use=ecma+strikeout,
+	use=report+version, use=vt220+cvis,
+	use=xterm+256color2, use=xterm+acs,
+	use=xterm+alt+title, use=bracketed+paste,
+	use=kitty+setal, use=vt420+lrmm, use=xterm+focus,
+	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2,
+	use=xterm+sm+1006, use=xterm+sl-twm,
+
 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
 #
 
@@ -8133,24 +8599,23 @@ eterm|GNU Emacs term.el terminal emulation,
 	am, mir, xenl,
 	cols#80, lines#24,
 	bel=^G, bold=\E[1m, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n,
-	rev=\E[7m, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+cpr,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=xterm+alt47,
+	cud1=\n, dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, ht=^I,
+	ich=\E[%p1%d@, ind=\n, rev=\E[7m, rmir=\E[4l, sgr0=\E[m,
+	smir=\E[4h, use=ansi+cpr, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
+	use=ansi+sgrul, use=xterm+alt47,
 
 # The codes supported by the term.el terminal emulation in GNU Emacs 22.2
 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
 	msgr,
 	colors#8, pairs#64,
-	kbs=^?, khome=\E[1~, op=\E[39;49m, ri=\EM, rmso=\E[27m,
-	rmul=\E[24m, rs1=\Ec, setab=\E[%p1%'('%+%dm,
-	setaf=\E[%p1%{30}%+%dm,
+	kbs=^?, khome=\E[1~, op=\E[39;49m, ri=\EM, rs1=\Ec,
+	setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?
 	    %p7%t;8%;m,
-	sgr0=\E[m, use=ansi+apparrows, use=ansi+csr,
-	use=ansi+sgr, use=vt220+pcedit, use=eterm,
+	sgr0=\E[m, use=ecma+underline, use=ecma+standout,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+sgr,
+	use=vt220+pcedit, use=eterm,
 
 # shell.el can "do" color, though not nearly as well.
 #
@@ -8168,9 +8633,8 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
 dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes,
 	am, hc,
 	it#8, ncv#13,
-	bold=\E[1m, cud1=\n, ht=^I, ind=\n, op=\E[39;49m,
-	rmul=\E[24m, sgr0=\E[m, smul=\E[4m, use=ecma+italics,
-	use=klone+color,
+	bold=\E[1m, cud1=\n, ht=^I, ind=\n, op=\E[39;49m, sgr0=\E[m,
+	use=ecma+underline, use=ecma+italics, use=klone+color,
 
 #### Screen
 
@@ -8249,25 +8713,23 @@ screen-base|VT 100/ANSI X3.64 virtual terminal (base),
 	ncv@, U8#1,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	blink=\E[5m, bold=\E[1m, civis=\E[?25l,
-	cnorm=\E[34h\E[?25h, cub1=^H, cud1=\n,
+	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0,
-	kbs=^?, kcbt=\E[Z, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0, kbs=^?, kcbt=\E[Z,
 	khome=\E[1~, kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM,
-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
+	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
 	rs2=\Ec\E[?1000l\E[?25h,
 	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
 	    5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m,
-	smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c,
+	E0=\E(B, S0=\E(%p1%c, use=ecma+underline,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049,
-	use=ecma+color, use=vt100+enq, use=vt100+4bsd,
+	use=ansi+rca2, use=bracketed+paste, use=ecma+color,
+	use=vt100+pf1-pf4, use=vt220+pcedit, use=xterm+alt1049,
+	use=xterm+kbs, use=vt100+enq, use=vt100+4bsd,
+	use=xterm+r5+fkeys, use=wyse+cvis,
 
 screen|VT 100/ANSI X3.64 virtual terminal,
 	use=screen4,
@@ -8335,7 +8797,7 @@ screen.mlterm-256color|GNU Screen with mlterm using 256 colors,
 
 # ======================================================================
 
-# Read the fine manpage:
+# Read the fine man page:
 #       When  screen  tries  to  figure  out  a  terminal name for
 #       itself, it first looks for an entry named "screen.<term>",
 #       where  <term>  is the contents of your $TERM variable.  If
@@ -8343,12 +8805,11 @@ screen.mlterm-256color|GNU Screen with mlterm using 256 colors,
 #       if the terminal is wide (132 cols or more)).  If even this
 #       entry cannot be found, "vt100" is used as a substitute.
 #
-# Notwithstanding the manpage, screen uses its own notion of the termcap
+# Notwithstanding the man page, screen uses its own notion of the termcap
 # and some keys from "screen.<term>" are ignored.  Here is an entry which
 # covers those (tested with screen 4.00.02) -TD
 screen+fkeys|function-keys according to screen,
-	kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kfnd@,
-	khome=\E[1~, kslt@,
+	kend=\E[4~, kfnd@, khome=\E[1~, kslt@, use=vt100+pf1-pf4,
 
 # See explanation before "screen" entry.  Cancel italics so that applications
 # do not assume screen supports the feature.  Add this tweak to entries which
@@ -8474,23 +8935,22 @@ screen2|VT 100/ANSI X3.64 virtual terminal (old 2.x),
 	ed=\E[J, el=\E[K, ich1=, ind=\n, kbs=^H, kf0=\E~, kf1=\ES,
 	kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER,
 	kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmso=\E[23m,
-	rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smso=\E[3m,
-	smul=\E[4m, use=ansi+idc, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local, use=vt52+arrows,
+	rs1=\Ec, sc=\E7, sgr0=\E[m, smso=\E[3m, use=ecma+underline,
+	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
+	use=ansi+local, use=vt52+arrows,
 
 # (screen3: removed unknown ":xv:LP:G0:" -- esr)
 screen3|VT 100/ANSI X3.64 virtual terminal (old 3.x),
 	km, mir, msgr,
 	cols#80, lines#24,
 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP,
-	dch1=\E[P, home=\E[H, ich=\E[%p1%d@, ind=\n, is2=\E)0,
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E[7m,
-	ri=\EM, rmir=\E[4l, rmkx=\E>, rmso=\E[23m, rmul=\E[24m,
-	rs1=\Ec, sgr0=\E[m, smir=\E[4h, smkx=\E=, smso=\E[3m,
-	smul=\E[4m, use=ansi+csr, use=ansi+erase, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local,
+	cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@, ind=\n,
+	is2=\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+	kcuu1=\EOA, nel=\EE, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E>,
+	rmso=\E[23m, rs1=\Ec, sgr0=\E[m, smir=\E[4h, smkx=\E=,
+	smso=\E[3m, use=ecma+underline, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=vt100+pf1-pf4,
 
 # screen 4.0 was released 2003-07-21, and as of March 2019, its terminfo file
 # was last updated in 2009 to include 256-color support.  The most recent
@@ -8498,23 +8958,20 @@ screen3|VT 100/ANSI X3.64 virtual terminal (old 3.x),
 screen4|VT 100/ANSI X3.64 virtual terminal (4.x),
 	use=ecma+index, use=screen-base,
 
-# As of December 2022, screen 5.0 has not been released.
-#
-# However,
+# screen 5.0 was released in August 2024.  As of May 2025, few systems use it.
 #
 #	https://savannah.gnu.org/bugs/?36676
 #
-# mentions a change to implement italics which should be in a version 5,
-# (implemented 2016-11-05, but merged 2017-07-09).  That does away with the
-# longstanding use of SGR 3 for standout, and interprets it as italics.
+# mentions a change to implement italics (implemented 2016-11-05, merged
+# 2017-07-09), this may do away with the longstanding use of SGR 3 for
+# standout, interpreting it as italics.
 #
-# The same development branch has some support for direct-colors, but none
-# of this has been documented.
-screen5|VT 100/ANSI X3.64 virtual terminal (someday),
-	rmso=\E[27m,
+# This version has limited support for direct-colors, but does not use the
+# outer terminal's $TERM in deciding if or how to apply this.
+screen5|VT 100/ANSI X3.64 virtual terminal (5.x),
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
-	smso=\E[7m, use=ecma+italics, use=ecma+index,
+	use=ecma+standout, use=ecma+italics, use=ecma+index,
 	use=screen-base,
 
 #### Tmux
@@ -8528,10 +8985,10 @@ screen5|VT 100/ANSI X3.64 virtual terminal (someday),
 # various entries such as screen.xterm-new provide a way to more closely
 # match the terminal.
 tmux|tmux terminal multiplexer,
-	invis=\E[8m, rmso=\E[27m,
+	invis=\E[8m,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	smso=\E[7m, E3=\E[3J, Smulx=\E[4:%p1%dm,
+	E3=\E[3J, Smulx=\E[4:%p1%dm, use=ecma+standout,
 	use=ecma+italics, use=ecma+strikeout, use=xterm+edit,
 	use=xterm+pcfkeys, use=xterm+sl, use=xterm+tmux,
 	use=screen, use=bracketed+paste, use=report+version,
@@ -8551,7 +9008,7 @@ tmux-direct|tmux with direct-color indexing,
 # "xterm-256color" (hard-coded), which in its pretense that it is xterm, is
 # several years out of date.
 #
-# There is little documentation; the existing manpages amount to a quarter of
+# There is little documentation; the existing man pages amount to a quarter of
 # the length of mosh.org's heavily promotional website.  This entry is based
 # on testing, and reading the source-code.  For the latter, analysis is aided
 # by the developer's extensive use of hard-coded strings.
@@ -8616,31 +9073,26 @@ dvtm|dynamic virtual terminal manager,
 	ncv@,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, el1=\E[1K,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
-	is1=\E[?47l\E=\E[?1l,
+	ich=\E[%p1%d@, ich1=\E[@, is1=\E[?47l\E=\E[?1l,
 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy,
 	kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kel=\E[8\^,
-	kend=\E[8~, kent=\EOM, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[23$,
-	kf22=\E[24$, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, rev=\E[7m,
-	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	kend=\E[8~, kent=\EOM, kf0=\E[21~, kf21=\E[23$,
+	kf22=\E[24$, khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b,
+	rev=\E[7m, ri=\EM, rmir=\E[4l,
 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
 	    25h,
 	s0ds=\E(B, s1ds=\E(0,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
 	    %p9%t\016%e\017%;,
-	sgr0=\E[m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+idl, use=ansi+local, use=xterm+alt47,
-	use=vt220+vtedit, use=vt220+cvis, use=ecma+color,
-	use=ecma+italics, use=vt100+4bsd,
+	sgr0=\E[m\017, smir=\E[4h, use=ecma+underline,
+	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idl, use=ansi+local, use=ansi+rca2,
+	use=xterm+alt47, use=vt220+vtedit, use=vt220+cvis,
+	use=ecma+color, use=ecma+italics, use=vt100+4bsd,
+	use=vt220+sfkeys, use=xterm+r5+fkeys,
 
 dvtm-256color|dynamic virtual terminal manager with 256 colors,
 	colors#0x100, pairs#0x10000,
@@ -8689,10 +9141,9 @@ dvtm-256color|dynamic virtual terminal manager with 256 colors,
 ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	am, km, mir, msgr, xenl,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
-	flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
+	cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, ht=^I,
+	hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
 	ind=\n$<150*>,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>,
 	kdch1=\E[4~, kend=\E[5~, kf1=\E[17~, kf10=\E[28~,
@@ -8701,15 +9152,15 @@ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khlp=\E[1~,
 	khome=\E[2~, knp=\E[6~, kpp=\E[3~, mc4=\E[4i, mc5=\E[5i,
 	rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM,
-	rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l, rmso=\E[27m,
-	rmul=\E[24m,
+	rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l,
 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
 	    %p9%t\E(0%e\E(B%;,
 	sgr0=\E[m\E(B, smam=\E[?7h, smcup=\E7, smir=\E[4h,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u8=\E[?62;1;6c,
-	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
-	use=ansi+local, use=vt220+cvis, use=xterm+acs,
+	tbc=\E[3g, u8=\E[?62;1;6c, use=ecma+underline,
+	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idl, use=ansi+local, use=ansi+cup,
+	use=vt220+cvis, use=xterm+acs, use=vt100+pf1-pf4,
 	use=xterm+sl, use=ansi+enq,
 
 ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color),
@@ -8727,11 +9178,10 @@ ncsa-m-ns|NCSA Telnet 2.6 for Macintosh in VT220-8 mode (no status line),
 # some keyboards and many applications require these as F1-F4.
 #
 ncsa-vt220|NCSA Telnet using VT220-compatible function keys,
-	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ,
-	kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, use=ncsa,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
+	kf14=\E[26~, kf15=\E[28~, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, use=vt100+pf1-pf4, use=ncsa,
+	use=vt220+sfkeys,
 
 #### Pilot Pro Palm-Top
 #
@@ -8768,9 +9218,8 @@ elks-vt52|ELKS VT52 console,
 	home=\EH, use=elks-glasstty,
 
 elks-ansi|ELKS ANSI console,
-	clear=\E[H\E[2J, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	el=\E[K, home=\E[H, use=ansi+local1, use=ansi+sgrso,
-	use=elks-glasstty,
+	clear=\E[H\E[2J, el=\E[K, use=ansi+cup, use=ansi+local1,
+	use=ansi+sgrso, use=elks-glasstty,
 
 # As a matter of fact, ELKS 0.0.83 on PCs defaults to ANSI emulation
 # instead of VT52, but the "elks" entry still refers to the latter.
@@ -8795,10 +9244,9 @@ pccons|pcconsole|ANSI (mostly) Alpha PC console terminal emulation,
 	am, xon,
 	cols#80, lines#25,
 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, nel=\r\n,
-	rev=\E[7m, rmso=\E[m, sgr0=\E[m, smso=\E[7m,
-	use=ansi+arrows,
+	cuu1=\E[A, dch1=\E[P, el=\E[K, ht=^I, ich1=\E[@, nel=\r\n,
+	rev=\E[7m, sgr0=\E[m, use=ansi+arrows, use=ansi+cup,
+	use=ansi+idl1, use=ansi+sgrso,
 
 #### Sun consoles
 #
@@ -8810,9 +9258,9 @@ oldsun|Sun Microsystems Workstation console,
 	bel=^G, clear=^L, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
 	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I,
 	ich=\E[%p1%d@, ich1=\E[@, ind=\n, is1=\E[1r, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, khome=\E[H, rmso=\E[m, sgr0=\E[m,
-	smso=\E[7m, use=ansi+idl, use=ansi+local1,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, sgr0=\E[m,
+	use=ansi+idl, use=ansi+local1, use=ansi+sgrso,
+	use=vt100+pf1-pf4,
 
 # From: Alexander Lukyanov <lav@video.yars.free.net>, 14 Nov 1995
 # <lines> capability later corrected by J.T. Conklin <jtc@cygnus.com>
@@ -8828,10 +9276,9 @@ sun-il|Sun Microsystems console with working insert-line,
 	kf3=\E[226z, kf4=\E[227z, kf5=\E[228z, kf6=\E[229z,
 	kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, khome=\E[214z,
 	kich1=\E[247z, knp=\E[222z, kopt=\E[194z, kpp=\E[216z,
-	kres=\E[193z, kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@,
-	rs2=\E[s, sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
-	smso=\E[7m, u8=\E[1t, u9=\E[11t, use=ansi+arrows,
-	use=ansi+idl,
+	kres=\E[193z, kund=\E[195z, rev=\E[7m, rmul@, rs2=\E[s,
+	sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m, u8=\E[1t,
+	u9=\E[11t, use=ansi+arrows, use=ansi+idl, use=ansi+sgrso,
 
 # On some versions of CGSIX framebuffer firmware (SparcStation 5), <il1>/<il>
 # flake out on the last line.  Unfortunately, without them the terminal has no
@@ -8850,8 +9297,8 @@ sun-cgsix|sun-ss5|Sun SparcStation 5 console,
 # incomplete manual page.  Presumably the intent was to document features of
 # shelltool not in wscons:
 #
-#    https://manpages.ubuntu.com/manpages/bionic/en/man1/shelltool.1.html
-#    https://manpages.ubuntu.com/manpages/bionic/en/man1/cmdtool.1.html
+#    https://web.archive.org/web/20230608051050/manpages.ubuntu.com/manpages/bionic/en/man1/shelltool.1.html
+#    https://web.archive.org/web/20220520165933/manpages.ubuntu.com/manpages/bionic/en/man1/cmdtool.1.html
 #
 # The wscons manual page and the XView source show that it had no feature that
 # could be used in ncurses u6/u7/u8/u9 extensions.  Interesting, the XView
@@ -8882,9 +9329,8 @@ sun-17|Sun 17-line window,
 sun-12|Sun 12-line window,
 	cols#80, lines#12, use=sun,
 sun-1|Sun 1-line window for sysline,
-	eslok, hs,
-	cols#80, lines#1,
-	dsl=^L, fsl=\E[K, tsl=\r, use=sun,
+	lines#1,
+	dsl=^L, fsl=\E[K, tsl=\r, use=sun, use=dec+sl,
 sun-e|sun-nic|sune|Sun Microsystems Workstation without insert character,
 	ich1@, rmir@, smir@, use=sun,
 sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history,
@@ -8895,11 +9341,11 @@ sun-type4|Sun Workstation console with type 4 keyboard,
 	kcuu1=\E[215z, use=sun-il,
 
 # Most of the current references to sun-color are from users wondering why this
-# is the default on install.  Details from reading the wscons manpage, adding
+# is the default on install.  Details from reading the wscons man page, adding
 # cub, etc., here (rather than in the base sun-il entry) since it is not clear
 # when those were added -TD (2005-05-28)
 #
-# According to wscons manpage, color is supported only on IA systems.
+# According to wscons man page, color is supported only on IA systems.
 # Sun's terminfo entry documents bold and smul/rmul capabilities, but wscons
 # does not list these.  It also sets ncv#3, however that corresponds to
 # underline and standout.
@@ -8922,7 +9368,43 @@ sun-color|Sun Microsystems Workstation console with color support (IA systems),
 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
 	     %=%t3%e%p1%d%;m,
 	sgr=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, use=ansi+local,
-	use=sun, use=klone+color,
+	use=ansi+rca, use=ansi+tabs, use=ecma+index, use=sun,
+	use=klone+color,
+
+# These date from March 2017:
+# https://www.illumos.org/issues/10360 terminfo: sun-color has 256 colors
+# https://www.illumos.org/issues/10359 terminfo: add underline for sun-color
+#
+# https://www.illumos.org/issues/14919 tem: implement xenl
+# https://illumos.topicbox.com/groups/developer/T58d08b48578a674d-M491357a8bb9a7d39b114097f
+#
+# The developer chose to modify the existing "sun-color" (changing the number
+# of colors and color-pairs without adjusting setaf and setab) rather than
+# following the advice given in review to add a new terminal description.  As a
+# result, some ncurses applications will render color incorrectly, while a few
+# hard-coded applications may work as intended.
+#
+# These variants are based on reading the source code.
+# https://github.com/illumos/illumos-gate/blob/loader/usr/src/boot/sys/boot/common/tem.c
+illumos|Illumos framebuffer console,
+	xenl,
+	blink=\E[5m, dim=\E[2m, rmam=\E[?7l,
+	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?
+	    %p4%t;5%;m,
+	sgr0=\E[0m, smam=\E[?7h, use=ecma+underline,
+	use=ecma+standout, use=vt220+cvis, use=sun-color,
+	use=ansi+apparrows,
+#
+# Referring to these as "sun-" is misleading, but close to the intent of the
+# developer -TD
+sun-16color|Illumos framebuffer console with 16 colors,
+	use=ibm+16color, use=illumos,
+
+sun-256color|Illumos framebuffer console with 256 colors,
+	use=xterm+256setaf, use=illumos,
+
+sun-direct|Illumos framebuffer console with direct-color,
+	use=xterm+indirect, use=illumos,
 
 #### Iris consoles
 #
@@ -8995,9 +9477,9 @@ next|NeXT console,
 	am, xt,
 	cols#80, it#8, lines#24,
 	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
-	ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n,
-	rmso=\E[4;1m, sgr0=\E[m, smso=\E[4;2m,
+	cuu1=\E[A, el=\E[K, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n,
+	nel=\r\n, rmso=\E[4;1m, sgr0=\E[m, smso=\E[4;2m,
+	use=ansi+cup,
 nextshell|NeXT Shell application,
 	am,
 	cols#80,
@@ -9012,17 +9494,15 @@ news-unk|Sony NEWS VT100 emulator common entry,
 	OTbs, OTpt, am, xenl,
 	cols#80,
 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J,
-	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	if=/usr/share/tabset/vt100,
+	cr=\r, cub1=^H, cud1=\n, ht=^I, if=/usr/share/tabset/vt100,
 	is2=\E[?7h\E[?1h\E[?3l\E7\E8, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOY, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV,
-	kf8=\EOW, kf9=\EOX, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOY, kf3=\EOR,
+	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, rev=\E[7m,
+	ri=\EM, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[r, sgr0=\E[m,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
-	use=ansi+idl,
+	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local1,
+	use=ansi+sgrul, use=ansi+sgrso, use=vt100+pf1-pf4,
 #
 # (news-29: this had :TY=ascii: --esr)
 news-29|Sony NEWS VT100 emulator with 29 lines,
@@ -9061,14 +9541,13 @@ news-old-unk|old Sony NEWS VT100 emulator common entry,
 	OTbs, OTpt, am, xenl,
 	cols#80, vt#3,
 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J,
-	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	if=/usr/share/tabset/vt100, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\E[A, ed=\E[J,
+	el=\E[K, ht=^I, if=/usr/share/tabset/vt100, kbs=^H,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rev=\E[7m,
+	ri=\EM, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
+	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+cup,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
 #
 # (nwp512: this had :DE=^H:, which I think means <OTbs> --esr)
 nwp512|news|nwp514|news40|vt100-bm|nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|old Sony VT100 emulator 40 lines,
@@ -9121,14 +9600,14 @@ nwp511|nwp-511|nwp-511 VT100,
 	OTbs, OTpt, am, xenl,
 	cols#80, lines#24,
 	clear=\E[;H\E[2J$<20/>, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[A$<2/>, dl1=\E[M, ed=\E[J$<30/>, el=\E[K$<3/>,
+	cuu1=\E[A$<2/>, ed=\E[J$<30/>, el=\E[K$<3/>,
 	flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l,
-	il1=\E[L, is2=\E[?5l\E[?1l\E>\E[?7h\E[?8h, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\E#W, khome=\E[H,
-	ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
+	is2=\E[?5l\E[?1l\E>\E[?7h\E[?8h, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf5=\EOT, kf6=\E#W,
+	khome=\E[H, ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
 	rs2=\E7\E[r\E8\E[?5l\E[?1l\E>\E[?7h\E[?8h,
 	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+local1,
+	use=ansi+idl1, use=vt100+pf1-pf4,
 # (news517: this had :TY=sjis:. --esr)
 nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows,
 	cols#80, lines#30,
@@ -9137,12 +9616,11 @@ nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows,
 	tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base,
 # (news517-w: this had :TY=sjis:. --esr)
 nwp517-w|nwp-517-w|nwp-517 VT200 132 cols 50 rows,
-	eslok, hs,
 	cols#132, lines#50,
-	OTi2=\E[2$~\n, dsl=\E[1$~, fsl=\E[0$},
+	OTi2=\E[2$~\n, dsl=\E[1$~,
 	is2=\E7\E[r\E8\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h,
 	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h,
-	tsl=\E[1$}\E[;%df, use=vt220-base,
+	tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base,
 
 #### Common Desktop Environment
 #
@@ -9153,26 +9631,21 @@ dtterm|CDE desktop terminal,
 	am, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, lm#0, ncv@,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K, enacs=\E(B\E)0,
-	flash=\E[?5h$<200>\E[?5l, home=\E[H, ht=^I, hts=\EH,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
+	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, ht=^I, hts=\EH,
 	ich=\E[%p1%d@, ind=\ED, is2=\E F\E>\E[?1l\E[?7h\E[?45l,
 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~,
-	kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
 	khlp=\E[28~, nel=\EE, ri=\EM, rmacs=^O, rmam=\E[?7l,
-	rmir=\E[4l, rmso=\E[22;27m, rmul=\E[24m,
+	rmir=\E[4l, rmso=\E[22;27m,
 	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+sgr, use=decid+cpr, use=vt220+vtedit,
-	use=vt220+cvis, use=ecma+color,
+	smso=\E[2;7m, tbc=\E[3g, use=ecma+underline,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgr, use=decid+cpr,
+	use=ecma+color, use=vt220+cvis, use=vt220+sfkeys,
+	use=vt220+vtedit, use=xterm+r5+fkeys,
 
 ######## Non-Unix Consoles
 #
@@ -9215,12 +9688,12 @@ ansi-color-3-emx|ANSI.SYS color 3,
 mono-emx|stupid monochrome ANSI terminal with only one kind of emphasis,
 	am,
 	cols#80, it#8, lines#24,
-	clear=\E[H\E[2J$<50>, cup=\E[%i%p1%d;%p2%dH, el=\E[K,
-	home=\E[H, ht=^I, kb2=\E[G, kbs=^H, kcub1=\0K, kcud1=\0P,
-	kcuf1=\0M, kcuu1=\0H, kf0=\0D, kf1=\0;, kf2=\0<, kf3=\0=,
-	kf4=\0>, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B, kf9=\0C,
-	khome=\0G, kich1=\0R, kll=\0O, knp=\0Q, kpp=\0I, nel=\r\n,
-	rev=\E[7m, sgr0=\E[0m, use=ansi+local1,
+	clear=\E[H\E[2J$<50>, el=\E[K, ht=^I, kb2=\E[G, kbs=^H,
+	kcub1=\0K, kcud1=\0P, kcuf1=\0M, kcuu1=\0H, kf0=\0D, kf1=\0;,
+	kf2=\0<, kf3=\0=, kf4=\0>, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B,
+	kf9=\0C, khome=\0G, kich1=\0R, kll=\0O, knp=\0Q, kpp=\0I,
+	nel=\r\n, rev=\E[7m, sgr0=\E[0m, use=ansi+local1,
+	use=ansi+cup,
 
 #### Cygwin
 
@@ -9290,23 +9763,19 @@ cygwinB19|ANSI emulation for cygwin32,
 cygwin|ANSI emulation for Cygwin,
 	am, hs, mir, msgr, xon,
 	colors#8, it#8, pairs#64,
-	bel=^G, bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, fsl=^G, home=\E[H, ht=^I,
-	ind=\n, invis=\E[8m, kb2=\E[G, kf1=\E[[A, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D,
-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8,
-	rev=\E[7m, ri=\EM, rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, el1=\E[1K, fsl=^G, ht=^I,
+	ind=\n, invis=\E[8m, kb2=\E[G, khome=\E[1~, kspd=^Z,
+	nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
+	rmpch=\E[10m, rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm,
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7
 	    %t;8%;%?%p9%t;11%;m,
-	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
-	tsl=\E];, use=ansi+arrows, use=ansi+erase, use=ansi+idc,
-	use=ansi+idl, use=ansi+local, use=ansi+rca2,
-	use=vt220+pcedit, use=vt102+enq, use=klone+acs,
-	use=xterm+alt47,
+	sgr0=\E[0;10m, smpch=\E[11m, tsl=\E];,
+	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
+	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+local, use=ansi+rca2, use=vt220+pcedit,
+	use=vt102+enq, use=klone+acs, use=linux+lockeys,
+	use=vt220+sfkeys, use=vt220+ufkeys, use=xterm+alt47,
 
 # I've supplied this so that you can help test new values and add other
 # features.  Cheers, earnie_boyd@yahoo.com.
@@ -9316,23 +9785,19 @@ cygwin|ANSI emulation for Cygwin,
 # this list, but DOES cause problems so it has been removed
 cygwinDBG|Debug Version for Cygwin,
 	am, eo, mir, msgr, xon,
-	cols#80, lines#24, ncv#3,
-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K,
-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ind=\n, kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z,
-	kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[[B,
-	kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kspd=^Z,
+	cols#80, lines#24,
+	bel=^G, cr=\r, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, ind=\n, kNXT=\E[6$,
+	kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, khome=\E[1~, kspd=^Z,
 	nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R, sc=\E7,
 	sgr=\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;12%;m,
-	sgr0=\E[0;10m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	sgr0=\E[0;10m, use=ansi+arrows, use=ansi+cup,
 	use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local, use=ansi+sgrbold,
-	use=klone+acs, use=klone+color, use=vt220+pcedit,
-	use=vt220+cvis, use=vt102+enq,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+	use=ansi+sgrbold, use=klone+acs, use=klone+color,
+	use=linux+lockeys, use=vt102+enq, use=vt220+pcedit,
+	use=vt220+cvis, use=vt220+sfkeys, use=vt220+ufkeys,
 
 #### DJGPP
 
@@ -9342,6 +9807,7 @@ cygwinDBG|Debug Version for Cygwin,
 # Oddly enough, while several combinations of modifiers are tabulated, there is
 # none for shifted cursor keys.
 #
+# kf1-kf12:
 #	F1			\E[[A
 #	F2			\E[[B
 #	F3			\E[[C
@@ -9366,6 +9832,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Right Arrow		\E[C
 #	Up Arrow		\E[A
 #
+# kf13-kf24:
 #	Shift-F1		\E[25~
 #	Shift-F2		\E[26~
 #	Shift-F3		\E[27~
@@ -9379,6 +9846,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Shift-F11		\E[35~
 #	Shift-F12		\E[36~
 #
+# kf25-kf36:
 #	Ctrl-F1			\E[47~
 #	Ctrl-F2			\E[48~
 #	Ctrl-F3			\E[49~
@@ -9403,6 +9871,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Ctrl-Right Arrow	\E[40~
 #	Ctrl-Up Arrow		\E[37~
 #
+# kf37-kf48:
 #	Alt-F1			\E[59~
 #	Alt-F2			\E[60~
 #	Alt-F3			\E[61~
@@ -9416,6 +9885,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Alt-F11			\E[79~
 #	Alt-F12			\E[80~
 #
+# ignore (conflicting):
 #	Alt-Delete		\E[65~
 #	Alt-Down Arrow		\E[60~
 #	Alt-End			\E[66~
@@ -9454,27 +9924,42 @@ cygwinDBG|Debug Version for Cygwin,
 #	Alt-X			\E[104~
 #	Alt-Y			\E[105~
 #	Alt-Z			\E[106~
-djgpp|ANSI emulation for DJGPP alpha,
+djgpp|ANSI emulation for DJGPP 2.05,
 	am, bce, msgr, xhp, xon, xt,
 	colors#8, it#8, pairs#64,
 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
 	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
 	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
 	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[1v, cnorm=\E[v, cr=\r,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v,
-	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
-	ich1=\E[@, ind=\E[S, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, nel=\r\n, op=\E[37;40m, ri=\E[T, rmso=\E[m,
+	cub1=^H, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P,
+	ech=\E[%p1%dX, el1=\E[1K, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\E[S, kf13=\E[25~, kf14=\E[26~, kf15=\E[27~,
+	kf16=\E[28~, kf17=\E[29~, kf18=\E[30~, kf19=\E[31~,
+	kf20=\E[32~, kf21=\E[33~, kf22=\E[34~, kf23=\E[35~,
+	kf24=\E[36~, kf25=\E[47~, kf26=\E[48~, kf27=\E[49~,
+	kf28=\E[50~, kf29=\E[51~, kf30=\E[52~, kf31=\E[53~,
+	kf32=\E[54~, kf33=\E[55~, kf34=\E[56~, kf35=\E[57~,
+	kf36=\E[58~, kf37=\E[59~, kf38=\E[60~, kf39=\E[61~,
+	kf40=\E[62~, kf41=\E[63~, kf42=\E[64~, kf43=\E[65~,
+	kf44=\E[66~, kf45=\E[67~, kf46=\E[68~, kf48=\E[80~,
+	kf6=\E[17~, khome=\E[1~, nel=\r\n, op=\E[37;40m, ri=\E[T,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%e;25%;%?
 	    %p6%t;1%;%?%p7%t;8%;m,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+sgr, use=vt220+pcedit,
-	use=ecma+index,
+	sgr0=\E[m, smul=\E[4m, alt_A=\E[82~, alt_B=\E[82~,
+	alt_C=\E[83~, alt_D=\E[84~, alt_E=\E[85~, alt_F=\E[86~,
+	alt_G=\E[87~, alt_H=\E[88~, alt_I=\E[89~, alt_J=\E[90~,
+	alt_K=\E[91~, alt_L=\E[92~, alt_M=\E[93~, alt_N=\E[94~,
+	alt_O=\E[95~, alt_P=\E[96~, alt_Q=\E[97~, alt_R=\E[98~,
+	alt_S=\E[99~, alt_T=\E[100~, alt_U=\E[101~,
+	alt_V=\E[102~, alt_W=\E[103~, alt_X=\E[104~,
+	alt_Y=\E[105~, alt_Z=\E[106~, kDC5=\E[43~, kDN5=\E[38~,
+	kEND5=\E[44~, kHOM5=\E[41~, kIC5=\E[42~, kLFT5=\E[39~,
+	kNXT5=\E[46~, kPRV5=\E[45~, kRIT5=\E[40~, kUP5=\E[37~,
+	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+rca2,
+	use=ansi+sgr, use=ansi+sgrso, use=ecma+index,
+	use=linux+lockeys, use=vt220+pcedit, use=vt220+ufkeys,
 
 djgpp203|entry for DJGPP 2.03,
 	OTbs, am,
@@ -9486,17 +9971,15 @@ djgpp204|entry for DJGPP 2.04,
 	OTbs, am, AX,
 	colors#8, cols#80, it#8, lines#25, ncv#3, pairs#64,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[1v,
-	clear=\E[H\E[2J, cnorm=\E[v, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v, dch=\E[%p1%dP,
-	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
-	kf0=\E[21~, kf1=\E[[A, kf10=\E[21~, kf2=\E[[B, kf3=\E[[C,
-	kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, khome=\E[1~, kll=\E[4~, nel=\r\n, rev=\E[7m,
-	ri=\E[T, rmso=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+idl, use=ansi+local, use=vt220+pcedit,
-	use=ecma+index,
+	clear=\E[H\E[2J, cnorm=\E[v, cr=\r, cvvis=\E[2v,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+	ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
+	kf0=\E[21~, kf10=\E[21~, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kll=\E[4~, nel=\r\n,
+	rev=\E[7m, ri=\E[T, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	sgr0=\E[m, smul=\E[4m, use=ansi+arrows, use=ansi+cup,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
+	use=linux+lockeys, use=vt220+pcedit, use=ecma+index,
 
 #### U/Win
 
@@ -9510,16 +9993,15 @@ uwin|U/Win 3.2 console,
 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dim=\E[2m,
-	ech=\E[%p1%dX, el1=\E[1K, home=\E[H, ht=^I, hts=\EH,
-	kdch1=^?, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf11=\EOZ,
-	kf12=\EOA, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
-	kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@, nel=\r\n,
-	op=\E[39;49m, rc=\E8, rev=\E[7m, rmacs=\E[10m,
-	rmpch=\E[10m, rmso=\E[27m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
-	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+arrows, use=ansi+cpr,
-	use=ansi+erase, use=ansi+idc, use=klone+color,
+	cuf1=\E[C, cuu1=\E[A, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
+	ht=^I, hts=\EH, kdch1=^?, kend=\E[Y, kf10=\EOY, kf11=\EOZ,
+	kf12=\EOA, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
+	kich1=\E[@, nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m,
+	rmacs=\E[10m, rmpch=\E[10m, rs1=\Ec\E]R, sc=\E7,
+	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, tbc=\E[3g,
+	use=ecma+standout, use=ansi+arrows, use=ansi+cpr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idc,
+	use=ansi+sgrul, use=klone+color, use=vt100+pf1-pf4,
 	use=vt220+cvis,
 
 #### Microsoft (miscellaneous)
@@ -9558,10 +10040,11 @@ ansi-nt|psx_ansi|Microsoft Windows NT console POSIX ANSI mode,
 	am, bw, msgr,
 	cols#80, it#8, lines#25,
 	bel=^G, clear=\E[2J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K,
-	home=\E[H, ht=^I, ind=\E[S, kbs=^H, kcub1=\E[D, kcud1=\E[V,
-	kcuf1=\E[C, kcuu1=\E[A, nel=\r\E[S, rc=\E[u, rev=\E[7m,
-	ri=\E[T, rmso=\E[m, sc=\E[s, sgr0=\E[0m, smso=\E[7m,
+	cuu1=\E[A, ed=\E[J, el=\E[K, ht=^I, ind=\E[S, kbs=^H,
+	kcub1=\E[D, kcud1=\E[V, kcuf1=\E[C, kcuu1=\E[A, nel=\r\E[S,
+	rc=\E[u, rev=\E[7m, ri=\E[T, sc=\E[s, sgr0=\E[0m,
+	use=ansi+cup, use=ansi+sgrso,
+
 # From: jew@venus.sunquest.com
 # Date: 19 Feb 93 23:41:07 GMT
 # Here's  a  combination of  ansi and  vt100 termcap
@@ -9576,12 +10059,12 @@ pcmw|PC running Microsoft Works,
 	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
 	ht=^I, hts=\EH$<2/>, ind=\ED$<5/>, is2=\E[1;24r\E[24;1H,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED$<5/>,
-	rc=\E8, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
-	ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
+	nel=\r\ED$<5/>, rc=\E8, rev=\E[7m$<2/>,
+	rf=/usr/share/tabset/vt100, ri=\EM$<5/>,
+	rmso=\E[m$<2/>, rmul=\E[m$<2/>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
 	sgr0=\E[m$<2/>, smso=\E[7m$<2/>, smul=\E[4m$<2/>,
-	tbc=\E[3g$<2/>,
+	tbc=\E[3g$<2/>, use=vt100+pf1-pf4,
 
 # From: Federico Bianchi
 # This is the entry for the OpenNT terminal.
@@ -9611,28 +10094,27 @@ interix|opennt|opennt-25|ntconsole|ntconsole-25|OpenNT-term compatible with colo
 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
 	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
 	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
-	bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	ind=\E[S, kLFT=\EF\^, kRIT=\EF$, kcbt=\E[Z, kdch1=^?,
-	kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB,
-	kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG,
-	kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK,
-	kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP,
-	kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3,
-	kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY,
-	kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd,
-	kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh,
-	kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn,
-	kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr,
-	kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw,
-	kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7,
-	kf8=\EF8, kf9=\EF9, kich1=\E[L, kind=\EF+, kll=\E[U,
-	knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n, op=\E[m,
-	rc=\E[u, rev=\E[7m, ri=\E[T, rmcup=\E[2b\E[u\r\E[K,
-	rmso=\E[m, rmul=\E[m, rs1=\Ec, sc=\E[s, sgr0=\E[0m,
-	smcup=\E[s\E[1b, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+idl, use=ansi+local, use=ecma+index,
-	use=klone+color,
+	bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cud1=\n, ed=\E[J,
+	el=\E[K, ht=^I, ind=\E[S, kLFT=\EF\^, kRIT=\EF$, kcbt=\E[Z,
+	kdch1=^?, kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA,
+	kf11=\EFB, kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF,
+	kf16=\EFG, kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2,
+	kf20=\EFK, kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO,
+	kf25=\EFP, kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT,
+	kf3=\EF3, kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX,
+	kf34=\EFY, kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc,
+	kf39=\EFd, kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg,
+	kf43=\EFh, kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm,
+	kf48=\EFn, kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq,
+	kf52=\EFr, kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv,
+	kf57=\EFw, kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz,
+	kf7=\EF7, kf8=\EF8, kf9=\EF9, kich1=\E[L, kind=\EF+,
+	kll=\E[U, knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n,
+	op=\E[m, rc=\E[u, rev=\E[7m, ri=\E[T,
+	rmcup=\E[2b\E[u\r\E[K, rs1=\Ec, sc=\E[s, sgr0=\E[0m,
+	smcup=\E[s\E[1b, use=ansi+arrows, use=ansi+cup,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
+	use=ansi+sgrul, use=ecma+index, use=klone+color,
 
 opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
 	lines#35, use=opennt,
@@ -9710,9 +10192,8 @@ opennt-100-nti|ntconsole-100-nti|OpenNT-term100-nti compatible with color,
 altos2|alt2|altos-2|Altos II,
 	cols#80, it#8, lines#24, xmc#0,
 	clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[1B, cuf1=\E[1C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch1=\E[P, dl1=\E[M,
-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@,
-	if=/usr/share/tabset/vt100, il1=\E[L, ind=\n,
+	cuu1=\E[1A, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, ich1=\E[@,
+	if=/usr/share/tabset/vt100, ind=\n,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kDL=^Am\r,
 	kEOL=^An\r, kcbt=^AK\r, kclr=^AL\r, kdch1=^AM\r, kel=^AN\r,
 	kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf32=^A`\r,
@@ -9720,8 +10201,9 @@ altos2|alt2|altos-2|Altos II,
 	kf38=^Af\r, kf39=^Ag\r, kf4=^AC\r, kf40=^Ah\r, kf41=^Ai\r,
 	kf42=^Aj\r, kf43=^Ak\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r,
 	kf8=^AG\r, kf9=^AH\r, khome=\E[f, kil1=^AJ\r, kind=^AO\r,
-	nel=\r\n, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smam=\E[?7h, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	nel=\r\n, rmam=\E[?7l, sgr0=\E[m, smam=\E[?7h,
+	use=ansi+arrows, use=ansi+cup, use=ansi+idl1,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 # (altos3: had extension capabilities
 #	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
@@ -9833,7 +10315,7 @@ hp262x|HP 262x terminals,
 # 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!
-# The default 2621 turns off the labels except when it has to to
+# 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
 # function keys), use 2621-nl or 2621-wl.
@@ -10205,18 +10687,18 @@ hpansi|hp700|Hewlett Packard 700/44 in HP-PCterm mode,
 	cols#80, lines#25,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, cbt=\E[Z, clear=\E[2J\E[H, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+	bel=^G, cbt=\E[Z, clear=\E[2J\E[H, cr=\r, dch1=\E[P, ed=\E[J,
+	el=\E[K, ht=^I, ich1=\E[@, ind=\n,
 	is2=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\\,
 	kcbt=\E[Z, kend=\E[4~, kf1=\E[17~, kf10=\E[28~, kf2=\E[18~,
 	kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~,
 	kf8=\E[25~, kf9=\E[26~, khome=\E[1~, knp=\E[6~, kpp=\E[5~,
 	rmam=\E[?7l, rmsc=\E[>11l\EP1**x0/11;1/13\E[m\E\\,
-	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h,
-	smsc=\E[>11h\EPO**x0/65;1/67\E\\$<250>, smso=\E[7m,
-	smul=\E[4m, xoffc=g, xonc=e, use=ansi+arrows,
-	use=ansi+local1, use=vt220+cvis,
+	sgr0=\E[m, smam=\E[?7h,
+	smsc=\E[>11h\EPO**x0/65;1/67\E\\$<250>, xoffc=g,
+	xonc=e, use=ansi+arrows, use=ansi+cup, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt220+cvis,
 #
 # (hp2392: copied <rmir> here from hpex -- esr)
 hp2392|239x series,
@@ -10414,14 +10896,13 @@ gator-t|HP 9000 model 237 emulating extra-tall AAA,
 gator|HP 9000 model 237 emulating AAA,
 	bw, km, mir, ul,
 	cols#128, it#8, lines#47,
-	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP$<4/>,
-	dch1=\E[P, dl=\E[%p1%dM$<1*/>, dl1=\E[M, home=\E[H,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\EM,
+	dch=\E[%p1%dP$<4/>, dch1=\E[P, dl=\E[%p1%dM$<1*/>,
 	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@$<4/>, ich1=\E[@,
-	il=\E[%p1%dL$<1*/>, il1=\E[L, kbs=^H, kcub1=^H, kcud1=\n,
-	nel=\r\n, rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, rmso=\E[m,
-	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
-	use=ansi+erase,
+	il=\E[%p1%dL$<1*/>, kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n,
+	rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, sgr0=\E[m,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl1,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 gator-52|HP 9000 model 237 emulating VT52,
 	cols#128, lines#47, use=vt52-basic,
@@ -10446,9 +10927,8 @@ dku7003-dumb|Honeywell Bull DKU 7003 dumb mode,
 dku7003|Honeywell Bull DKU 7003 all features described,
 	msgr,
 	xmc#1,
-	blink=\E[5m, bold=\E[7m, dim=\E[2m, rev=\E[7m, rmso=\E[m,
-	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
-	use=dku7003-dumb,
+	blink=\E[5m, bold=\E[7m, dim=\E[2m, rev=\E[7m, sgr0=\E[m,
+	use=ansi+sgrso, use=ansi+sgrul, use=dku7003-dumb,
 
 #### Lear-Siegler (LSI adm)
 #
@@ -10833,11 +11313,11 @@ pt100|pt200|wren|fenix|Prime pt100/pt200,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl1=\E[M, ed=\E[J\E[r,
 	el=\E[K\E[t, flash=\E$$<200/>\E$P, home=\E$B, ht=^I,
 	il1=\E[L\E[t, ind=\n, khome=\E$A, nel=\r\n, rmcup=,
-	rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+	rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, sgr0=\E[m,
 	smcup=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12
 	      l\E[1Q,
-	smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+local,
+	smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, use=ansi+arrows,
+	use=ansi+local, use=ansi+sgrul,
 
 pt100w|pt200w|wrenw|fenixw|Prime pt100/pt200 in 132-column mode,
 	cols#132,
@@ -10917,15 +11397,14 @@ qvt103|Qume qvt 103,
 	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
 	hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	rev=\E[7m$<2>, ri=\EM$<5>, rmam=\E[?7l, rmkx=\E[?1l\E>,
-	rmso=\E[m$<2>, rmul=\E[m$<2>,
+	kcuu1=\EOA, rev=\E[7m$<2>, ri=\EM$<5>, rmam=\E[?7l,
+	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;m$<2>,
 	sgr0=\E[m$<2>, smam=\E[?7h, smkx=\E[?1h\E=,
 	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ansi+csr,
-	use=ansi+local,
+	use=ansi+local, use=vt100+pf1-pf4,
 
 qvt103-w|Qume qvt103 132 cols,
 	cols#132, lines#24,
@@ -11967,16 +12446,15 @@ tvi970|TeleVideo 970,
 	cols#80, it#8, lines#24,
 	acsc=, cbt=\E[Z, clear=\E[H\E[2J, csr=\E[%i%p1%d;%p2%dr,
 	cub1=^H, cud1=\ED, cuf1=\E[C, cup=\E[%i%p1%d;%p2%df,
-	cuu1=\EM, cvvis=\E[1Q, dch1=\E[P, dl1=\E[M, dsl=\Eg\Ef\r,
-	ed=\E[J, el=\E[K, flash=\E[5m$<200/>\E[m, home=\E[H,
-	hpa=\E[%i%p1%dG, ht=^I, il1=\E[L,
+	cuu1=\EM, cvvis=\E[1Q, dch1=\E[P, dsl=\Eg\Ef\r, ed=\E[J,
+	el=\E[K, flash=\E[5m$<200/>\E[m, home=\E[H, ht=^I,
 	is2=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J,
 	kf1=\E?a, kf2=\E?b, kf3=\E?c, kf4=\E?d, kf5=\E?e, kf6=\E?f,
 	kf7=\E?g, kf8=\E?h, kf9=\E?i, ri=\EM, rmacs=\E(B,
-	rmam=\E[?7h, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smacs=\E(B, smam=\E[?7l,
-	smcup=\E[?20l\E[?7h\E[1Q, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	rmam=\E[?7h, rmcup=, rmir=\E[4l, sgr0=\E[m, smacs=\E(B,
+	smam=\E[?7l, smcup=\E[?20l\E[?7h\E[1Q, smir=\E[4h,
+	use=ansi+arrows, use=ansi+idl1, use=ansi+rca2,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 tvi970-vb|TeleVideo 970 with visual bell,
 	flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l,
@@ -12136,15 +12614,15 @@ vi300|Visual 300 ANSI x3.64,
 	am, bw, mir, xenl,
 	cols#80, lines#24,
 	bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P$<40>, dl1=\E[M, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, il1=\E[L, ind=\n,
+	dch1=\E[P$<40>, ed=\E[J, el=\E[K, ht=^I, ind=\n,
 	is2=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[1Q\E[0;1(D\E[8s,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	kf1=\E_A\E\\, kf2=\E_B\E\\, kf3=\E_C\E\\, kf4=\E_D\E\\,
 	kf5=\E_E\E\\, kf6=\E_F\E\\, kf7=\E_G\E\\, kf8=\E_H\E\\,
 	kf9=\E_I\E\\, khome=\E[H, ri=\EM, rmam=\E[?7l, rmir=\E[4l,
-	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h,
-	smso=\E[1m, smul=\E[4m, use=ansi+local1,
+	rmso=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smso=\E[1m,
+	use=ansi+cup, use=ansi+idl1, use=ansi+local1,
+	use=ansi+sgrul,
 
 # some of the vi300s have older firmware that has the command
 # sequence for setting editing extent reversed.
@@ -12188,9 +12666,9 @@ vi603|visual603|Visual 603,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
 	dsl=\EP2;1~\E\\, ed=\E[J, el=\E[K, fsl=\E\\, ind=\ED,
 	is1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r, rev=\E[7m,
-	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
-	sgr0=\E[m\017$<2>, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	tsl=\EP2~, use=ansi+idl1, use=decid+cpr, use=vt100+4bsd,
+	ri=\EM, rmir=\E[4l, sgr0=\E[m\017$<2>, smir=\E[4h,
+	tsl=\EP2~, use=ecma+underline, use=ecma+standout,
+	use=ansi+idl1, use=decid+cpr, use=vt100+4bsd,
 
 #### Wyse (wy)
 #
@@ -12636,33 +13114,36 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	am, km, mir, msgr, xenl,
 	cols#80, it#8, lines#25, vt#3,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~,
-	bel=^G, cbt=\E[Z, civis=\E[?25l, clear=\E[H\E[J$<200>,
-	cnorm=\E[34h\E[?25h, cr=\r, cub=\E[%p1%dD$<1>,
-	cub1=\010$<1>, cud=\E[%p1%dB, cud1=\ED,
-	cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
-	cvvis=\E[34l\E[?25h, dim=\E[2m, ech=\E[%p1%dX,
-	ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, enacs=\E)0,
-	flash=\E[?5h$<30/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, ich=\E[%p1%d@, ind=\n$<1>,
+	bel=^G, cbt=\E[Z, clear=\E[H\E[J$<200>, cr=\r,
+	cub=\E[%p1%dD$<1>, cub1=\010$<1>, cud=\E[%p1%dB,
+	cud1=\ED, cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
+	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E[34l\E[?25h, dim=\E[2m,
+	ech=\E[%p1%dX, ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>,
+	enacs=\E)0, flash=\E[?5h$<30/>\E[?5l, ht=^I,
+	ich=\E[%p1%d@, ind=\n$<1>,
 	is2=\E7\E[1r\E8\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4
 	    ;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[4i,
 	kbs=^H, kcbt=\E[z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf17=\E[K, kf18=\E[31~, kf19=\E[32~, kf2=\EOQ,
+	kcuu1=\EOA, kf17=\E[K, kf18=\E[31~, kf19=\E[32~,
 	kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, kf23=\E[1~,
-	kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ll=\E[24E, mc0=\E[?19h,
-	nel=\EE, prot=\E[1"q, ri=\EM, rmacs=^O, rmam=\E[?7l,
-	rmir=\E[4l, rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m,
+	kf24=\E[2~, kf5=\E[M, ll=\E[24E, mc0=\E[?19h, nel=\EE,
+	prot=\E[1"q, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
+	rmkx=\E[?1l,
 	rs2=\E[61"p\E[40h\E[?6l\E[1r\E[2;3;4;13;20;34;39;36l\E[12;16
 	    ;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[24E
 	    \E[4i,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%O%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
-	use=ansi+pp, use=ansi+sgrbold,
+	smkx=\E[?1h, use=ecma+underline, use=ecma+standout,
+	use=ansi+csr, use=ansi+cup, use=ansi+idl, use=ansi+pp,
+	use=ansi+rca2, use=ansi+sgrbold, use=vt100+pf1-pf4,
+	use=vt220+ufkeys, use=wyse+cvis,
+
+# http://www.bitsavers.org/pdf/wyse/WY-99/880411-02A_WY-99GT_User_Manual_198703.pdf
+# "CSI 34 h" is WYULCURM, "Block cursor on" vs "Underline cursor on"
+wyse+cvis|Wyse cursor-mode,
+	civis=\E[?25l, cnorm=\E[34h\E[?25h,
 
 #   This is the american terminal. Here tabs work fine.
 # From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
@@ -12820,33 +13301,31 @@ wy75|wyse75|Wyse 75,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, clear=\E[H\E[J$<30>, cr=\r,
 	csr=\E[%i%p1%d;%p2%dr$<2>, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP$<3*>,
-	dch1=\E[P$<3>, dim=\E[0t\E[2m, dl=\E[%p1%dM$<1*>,
-	dl1=\E[M, dsl=\E[>\,\001\001\E[>-\001\001,
-	ech=\E[%p1%dX, ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>,
-	enacs=\E)0, flash=\E[30h\E\,$<250/>\E[30l, fsl=^A,
-	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@$<1*>,
-	il=\E[%p1%dL$<2*>, il1=\E[L$<2>, ind=\n$<2>, ip=$<1>,
+	dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[0t\E[2m,
+	dl=\E[%p1%dM$<1*>, dl1=\E[M,
+	dsl=\E[>\,\001\001\E[>-\001\001, ech=\E[%p1%dX,
+	ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E)0,
+	flash=\E[30h\E\,$<250/>\E[30l, fsl=^A, hpa=\E[%i%p1%dG,
+	ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>,
+	ind=\n$<2>, ip=$<1>,
 	is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h,
 	is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K,
-	kf1=\E[?5i, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[?3i,
-	kf20=\E[34~, kf21=\E[35~, kf3=\E[2i, kf4=\E[@, kf5=\E[M,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
-	khlp=\E[28~, kich1=\E[@, kil1=\E[L, knp=\E[6~, kpp=\E[5~,
-	kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, rc=\E8, rev=\E[1t\E[7m,
-	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
-	rmso=\E[m, rmul=\E[m, rs1=\E[13l\E[3l\E!p,
-	rs2=\E[35h\E[?3l$<80>, rs3=\E[?5l, sc=\E7,
+	kf1=\E[?5i, kf2=\E[?3i, kf21=\E[35~, kf3=\E[2i, kf4=\E[@,
+	kf5=\E[M, kfnd=\E[1~, khlp=\E[28~, kich1=\E[@, kil1=\E[L,
+	knp=\E[6~, kpp=\E[5~, kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i,
+	rc=\E8, rev=\E[1t\E[7m, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l,
+	rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
+	rs1=\E[13l\E[3l\E!p, rs2=\E[35h\E[?3l$<80>, rs3=\E[?5l,
+	sc=\E7,
 	sgr=%?%p5%t\E[0t%;%?%p3%p1%|%t\E[1t%;%?%p2%t\E[2t%;%?%p4%t
 	    \E[3t%;%?%p1%p2%p3%p4%p5%|%|%|%|%t\E[7m%e\E[m%;%?%p9%t
 	    \016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
 	smkx=\E[?1l\E[?7h\E=, smso=\E[1t\E[7m, smul=\E[2t\E[4m,
-	tsl=\E[>\,\001, use=ansi+arrows, use=ansi+local,
-	use=ansi+pp, use=ansi+tabs, use=decid+cpr,
-	use=vt220+cvis, use=vt220+keypad,
+	tsl=\E[>\,\001, use=ansi+arrows, use=ansi+cup,
+	use=ansi+local, use=ansi+pp, use=ansi+tabs,
+	use=decid+cpr, use=vt220+cvis, use=vt220+keypad,
+	use=vt220+sfkeys, use=vt220+ufkeys,
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
@@ -12895,13 +13374,9 @@ wy85|wyse85|Wyse 85,
 	ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>,
 	il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
-	is3=\E>\E(B\E)0\017\E[m, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
-	lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, rmam=\E[?7l,
-	rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
+	is3=\E>\E(B\E)0\017\E[m, khlp=\E[28~, khome=\E[26~,
+	lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
 	rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
@@ -12910,7 +13385,7 @@ wy85|wyse85|Wyse 85,
 	use=ansi+csr, use=ansi+inittabs, use=ansi+local,
 	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
 	use=vt100+4bsd, use=vt220+vtedit, use=vt220+cvis,
-	use=vt220+keypad,
+	use=vt220+keypad, use=vt220+sfkeys, use=vt220+ufkeys,
 #
 #	Wyse 85 with visual bell.
 wy85-vb|wyse85-vb|Wyse 85 with visible bell,
@@ -12979,8 +13454,7 @@ wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
 wy185|wyse185|Wyse 185,
 	hs, km, mir, xenl, xon,
 	wsl#80,
-	civis=\E[?25l, clear=\E[H\E[J$<40>,
-	cnorm=\E[34h\E[?25h, csr=\E[%i%p1%d;%p2%dr$<20>,
+	clear=\E[H\E[J$<40>, csr=\E[%i%p1%d;%p2%dr$<20>,
 	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<3>,
 	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>,
@@ -12990,23 +13464,20 @@ wy185|wyse185|Wyse 185,
 	hpa=\E[%i%p1%d`, ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>,
 	il1=\E[L$<3>, ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h,
-	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf20=\E[34~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1,
-	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, rc=\E8, ri=\EM$<2>,
-	rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, rmkx=\E>,
-	rmso=\E[27m, rmul=\E[24m,
-	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
-	rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7,
+	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, khlp=\E[28~,
+	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
+	rc=\E8, ri=\EM$<2>, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
+	rmkx=\E>, rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p,
+	rs2=\E[35h\E[?3l, rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smam=\E[?7h, smcup=\E[ Q, smir=\E[4h,
 	smkx=\E[?1l\E=, tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
-	use=vt100+4bsd, use=vt220+vtedit, use=vt220+keypad,
+	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
+	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+	use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd,
+	use=vt220+vtedit, use=vt220+keypad, use=vt220+sfkeys,
+	use=vt220+ufkeys, use=wyse+cvis,
 #
 #	Wyse 185 with 24 data lines and top status (terminal status)
 wy185-24|wyse185-24|Wyse 185 with 24 data lines,
@@ -13154,8 +13625,7 @@ wy370-nk|Wyse 370 without function keys,
 	am, ccc, hs, mir, msgr, xenl, xon,
 	colors#64, cols#80, lines#24, ncv#48, pairs#64, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>,
-	cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n,
+	bel=^G, clear=\E[H\E[J$<40>, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH$<1>, cvvis=\E[?25h\E[34l,
 	dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>, dclk=\E[31h,
 	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[40l,
@@ -13176,50 +13646,44 @@ wy370-nk|Wyse 370 without function keys,
 	oc=\E[60w\E[63;0w\E[66;1;4w\E[66;2;13w\E[66;3;16w\E[66;4;49w
 	   \E[66;5;51w\E[66;6;61w\E[66;7;64w,
 	op=\E[m, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmclk=\E[31l,
-	rmcup=\E[ R, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E[13l\E[3l\E!p\E[?4i,
-	rs2=\E[35h\E[?3l$<8>, rs3=\E[?5l, setb=\E[62;%p1%dw,
-	setf=\E[61;%p1%dw,
+	rmcup=\E[ R, rmir=\E[4l, rmkx=\E>,
+	rs1=\E[13l\E[3l\E!p\E[?4i, rs2=\E[35h\E[?3l$<8>,
+	rs3=\E[?5l, setb=\E[62;%p1%dw, setf=\E[61;%p1%dw,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q,
 	smir=\E[4h, smkx=\E[?1l\E=,
 	tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH, u0=\E[?38h\E8,
 	u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, u4=\E[92;76"p,
-	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ansi+csr,
-	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
-	use=ansi+sgrbold, use=decid+cpr,
+	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ecma+underline,
+	use=ecma+standout, use=ansi+csr, use=ansi+inittabs,
+	use=ansi+local, use=ansi+pp, use=ansi+sgrbold,
+	use=decid+cpr, use=wyse+cvis,
 #
 #	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,
 	kcbt=\E[Z, kdch1=\EOQ, kdl1=\EOQ, kent=\EOM, kf1=\E[?4i,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf2=\E[?3i,
-	kf3=\E[2i, kf4=\E[@, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, kich1=\EOP, kil1=\EOP, knp=\E[U,
-	kpp=\E[V, use=ansi+arrows, use=wy370-nk,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+	kf2=\E[?3i, kf3=\E[2i, kf4=\E[@, kf5=\E[M, kich1=\EOP,
+	kil1=\EOP, knp=\E[U, kpp=\E[V, use=ansi+arrows,
+	use=vt220+ufkeys, use=wy370-nk,
 #
 #	Function key set for the VT-320 (and wy85) compatible keyboard
 #
 wy370-105k|Wyse 370 with 105 key keyboard,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
-	kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
-	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
-	lf4=PF4, use=ansi+arrows, use=vt220+vtedit, use=wy370-nk,
-	use=vt220+keypad,
+	kfnd=\E[1~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
+	lf3=PF3, lf4=PF4, use=ansi+arrows, use=vt220+vtedit,
+	use=wy370-nk, use=vt220+keypad, use=vt220+sfkeys,
+	use=vt220+ufkeys,
 #
 #	Function key set for the PC compatible keyboard
 #
 wy370-EPC|Wyse 370 with 102 key keyboard,
-	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf1=\EOP, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	kf5=\E[M, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	kich1=\E[2~, knp=\E[U, kpp=\E[V, use=ansi+arrows,
-	use=wy370-nk,
+	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf5=\E[M, kich1=\E[2~,
+	knp=\E[U, kpp=\E[V, use=ansi+arrows, use=vt100+pf1-pf4,
+	use=vt220+ufkeys, use=wy370-nk,
 #
 #	Wyse 370 with visual bell.
 wy370-vb|Wyse 370 with visible bell,
@@ -13314,33 +13778,31 @@ wy520|wyse520|Wyse 520,
 	am, hs, km, mir, xenl, xon,
 	cols#80, it#8, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>,
-	cnorm=\E[34h\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr$<20>,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	bel=^G, clear=\E[H\E[J$<40>, cr=\r,
+	csr=\E[%i%p1%d;%p2%dr$<20>, cub1=^H, cud1=\n,
 	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<30>,
 	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
 	ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K,
-	enacs=\E)0, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%d`,
+	enacs=\E)0, fsl=\E[0$}, hpa=\E[%i%p1%d`,
 	ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>,
 	ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h,
 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
-	kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
-	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
-	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
-	rmul=\E[24m, rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p,
-	rs2=\E[35h\E[?3l, rs3=\E[?5l\E[47h\E[40l\E[r,
+	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
+	lf4=PF4, mc0=\E[0i, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l,
+	rmcup=\E[ R, rmir=\E[4l,
+	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
+	rs3=\E[?5l\E[47h\E[40l\E[r,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
 	smcup=\E[ Q\E[?67;8h, smir=\E[4h,
 	tsl=\E[2$~\E[1$}\E[%i%p1%d`, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+csr, use=ansi+local,
-	use=ansi+pp, use=ansi+sgrbold, use=ansi+tabs,
-	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
+	use=ecma+underline, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+local, use=ansi+pp,
+	use=ansi+sgrbold, use=ansi+tabs, use=decid+cpr,
+	use=vt220+vtedit, use=vt220+keypad, use=vt220+sfkeys,
+	use=vt220+ufkeys, use=wyse+cvis,
 #
 #       Wyse 520 with 24 data lines and status (terminal status)
 wy520-24|wyse520-24|Wyse 520 with 24 data lines,
@@ -13373,9 +13835,8 @@ wy520-wvb|wyse520-wvb|Wyse 520 with visible bell 132-columns,
 #                  to CTRL-C: stty intr '^c') for it to work since the
 #                  Delete key sends 7FH.
 wy520-epc|wyse520-epc|Wyse 520 with EPC keyboard,
-	kdch1=^?, kel=\E[4~, kend=\E[4~, kf0=\E[21~, kf1=\E[11~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, khome=\E[H,
-	use=wy520,
+	kdch1=^?, kel=\E[4~, kend=\E[4~, kf0=\E[21~, khome=\E[H,
+	use=xterm+r5+fkeys, use=wy520,
 #
 #       Wyse 520 with 24 data lines and status (terminal status)
 #       with EPC keyboard.
@@ -13555,6 +14016,7 @@ msk227am|mskermit227am|UCB MS-DOS Kermit 2.27 with automatic margins,
 	is2=\EO\Eq\EG\Ev\EJ\EY7\sK5\sMS\sKermit\s2.27\s+automatic
 	    \smargins\s3-17-85\n,
 	use=msk227,
+
 # MS-DOS Kermit 2.27 UCB 227.14 for the IBM PC
 # Automatic margins now default.  Use ansi <sgr> for highlights.
 # Define function keys.
@@ -13566,8 +14028,9 @@ msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC,
 	is2=\EO\Eq\EG\Ev\EJ\EY7\sK6\sMS\sKermit\s2.27\sUCB\s227.14
 	    \sIBM\sPC\s3-17-85\n,
 	kf0=\E0, kf1=\E1, kf2=\E2, kf3=\E3, kf4=\E4, kf5=\E5, kf6=\E6,
-	kf7=\E7, kf8=\E8, kf9=\E9, rev=\E[7m, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smso=\E[1m, smul=\E[4m, use=mskermit227,
+	kf7=\E7, kf8=\E8, kf9=\E9, rev=\E[7m, rmso=\E[m, sgr0=\E[m,
+	smso=\E[1m, use=ansi+sgrul, use=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.
@@ -13577,26 +14040,24 @@ vt320-k3|MS-Kermit 3.00's VT320 emulation,
 	cols#80, it#8, lines#49, pb#9600, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cmdch=\E, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	ech=\E[%p1%dX,
+	cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX,
 	flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
 	      ?5l,
-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
-	ind=\n, is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~,
-	kf0=\E[21~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+	ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\n,
+	is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~, kf0=\E[21~,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
 	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, mc0=\E[0i, mc4=\E[4i,
 	mc5=\E[5i, nel=\r\n, rev=\E[7m, ri=\EM, rin=\E[%p1%dL,
 	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m,
 	rs1=\E(B\E)B\E>\E\sF\E[4;20l\E[12h\E[?1;5;6;38;42l\E[?7;25h
 	    \E[4i\E[?4i\E[m\E[r\E[2$~,
 	sgr0=\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	tsl=\E[1$}\r\E[K, vpa=\E[%i%p1%dd, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+local, use=dec+sl,
-	use=vt220+cvis,
+	smkx=\E[?1h\E=, tbc=\E[3g, tsl=\E[1$}\r\E[K,
+	use=ecma+underline, use=ecma+standout, use=ansi+cup,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+rca2, use=dec+sl,
+	use=vt100+pf1-pf4, use=vt220+cvis,
 
 # From: Joseph Gil <yogi@cs.ubc.ca> 13 Dec 1991
 # ACS capabilities from Philippe De Muyter  <phdm@info.ucl.ac.be> 30 May 1996
@@ -13606,21 +14067,21 @@ vt320-k311|DEC VT320 series as defined by kermit 3.11,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dch1=\E[P, dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
-	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I,
-	hts=\EH, ich=\E[%p1%d@, il1=\E[L$<3/>, ind=\ED,
+	cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P,
+	dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
+	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, il1=\E[L$<3/>, ind=\ED,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
-	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
+	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
 	rf=/usr/share/tabset/vt100, ri=\EM, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E[?3l, sgr0=\E[m, smacs=^N, smam=\E[?7h,
-	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr,
-	use=ansi+idl, use=ansi+local, use=vt220+cvis,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rs1=\E[?3l,
+	sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h,
+	smkx=\E[?1h\E=, tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH,
+	use=ecma+underline, use=ecma+standout, use=ansi+csr,
+	use=ansi+cup, use=ansi+idl, use=ansi+local,
+	use=vt100+pf1-pf4, use=vt220+cvis,
 
 ######## NON-ANSI TERMINAL EMULATIONS
 #
@@ -13659,7 +14120,7 @@ vt320-k311|DEC VT320 series as defined by kermit 3.11,
 # ^V^K%p1%c%p2%c%p3%c%p4%c%p5%c	-- scroll (p2,p3) to (p4,p5) down by p1 lines
 # ^V^L%p1%c%p2%c%p3%c		-- clear p2 lines and p3 cols w/attr %p1
 # ^V^M%p1%c%p2%c%p3%c%p4%c	-- fill p3 lines & p4 cols w/char p2+attr %p1
-# (^V^L and ^V^M set the current attribute as a side-effect.)
+# (^V^L and ^V^M set the current attribute as a side effect.)
 # ^V ^Y <a> [...] <c>	-- repeat pattern. <a> specifies the number of bytes
 #			   in the pattern, <c> the number of times the pattern
 #			   should be repeated. If either value is 0, no-op.
@@ -13754,7 +14215,7 @@ rbcomm-w|IBM PC with RBcomm in 132 column mode,
 # This line:
 #	cup=\376G%p2%c%p1%c
 # LOOKS like it will work, but sometimes only one of the two numbers is sent.
-# See the terminfo (5) manpage commented regarding 'Terminals which use "%c"'.
+# See the terminfo(5) man page commented regarding 'Terminals which use "%c"'.
 #
 # Alas, there is no cursor upline capability on this display.
 #
@@ -13795,17 +14256,17 @@ MtxOrb162|16x2 Matrix Orbital LCD display,
 att2300|sv80|AT&T 2300 Video Information Terminal 80 column mode,
 	am, eo, mir, msgr, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, home=\E[H, ht=^I,
-	ich=\E[%p1%d@, ind=\n, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P,
-	kdl1=\E[M, kf1=\E[1r, kf10=\E[10r, kf11=\E[11r,
-	kf12=\E[12r, kf13=\E[13r, kf14=\E[14r, kf15=\E[15r,
-	kf16=\E[16r, kf2=\E[2r, kf3=\E[3r, kf4=\E[4r, kf5=\E[5r,
-	kf6=\E[6r, kf7=\E[7r, kf8=\E[8r, kf9=\E[9r, kich1=\E[@,
-	kil1=\E[L, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rev=\E[7m,
-	rmir=\E[4l, rmso=\E[m, sgr0=\E[m, smir=\E[4h, smso=\E[7m,
-	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
-	use=ansi+idl, use=ansi+local,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P,
+	el1=\E[1K, ht=^I, ich=\E[%p1%d@, ind=\n, kcbt=\E[Z,
+	kclr=\E[J, kdch1=\E[P, kdl1=\E[M, kf1=\E[1r, kf10=\E[10r,
+	kf11=\E[11r, kf12=\E[12r, kf13=\E[13r, kf14=\E[14r,
+	kf15=\E[15r, kf16=\E[16r, kf2=\E[2r, kf3=\E[3r, kf4=\E[4r,
+	kf5=\E[5r, kf6=\E[6r, kf7=\E[7r, kf8=\E[8r, kf9=\E[9r,
+	kich1=\E[@, kil1=\E[L, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+	rev=\E[7m, rmir=\E[4l, sgr0=\E[m, smir=\E[4h,
+	use=ansi+arrows, use=ansi+cpr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso,
 
 att2350|AT&T 2350 Video Information Terminal 80 column mode,
 	mc0@, mc4@, mc5@, use=att2300,
@@ -13826,10 +14287,8 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyz
 	     z{{||}}~~,
-	bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dim=\E[2m, dl1=\E[M,
-	fsl=\E8, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
-	is1=\E[?3l\E)0,
+	bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, dch1=\E[P, dim=\E[2m,
+	fsl=\E8, ht=^I, ich1=\E[@, ind=\n, is1=\E[?3l\E)0,
 	is3=\E[1;03q\s\s\sf1\s\s\s\s\s\s\s\s\s\s\s\EOP\E[2;03q\s\s
 	    \sf2\s\s\s\s\s\s\s\s\s\s\s\EOQ\E[3;03q\s\s\sf3\s\s\s\s
 	    \s\s\s\s\s\s\s\EOR\E[4;03q\s\s\sf4\s\s\s\s\s\s\s\s\s\s
@@ -13837,9 +14296,8 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	    \s\s\sf6\s\s\s\s\s\s\s\s\s\s\s\EOU\E[7;03q\s\s\sf7\s\s
 	    \s\s\s\s\s\s\s\s\s\EOV\E[8;03q\s\s\sf8\s\s\s\s\s\s\s\s
 	    \s\s\s\EOW,
-	kclr=\E[2J, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT,
-	kf6=\EOU, kf7=\EOV, kf8=\EOW, kll=\E[24;1H, ll=\E[24H,
-	nel=\r\n,
+	kclr=\E[2J, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+	kll=\E[24;1H, ll=\E[24H, nel=\r\n,
 	pfx=\E[%p1%1d;%p2%l%2.2dq\s\s\sf%p1%1d\s\s\s\s\s\s\s\s\s\s
 	    \s%p2%s,
 	pln=\E[%p1%d;00q%p2%:-16s, ri=\EM, rmacs=^O,
@@ -13847,8 +14305,9 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, tsl=\E7\E[25;%p1%{1}%+%dH,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+local1, use=ansi+sgrbold,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl1, use=ansi+local1,
+	use=ansi+sgrbold, use=vt100+pf1-pf4,
 
 att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
 	cols#132, wsl#132,
@@ -13872,18 +14331,18 @@ v5410|att5410 in terms of a VT100,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
 	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
 	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cuu1=\E[A$<2>, dch1=\E[P, dl1=\E[M, ed=\E[J$<50>,
-	el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
-	ht=^I, hts=\EH, ich1=\E[@, il1=\E[L, ind=\n, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l,
-	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+	cuu1=\E[A$<2>, dch1=\E[P, ed=\E[J$<50>, el=\E[K$<3>,
+	el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH,
+	ich1=\E[@, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m$<2>, ri=\EM$<5>,
+	rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>,
+	rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;$<2>,
 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
 	smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
-	use=ansi+csr, use=decid+cpr, use=vt100+fnkeys,
+	use=ansi+csr, use=ansi+idl1, use=decid+cpr,
+	use=vt100+fnkeys,
 
 #
 # Teletype Model 5420 -- A souped up 5410, with multiple windows,
@@ -13991,12 +14450,10 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j, cr=\EG, cub1=^H,
-	cud1=\E[1B, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[1A, cvvis=\E[11;1j, dch=\E[%p1%dP, dch1=\E[P,
-	ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, el=\E[0K, el1=\E[1K,
-	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
-	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
-	indn=\E[%p1%dE,
+	cud1=\E[1B, cuf1=\E[1C, cuu1=\E[1A, cvvis=\E[11;1j,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%ds\E[%p1%dD,
+	ed=\E[0J, el=\E[0K, el1=\E[1K, flash=\E[?5h$<200>\E[?5l,
+	fsl=\E8, ich=\E[%p1%d@, ich1=\E[@, ind=\n, indn=\E[%p1%dE,
 	is1=\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,
@@ -14015,10 +14472,10 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;%?%p8%t\EV%;,
 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1j, smln=\E~,
-	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
-	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local, use=ansi+sgrdim,
-	use=decid+cpr,
+	tsl=\E7\E[25;%p1%{8}%+%dH, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca,
+	use=ansi+sgrdim, use=decid+cpr,
 
 att5420_2-w|AT&T 5420 model 2 in 132 column mode,
 	cols#132,
@@ -14031,9 +14488,8 @@ att4418|att5418|AT&T 5418 80 cols,
 	am, xon,
 	cols#80, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
-	dim=\E[2m, ed=\E[0J, el=\E[0K, home=\E[H, ich=\E[%p1%d@,
+	bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r, dch=\E[%p1%dP,
+	dch1=\E[1P, dim=\E[2m, ed=\E[0J, el=\E[0K, ich=\E[%p1%d@,
 	ich1=\E[1@, il1=\E[1L, ind=\n, is1=\E[?3l,
 	is2=\E)0\E?6l\E?5l, kclr=\E[%%, kcub1=\E@, kcud1=\EU,
 	kcuf1=\EA, kcuu1=\ES, kent=\E[, kf1=\E[h, kf10=\E[m,
@@ -14041,9 +14497,9 @@ att4418|att5418|AT&T 5418 80 cols,
 	kf18=\E[K, kf19=\E[L, kf2=\E[i, kf20=\E[E, kf21=\E[_,
 	kf22=\E[M, kf23=\E[N, kf24=\E[O, kf3=\E[j, kf6=\E[k,
 	kf7=\E[l, kf8=\E[f, kf9=\E[w, khome=\Ec, rc=\E8, rev=\E[7m,
-	rmacs=^O, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m\017,
-	smacs=^N, smso=\E[7m, smul=\E[4m, use=ansi+idl,
-	use=ansi+local,
+	rmacs=^O, sc=\E7, sgr0=\E[m\017, smacs=^N, use=ansi+cup,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
+	use=ansi+sgrul,
 
 att4418-w|att5418-w|AT&T 5418 132 cols,
 	cols#132,
@@ -14081,16 +14537,16 @@ att4424|tty4424|Teletype 4424,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E3, bold=\E3, cbt=\EO, clear=\E[H\E[2J, cr=\r,
 	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\EB, cuf1=\EC,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch=\E[%p1%dP, dch1=\EP,
-	dim=\EW, dl=\E[%p1%dM, dl1=\EM, ed=\EJ, el=\Ez, home=\E[H,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E\^, il=\E[%p1%dL,
-	il1=\EL, ind=\n, is2=\E[20l\E[?7h, kclr=\EJ, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E}, ri=\ET,
-	rmacs=\E(B, rmso=\E~, rmul=\EZ,
+	cuu1=\EA, dch=\E[%p1%dP, dch1=\EP, dim=\EW, dl=\E[%p1%dM,
+	dl1=\EM, ed=\EJ, el=\Ez, ht=^I, hts=\EH, ich=\E[%p1%d@,
+	ich1=\E\^, il=\E[%p1%dL, il1=\EL, ind=\n, is2=\E[20l\E[?7h,
+	kclr=\EJ, nel=\EE, rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~,
+	rmul=\EZ,
 	sgr=\EX\E~\EZ\E4\E(B%?%p1%p3%|%t\E}%;%?%p2%t\E\\%;%?%p4%p6%|
 	    %t\E3%;%?%p5%t\EW%;%?%p9%t\E(0%;,
 	sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smso=\E}, smul=\E\\,
-	tbc=\EF, use=ansi+arrows, use=ansi+local,
+	tbc=\EF, use=ansi+arrows, use=ansi+cup, use=ansi+local,
+	use=vt100+pf1-pf4,
 
 att4424-1|tty4424-1|Teletype 4424 in display function group I,
 	kclr@, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome@,
@@ -14108,9 +14564,9 @@ att4424m|tty4424m|Teletype 4424M,
 	bel=^G, clear=\E[2;H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
 	cup=\E[%i%p1%2d;%p2%2dH\E[B, cuu1=\E[A, dch1=\EP,
 	dl1=\EM, el=\E[K, ht=^I, ich1=\E\^, il1=\EL, ind=\n, ip=$<2/>,
-	is2=\E[m\E[2;24r, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	nel=\r\n, ri=\ET, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	is2=\E[m\E[2;24r, nel=\r\n, ri=\ET, sgr0=\E[m,
+	use=ansi+arrows, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt100+pf1-pf4,
 
 # The Teletype 5425 is really version 2 of the Teletype 5420. It
 # is quite similar, except for some minor differences. No page
@@ -14127,8 +14583,8 @@ att5425|tty5425|att4425|AT&T 4425/5425,
 	bold=\E[2;7m, cnorm=\E[12;0j, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[12;1j, dch=\E[%p1%dP,
 	dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K,
-	flash=\E[?5h$<200>\E[?5l, fsl=\E8, hpa=\E[%p1%{1}%+%dG,
-	ich=\E[%p1%d@, indn=\E[%p1%dE, is1=\E<\E[?3l$<100>,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, ich=\E[%p1%d@,
+	indn=\E[%p1%dE, is1=\E<\E[?3l$<100>,
 	is2=\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,
 	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P,
@@ -14145,9 +14601,9 @@ att5425|tty5425|att4425|AT&T 4425/5425,
 	    %|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h,
 	smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~,
-	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	tsl=\E7\E[25;%p1%{8}%+%dH, use=ansi+arrows,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca,
 	use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd,
 
 att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels,
@@ -14164,17 +14620,17 @@ att4426|tty4426|Teletype 4426S,
 	cols#80, lines#24, lm#48,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[5m, clear=\E[H\E[2J\E[1U\E[H\E[2J\E[1V,
-	cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\EP,
-	ed=\E[J, el=\E[0K, home=\E[H, hpa=\E[%p1%dG, ht=^I, hts=\E1,
-	ich=\E[%p1%d@, ich1=\E\^, il1=\EL, ind=\n, is1=\Ec\E[?7h,
-	is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV,
-	kf8=\EOW, khome=\E[H, kll=\E[24;1H, ll=\E[24H, nel=\r\n,
-	rc=\E8, rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l,
-	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7,
-	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smso=\E[5m,
-	smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%dd, use=ansi+idl,
-	use=ansi+local, use=ecma+index, use=vt52+arrows,
+	cr=\r, dch=\E[%p1%dP, dch1=\EP, ed=\E[J, el=\E[0K,
+	hpa=\E[%p1%dG, ht=^I, hts=\E1, ich=\E[%p1%d@, ich1=\E\^,
+	il1=\EL, ind=\n, is1=\Ec\E[?7h, is2=\E[m\E[1;24r, kbs=^H,
+	kcbt=\EO, kclr=\E[2J, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+	khome=\E[H, kll=\E[24;1H, ll=\E[24H, nel=\r\n, rc=\E8,
+	rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l, rmso=\E[m,
+	rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B, smacs=\E(0,
+	smam=\E[?7h, smso=\E[5m, tbc=\E[3g, vpa=\E[%p1%dd,
+	use=ansi+cup, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrul, use=ecma+index, use=vt100+pf1-pf4,
+	use=vt52+arrows,
 
 # Terminfo entry for the AT&T 510 A Personal Terminal
 # Function keys 9 - 16 are available only after the
@@ -14190,9 +14646,8 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[2;7m, civis=\E[11;0|,
 	clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|, dch=\E[%p1%dP,
-	dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K,
-	enacs=\E(B\E)1, ff=^L, home=\E[H, ind=\n,
+	cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+	ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E(B\E)1, ff=^L, ind=\n,
 	is1=\E(B\E)1\E[2l, is3=\E[21;1|\212, kLFT=\E[u,
 	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
 	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
@@ -14200,13 +14655,12 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
 	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, mc0=\E[0i,
 	mc4=\E[?8i, mc5=\E[?4i, nel=\EE, pln=\E[%p1%dp%p2%:-16s,
-	rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[19;0|,
-	rmso=\E[m, rmul=\E[m, sc=\E7,
+	rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[19;0|, sc=\E7,
 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
 	    %|%t;7%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, smso=\E[7m,
-	smul=\E[4m, use=ansi+cpr, use=ansi+idl, use=ansi+local,
-	use=ansi+tabs,
+	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, use=ansi+cpr,
+	use=ansi+cup, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul, use=ansi+tabs,
 
 # Terminfo entry for the AT&T 510 D Personal Terminal
 # Function keys 9 through 16 are accessed by bringing up the
@@ -14222,27 +14676,25 @@ att510d|bct510d|AT&T 510D Personal Terminal,
 	cols#80, lh#2, lines#24, lm#48, lw#7, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
 	bel=^G, bold=\E[2;7m, clear=\E[H\E[J, cnorm=\E[11;3|,
-	cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
-	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H,
-	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
-	is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212, kLFT=\E[u,
-	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
-	kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, kf16=\EOj,
-	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
-	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i,
-	mc4=\E[?8i, mc5=\E[?4i, mgc=\E:, nel=\EE,
+	cr=\r, cub1=^H, cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E(B\E)1,
+	ff=^L, ich=\E[%p1%d@, ind=\n, is1=\E(B\E)1\E[5;0|,
+	is3=\E[21;1|\212, kLFT=\E[u, kRIT=\E[v, kbs=^H, kcbt=\E[Z,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm,
+	kf10=\EOd, kf11=\EOe, kf12=\EOf, kf13=\EOg, kf14=\EOh,
+	kf15=\EOi, kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe,
+	kf6=\ENf, kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T,
+	ll=\E#2, mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E:, nel=\EE,
 	pln=\E[%p1%dp%p2%:-16s, rc=\E8, ri=\EM, rmacs=^O,
 	rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmxon=\E[29;1|,
 	rs2=\E[5;0|, sc=\E7,
 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h,
-	smkx=\E[19;1|, smln=\E?, smxon=\E[29;0|,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+cpr, use=ansi+idl,
-	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
-	use=ansi+tabs, use=ecma+index,
+	smkx=\E[19;1|, smln=\E?, smxon=\E[29;0|, use=ansi+cpr,
+	use=ansi+cup, use=ansi+idl, use=ansi+local, use=ansi+rep,
+	use=ansi+sgrbold, use=ansi+tabs, use=ecma+index,
+	use=ansi+rca,
 
 # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
 att500|att513|AT&T 513 using page mode,
@@ -14250,11 +14702,9 @@ att500|att513|AT&T 513 using page mode,
 	cols#80, lh#2, lines#24, lw#8, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
 	bel=^G, bold=\E[2;7m, cnorm=\E[11;0|, cr=\r,
-	csr=%i\E[%p1%d;%p2%dr, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;1|, dch=\E[%p1%dP,
-	dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)1,
-	home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
-	indn=\E[%p1%dE,
+	csr=%i\E[%p1%d;%p2%dr, cub1=^H, cud1=\n, cvvis=\E[11;1|,
+	dch=\E[%p1%dP, dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K,
+	enacs=\E(B\E)1, ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dE,
 	is1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l,
 	kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON,
 	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK,
@@ -14287,9 +14737,9 @@ att500|att513|AT&T 513 using page mode,
 	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smir=\E[4h,
-	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=ansi+rep,
+	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, use=ansi+arrows,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+rca, use=ansi+rep,
 	use=ansi+sgrbold, use=ansi+tabs, use=decid+cpr,
 
 # 01-07-88:
@@ -14340,12 +14790,11 @@ att5310|att5320|AT&T Model 53210 or 5320 matrix printer,
 att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs,
 	am, xon,
 	cols#88, it#8, lines#70, vt#3,
-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ht=^I, ich=\E[%p1%d@,
-	ich1=\E[@, ind=\n, kclr=\E[2J, kll=\E[70;1H, nel=\r\n,
-	rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7, use=ansi+arrows,
-	use=ansi+erase, use=ansi+idl, use=ansi+local1,
-	use=ecma+index,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P,
+	ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\n, kclr=\E[2J,
+	kll=\E[70;1H, nel=\r\n, rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7,
+	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl, use=ansi+local1, use=ecma+index,
 
 # 5620 terminfo  (2.0 or later ROMS with char attributes)
 # The following SET-UP modes are assumed for normal operation:
@@ -14362,12 +14811,12 @@ att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs,
 att5620|dmd|tty5620|ttydmd|5620|AT&T 5620 terminal 88 columns,
 	OTbs, am, msgr, npc, xon,
 	cols#88, it#8, lines#70,
-	bel=^G, bold=\E[2m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, home=\E[H, ht=^I,
-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, kclr=\E[2J,
-	kll=\E[70;1H, nel=\n, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8,
-	rev=\E[7m, ri=\E[T, rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7,
-	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	bel=^G, bold=\E[2m, cr=\r, cub1=^H, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
+	kclr=\E[2J, kll=\E[70;1H, nel=\n,
+	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T,
+	rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, sgr0=\E[0m,
+	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+local1,
 	use=ecma+index,
 
@@ -14393,8 +14842,8 @@ att605|AT&T 605 80 column 102key keyboard,
 	cols#80, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
-	el1=\E[1K, fsl=\E8, ht=^I, il1=\E[L, ind=\n, invis=\E[8m,
+	cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, dl=\E[%p1%dM,
+	el1=\E[1K, fsl=\E8, ht=^I, ind=\n, invis=\E[8m,
 	is1=\E[8;0|\E[?\E[13;20l\E[?\E[12h, is2=\E[m\017,
 	kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P,
 	kdl1=\E[M, kend=\E[24;1H, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14411,11 +14860,11 @@ att605|AT&T 605 80 column 102key keyboard,
 	mc5=\E[?5i, nel=\EE,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
-	rmacs=^O, rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l,
-	sc=\E7, sgr0=\E[m\017, smacs=\E)0\016, smln=\E[p,
-	smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx,
+	rmacs=^O, rmln=\E[2p, rs2=\Ec\E[?3l, sc=\E7, sgr0=\E[m\017,
+	smacs=\E)0\016, smln=\E[p, tsl=\E7\E[25;%i%p1%dx,
 	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
-	use=ansi+idc, use=ansi+local1,
+	use=ansi+idc, use=ansi+idl1, use=ansi+local1,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 att605-pc|AT&T 605 in pc term mode,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
@@ -14576,21 +15025,21 @@ att620-103k-w|AT&T 620; 132 column; 103key keyboard,
 att630|AT&T 630 windowing terminal,
 	OTbs, am, da, db, mir, msgr, npc, xon,
 	cols#80, it#8, lines#60, lm#0,
-	bel=^G, blink=\E[5m, cbt=\E[Z, cr=\r, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K, home=\E[H,
-	ht=^I, ind=\ED, is2=\E[m, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P,
-	kdl1=\E[M, kent=\r, kf10=\ENp, kf11=\ENq, kf12=\ENr,
-	kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv, kf17=\ENw,
-	kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{, kf22=\EN|,
-	kf23=\EN}, kf24=\EN~, kf9=\ENo, kich1=\E[@, kil1=\E[L,
-	mc4=\E[?4i, mc5=\E[?5i, nel=\r\n,
+	bel=^G, blink=\E[5m, cbt=\E[Z, cr=\r, cub1=^H, dim=\E[2m,
+	el1=\E[1K, ht=^I, ind=\ED, is2=\E[m, kcbt=\E[Z, kclr=\E[2J,
+	kdch1=\E[P, kdl1=\E[M, kent=\r, kf10=\ENp, kf11=\ENq,
+	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv,
+	kf17=\ENw, kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{,
+	kf22=\EN|, kf23=\EN}, kf24=\EN~, kf9=\ENo, kich1=\E[@,
+	kil1=\E[L, mc4=\E[?4i, mc5=\E[?5i, nel=\r\n,
 	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\EM,
-	rmso=\E[m, rmul=\E[m, rs2=\Ec, sc=\E7,
+	rs2=\Ec, sc=\E7,
 	sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7
 	    %;m,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+cpr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+local, use=ecma+index,
+	sgr0=\E[m, use=ansi+arrows, use=ansi+cpr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+	use=ecma+index,
 
 att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
 	lines#24, use=att630,
@@ -14676,10 +15125,10 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
-	fln=4\,4, fsl=\E8, home=\E[H, ich=\E[%p1%d@, ind=\ED,
+	bel=^G, cr=\r, cub1=^H, cvvis=\E[?12;25h, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)0,
+	flash=\E[?5h$<200>\E[?5l, fln=4\,4, fsl=\E8,
+	ich=\E[%p1%d@, ind=\ED,
 	is2=\E[50;4|\E[53;0|\E[8;0|\E[?4;13;15l\E[13;20l\E[?7h\E[12h
 	    \E(B\E)0\E[?31l\E[0m\017,
 	is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z,
@@ -14697,13 +15146,14 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	pfx=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t\s\s\sF%p1%1d\s\s\s\s\s
 	    \s\s\s\s\s\s%;%p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O,
-	rmir=\E[4l, rmln=\E[2p, rmso=\E[27m, rmul=\E[24m,
-	rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|,
+	rmir=\E[4l, rmln=\E[2p, rmxon=\E[53;3|,
+	rs1=\Ec\E[?3;5l\E[56;0|,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p,
-	smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx, use=ansi+arrows,
-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx,
+	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
 	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
 	use=ansi+sgrbold, use=decid+cpr, use=dec+pp,
 	use=att610+cvis0,
@@ -14746,13 +15196,14 @@ att730|AT&T 730 windowing terminal,
 	    %<%tq\s\s\sSYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;%p2%s,
 	pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmso=\E[27m,
-	rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l,
+	rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmxon=\E[?21l,
+	rs2=\Ec\E[?3l,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
 	smln=\E[?13l, smxon=\E[?21h, swidm=\E#6,
-	tsl=\E7\E[;%i%p1%dx, use=ansi+arrows, use=ansi+csr,
+	tsl=\E7\E[;%i%p1%dx, use=ecma+underline,
+	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
 	use=ansi+cup, use=ansi+erase, use=ansi+idl,
 	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
 	use=decid+cpr, use=dec+pp, use=att610+cvis,
@@ -14948,9 +15399,9 @@ att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal,
 	kf3=\E[03s, kf4=\E[04s, kf5=\E[05s, kf6=\E[06s,
 	krfr=\E[27s, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m,
 	rmacs=\E[10m, rmam=\E[11;1j, rmir=\E[4l, rmso=\E[m,
-	rmul=\E[m, rs1=\Ec, sc=\E7, sgr0=\E[m, smacs=\E[11m,
-	smam=\E[11;0j, smir=\E[4h, smso=\E[1m, smul=\E[4m,
-	use=ansi+cpr, use=ansi+idl, use=ansi+local,
+	rs1=\Ec, sc=\E7, sgr0=\E[m, smacs=\E[11m, smam=\E[11;0j,
+	smir=\E[4h, smso=\E[1m, use=ansi+cpr, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrul,
 
 # The following Terminfo entry describes functions which are supported by
 # the AT&T 5430/pt505 terminal software version 1.
@@ -15214,8 +15665,7 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	OTbs, am, km, mc5i, mir, xon,
 	cols#80,
 	bel=^G, clear=\E[H\E[J$<156>, cr=\r, cub1=^H, cud1=^K,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
-	el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
+	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K$<5>,
 	ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il1=\E[L$<3>, ind=^K,
 	is1=\E[m\E7\E[H\E9\E8,
 	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J,
@@ -15228,14 +15678,11 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
 	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
 	     \\,
-	rmm=\E[>52l, sc=\E7,
-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
-	    %;%?%p7%t8;%;m,
-	sgr0=\E[m,
+	rmm=\E[>52l, sc=\E7, sgr0=\E[m,
 	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E
 	     \\,
-	smm=\E[>52h, vpa=\E[%p1%{1}%+%dd, use=ansi+arrows,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	smm=\E[>52h, use=ansi+arrows, use=ansi+cup, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca,
 	use=ansi+rep, use=ansi+sgrbold,
 
 aaa+rv|Ann Arbor Ambassador in reverse video,
@@ -15287,13 +15734,12 @@ aaa-28|Ann Arbor Ambassador/28 lines,
 	rmcup=\E[60;0;0;28p\E[28;1H\E[K,
 	smcup=\E[H\E[J$<156>\E[28;0;0;28p, use=aaa+unk,
 aaa-30-s|aaa-s|Ann Arbor Ambassador/30 lines w/status,
-	eslok, hs,
 	lines#29,
 	dsl=\E7\E[60;0;0;30p\E[1;1H\E[K\E[H\E8\r\n\E[K,
-	fsl=\E[>51l, is2=\r\n\E[A\E7\E[60;1;0;30p\E8,
+	is2=\r\n\E[A\E7\E[60;1;0;30p\E8,
 	rmcup=\E[60;1;0;30p\E[29;1H\E[K,
 	smcup=\E[H\E[J$<156>\E[30;1;0;30p\E[30;1H\E[K,
-	tsl=\E[>51h\E[1;%p1%dH\E[2K, use=aaa+unk,
+	use=aaa+unk, use=guru+s,
 aaa-30-s-rv|aaa-s-rv|Ann Arbor Ambassador/30 lines+status+reverse video,
 	use=aaa+rv, use=aaa-30-s,
 aaa-s-ctxt|aaa-30-s-ctxt|Ann Arbor Ambassador/30 lines+status+save context,
@@ -15625,14 +16071,13 @@ cit101|citc|C. Itoh fast VT100,
 	OTbs, am, xenl,
 	cols#80, lines#24,
 	bel=^G, clear=\E[H\E[2J, cnorm=\E[V\E8, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E7\E[U, dch1=\E[P,
-	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5h$<200/>\E[?5l,
-	ich1=\E[@, il1=\E[L,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E7\E[U, dch1=\E[P, ed=\E[J,
+	el=\E[K, flash=\E[?5h$<200/>\E[?5l, ich1=\E[@,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, use=ansi+local1,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, sgr0=\E[m, smam=\E[?7h,
+	smkx=\E[?1h\E=, use=ansi+idl1, use=ansi+local1,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 # CIE Terminals CIT-101e from Geoff Kuenning <callan!geoff> via BRL
 # The following termcap entry was created from the Callan cd100 entry.  The
@@ -15646,13 +16091,12 @@ cit101e|C. Itoh CIT-101e,
 	cols#80, it#8, lines#24,
 	acsc=, cnorm=, csr=\E[%i%p1%2d;%p2%2dr,
 	cup=\E[%i%p1%2d;%p2%2dH, cvvis=\E[?1l\E[?4l\E[?7h,
-	dch1=\E[P, dl1=\E[M, if=/usr/share/tabset/vt100,
-	il1=\E[L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf0=\EOT, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm,
+	dch1=\E[P, if=/usr/share/tabset/vt100, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOT, kf5=\EOm,
 	kf6=\EOl, kf7=\EOM, kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O,
-	rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N,
-	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
-	use=ansi+erase, use=ansi+local1,
+	rmir=\E[4l, rmkx=\E>, sc=\E7, smacs=^N, smir=\E[4h, smkx=\E=,
+	use=ansi+erase, use=ansi+idl1, use=ansi+local1,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
 
 # From: David S. Lawyer, June 1997:
 # The CIT 101-e was made in Japan in 1983-4 and imported by CIE
@@ -15675,19 +16119,18 @@ cit101e-rv|C. Itoh CIT-101e (sets reverse video),
 	am, eo, mir, msgr, xenl, xon,
 	cols#80, lines#24,
 	OTnl=\EM, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[1v,
-	cnorm=\E[0;3;4v, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	cvvis=\E[3;5v, flash=\E[?5l$<200/>\E[?5h, home=\E[H,
-	hpa=\E[%i%p1%dG, ind=\n,
+	cnorm=\E[0;3;4v, cr=\r, cub1=^H, cvvis=\E[3;5v,
+	flash=\E[?5l$<200/>\E[?5h, hpa=\E[%i%p1%dG, ind=\n,
 	is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(
 	    B\E[m\E[20l\E[1;24r\E[24;1H,
 	kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E[7m,
-	ri=\EM, rmcup=, rmso=\E[m, rmul=\E[m, rs1=\Ec\E[?7h\E[>5g,
-	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h, smso=\E[7m,
-	smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c,
-	use=ansi+enq, use=ansi+csr, use=ansi+erase, use=ansi+idc,
+	nel=\EE, rev=\E[7m, ri=\EM, rmcup=, rs1=\Ec\E[?7h\E[>5g,
+	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h,
+	u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c, use=ansi+enq,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ecma+index,
+	use=ansi+sgrso, use=ansi+sgrul, use=ecma+index,
+	use=vt100+pf1-pf4,
 
 cit101e-n|CIT-101e w/o am,
 	am@,
@@ -15716,20 +16159,19 @@ cit500|CIE Terminals CIT-500,
 	OTbs, OTpt, mir, msgr, xon,
 	OTkn#10, cols#80, lines#64, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
-	cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
-	dch1=\E[P, ed=\EJ, el=\EK, home=\E[H, ind=\n, is2=\E<\E)0,
-	kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M, ked=\EJ, kel=\EK, kf0=\EOP,
-	kf1=\EOQ, kf2=\EOR, kf3=\EOS, kf4=\EOU, kf5=\EOV, kf6=\EOW,
-	kf7=\EOX, kf8=\EOY, kf9=\EOZ, khome=\E[H, kich1=\E[4h,
-	kil1=\E[L, krmir=\E[4l, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4,
-	lf4=F15, lf5=F16, lf6=F17, lf7=F18, lf8=F19, lf9=F20,
-	ll=\E[64H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	cr=\r, cub1=^H, cud1=\n, cuu1=\EM, dch1=\E[P, ed=\EJ, el=\EK,
+	ind=\n, is2=\E<\E)0, kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M,
+	ked=\EJ, kel=\EK, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS,
+	kf4=\EOU, kf5=\EOV, kf6=\EOW, kf7=\EOX, kf8=\EOY, kf9=\EOZ,
+	khome=\E[H, kich1=\E[4h, kil1=\E[L, krmir=\E[4l, lf0=PF1,
+	lf1=PF2, lf2=PF3, lf3=PF4, lf4=F15, lf5=F16, lf6=F17, lf7=F18,
+	lf8=F19, lf9=F20, ll=\E[64H, nel=\EE, rev=\E[7m, ri=\EM,
+	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
 	rs1=\E<\E2\E[20l\E[?6l\E[r\E[m\E[q\E(B\017\E)0\E>,
 	sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	use=ansi+apparrows, use=ansi+csr, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local,
+	smkx=\E[?1h\E=, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+idl, use=ansi+inittabs,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 
 # C. Itoh printers begin here
 citoh|ci8510|8510|C. Itoh 8510a,
@@ -15817,7 +16259,7 @@ cdc756|CDC 756,
 # of the tab key to send an ESC.  The real ESC key is positioned way out
 # in right field.
 #
-# The termcap won't work in 132 column mode due to the way it it moves the
+# The termcap won't work in 132 column mode due to the way it moves the
 # cursor.  Termcap doesn't have the capability (as far as I could tell) to
 # handle the 721 in 132 column mode.
 #
@@ -15867,9 +16309,8 @@ visa50|Geveke VISA 50 terminal in ANSI 80 character mode,
 	cols#80, lines#25,
 	acsc=0_aaffggh jjkkllmmnnooqqssttuuvvwwxx, bel=^G,
 	blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dX, dch1=\E[X, dim=\E[2m, ed=\E[J, el=\E[K,
-	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	csr=\E[%i%p1%d;%p2%dr, dch=\E[%p1%dX, dch1=\E[X,
+	dim=\E[2m, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l,
 	ht=^I, ind=\n, invis=\E[8m,
 	is2=\E0;2m\E[1;25r\E[25;1H\E[?3l\E[?7h\E[?8h,
 	ka1=\E[f, ka3=\EOQ, kb2=\EOP, kc1=\EOR, kc3=\EOS, kdch1=^?,
@@ -15881,9 +16322,9 @@ visa50|Geveke VISA 50 terminal in ANSI 80 character mode,
 	lf9=A funcl0=A send, nel=\r\n, rev=\E[7m, rmacs=\E[3l,
 	rmam=\E[?7l, rmkx=\E>, rmso=\E[0;2m, rmul=\E[0m,
 	sgr0=\E[0;2m, smacs=\E3h, smam=\E?7h, smkx=\E=,
-	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+idc, use=ansi+idl,
-	use=ansi+local,
+	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ansi+arrows,
+	use=ansi+cup, use=ansi+idc, use=ansi+idl, use=ansi+local,
+	use=ansi+rca2,
 
 #### Human Designed Systems (Concept)
 #
@@ -16273,9 +16714,9 @@ hds200|Human Designed Systems HDS200,
 	cols#80, lines#24, lm#0,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
 	blink=\E[0;5m, bold=\E[0;1m, civis=\E[6+{, cnorm=\E[+{,
-	cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dsl=\E[2!w\r\n\E[!w, el1=\E[1K, fsl=\E[!w, home=\E[H,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, invis=\E[0;8m,
+	cr=\r, dch=\E[%p1%dP, dch1=\E[P, dsl=\E[2!w\r\n\E[!w,
+	el1=\E[1K, fsl=\E[!w, ich=\E[%p1%d@, ind=\ED,
+	invis=\E[0;8m,
 	is2=\E)0\017\E[m\E[=107;207h\E[90;3u\E[92;3u\E[43;1u\177\E$P
 	    \177\E[44;1u\177\E$Q\177\E[45;1u\177\E$R\177\E[46;1u
 	    \177\E$S\177\E[200;1u\177\E$A\177\E[201;1u\177\E$B\177
@@ -16300,10 +16741,10 @@ hds200|Human Designed Systems HDS200,
 	sgr=\E[0%?%p1%p6%O%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%O%t;7
 	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[0;1;7m,
-	smul=\E[0;4m, tsl=\E[2!w\E[%i%p1%dG, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp,
+	smul=\E[0;4m, tsl=\E[2!w\E[%i%p1%dG, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+	use=ansi+rca2,
 
 # <ht> through <el> included to specify padding needed in raw mode.
 # (avt-ns: added empty <acsc> to suppress a tic warning --esr)
@@ -16311,18 +16752,16 @@ avt-ns|Concept AVT no status line,
 	OTbs, am, eo, mir, ul, xenl, xon,
 	cols#80, lines#24, lm#192,
 	acsc=, bel=^G, clear=\E[H\E[J$<38>, cnorm=\E[=119l, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=119h,
-	dim=\E[1!{, dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>,
-	ed=\E[J$<96>, el=\E[K$<6>, home=\E[H,
-	hpa=\E[%p1%{1}%+%dG, ht=\011$<4>, ich=\E[%p1%d@,
+	cub1=^H, cud1=\n, cvvis=\E[=119h, dim=\E[1!{,
+	dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>, ed=\E[J$<96>,
+	el=\E[K$<6>, ht=\011$<4>, ich=\E[%p1%d@,
 	il=\E[%p1%dL$<4*>, il1=\E[L$<4>, ind=\n$<8>, ip=$<4>,
 	is1=\E[=103l\E[=205l,
 	is2=\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:0:32!r\E[0*w\E[w\E2\r\n\E[2;27
 	    !t,
-	kdch1=\E\002\r, ked=\E\004\r, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
-	kf4=\EOS, kich1=\E\001\r, kil1=\E\003\r, ll=\E[24H,
-	mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+	kdch1=\E\002\r, ked=\E\004\r, kich1=\E\001\r,
+	kil1=\E\003\r, ll=\E[24H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
 	pfloc=\E[%p1%d;0u#%p2%s#, pfx=\E[%p1%d;1u#%p2%s#,
 	prot=\E[99m, ri=\EM$<4>, rmacs=\016$<1>,
 	rmcup=\E[w\E2\r\n, rmkx=\E[!z\E[0;2u, rmso=\E[7!{,
@@ -16332,9 +16771,10 @@ avt-ns|Concept AVT no status line,
 	    \016%;$<1>,
 	sgr0=\E[m\016$<1>, smacs=\017$<1>,
 	smcup=\E[=4l\E[1;24w\E2\r, smkx=\E[1!z\E[0;3u,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+idc1, use=ansi+inittabs, use=ansi+local,
-	use=ansi+rep, use=ansi+sgrbold,
+	use=ansi+rca, use=ansi+rep, use=ansi+sgrbold,
+	use=vt100+pf1-pf4,
 
 avt-rv-ns|Concept AVT in reverse video mode/no status line,
 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
@@ -16534,14 +16974,13 @@ dg+color|Color info for Data General D470C terminals in ANSI mode,
 	use=dg+color8,
 
 dgmode+color8|Color info for Data General D220/D230C terminals in DG mode,
-	bce,
-	colors#8, ncv#16, pairs#64,
 	op=\036Ad\036Bd,
 	setab=\036B%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|
 	      %;%{48}%+%c,
 	setaf=\036A%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|
 	      %;%{48}%+%c,
 	setb=\036B%p1%{48}%+%c, setf=\036A%p1%{48}%+%c,
+	use=dg+color8,
 
 dgmode+color|Color info for Data General D470C terminals in DG mode,
 	colors#16, pairs#0x100,
@@ -16552,8 +16991,6 @@ dgmode+color|Color info for Data General D470C terminals in DG mode,
 	use=dgmode+color8,
 
 dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode,
-	bce, ccc,
-	colors#52, ncv#53, pairs#26,
 	initp=\036RG0%p1%02X%p2%{255}%*%{1000}%/%02X%p3%{255}%*
 	      %{1000}%/%02X%p4%{255}%*%{1000}%/%02X%p5%{255}%*
 	      %{1000}%/%02X%p6%{255}%*%{1000}%/%02X%p7%{255}%*
@@ -16561,7 +16998,7 @@ dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode,
 	oc=\036RG01A00FF00000000\036RG01B00000000FF00
 	   \036RG01C007F00000000\036RG01D000000007F00,
 	op=\036RF4831A\036RF2E31B\036RF1D31C\036RF3F31D,
-	scp=\036RG2%p1%02X,
+	scp=\036RG2%p1%02X, use=dg+ccc,
 
 # Colors are in the order:  normal, reverse, dim, dim + reverse.
 dg+ccc|Configurable color info for DG D430C terminals in DG mode,
@@ -16611,10 +17048,10 @@ dg200|Data General DASHER 200,
 dg210|dg-ansi|Data General 210/211,
 	am,
 	cols#80, lines#24,
-	OTnl=\E[B, clear=\E[2J, cup=\E[%i%p1%d;%p2%dH, ed=\E[J,
-	el=\E[K, home=\E[H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, khome=\E[H, nel=\r\E[H\E[A\n, rmso=\E[0;m,
-	rmul=\E[0;m, smso=\E[7;m, smul=\E[4;m, use=ansi+local1,
+	OTnl=\E[B, clear=\E[2J, ed=\E[J, el=\E[K, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
+	nel=\r\E[H\E[A\n, rmso=\E[0;m, rmul=\E[0;m, smso=\E[7;m,
+	smul=\E[4;m, use=ansi+cup, use=ansi+local1,
 
 # From: Peter N. Wan <ihnp4!gatech!gacsr!wan>
 # courtesy of Carlos Rucalde of Vantage Software, Inc.
@@ -16642,17 +17079,18 @@ dg460-ansi|Data General Dasher 460 in ANSI-mode,
 	OTbs, am, msgr, ul,
 	cols#80, it#8, lines#24,
 	OTnl=\ED, blink=\E[5m, clear=\E[2J, cub1=^H,
-	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dim=\E[2m, dl1=\E[M,
-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L,
-	ind=\E[S, is2=^^F@, kbs=\E[D, kf0=\E[001z, kf1=\E[002z,
-	kf2=\E[003z, kf3=\E[004z, kf4=\E[005z, kf5=\E[006z,
-	kf6=\E[007z, kf7=\E[008z, kf8=\E[009z, kf9=\E[00:z, lf0=f1,
-	lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10,
-	mc0=\E[i, rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05,
+	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dim=\E[2m, ed=\E[J,
+	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, ind=\E[S, is2=^^F@,
+	kbs=\E[D, kf0=\E[001z, kf1=\E[002z, kf2=\E[003z,
+	kf3=\E[004z, kf4=\E[005z, kf5=\E[006z, kf6=\E[007z,
+	kf7=\E[008z, kf8=\E[009z, kf9=\E[00:z, lf0=f1, lf1=f2,
+	lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10,
+	mc0=\E[i, rev=\E[7m, ri=\E[T, rmul=\E[05,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;
 	    %?%p1%p3%|%t;7%;m,
-	sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u8=\E[5n, u9=\E[0n,
-	use=ansi+arrows, use=ansi+cpr, use=ansi+local1,
+	sgr0=\E(B\E[m, smul=\E[4m, u8=\E[5n, u9=\E[0n,
+	use=ansi+arrows, use=ansi+cpr, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso,
 
 # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official)
 # Data General 605x
@@ -16695,13 +17133,13 @@ d210|d214|Data General DASHER D210 series,
 	am, bw, msgr, xon,
 	cols#80, lines#24,
 	bel=^G, blink=\E[5m, bold=\E[4;7m, clear=\E[2J, cr=\r,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, ed=\E[J,
-	el=\E[K, el1=\E[1K, home=\E[H, ind=\n, is1=\E[<0;<1;<4l,
-	ll=\E[H\E[A, nel=\n, rev=\E[7m, rmso=\E[m, rmul=\E[m,
+	cub1=^H, dim=\E[2m, ed=\E[J, el=\E[K, el1=\E[1K, ind=\n,
+	is1=\E[<0;<1;<4l, ll=\E[H\E[A, nel=\n, rev=\E[7m,
+	rmso=\E[m,
 	sgr=\E[%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;%?%p1%p3%|
 	    %p6%|%t7;%;m,
-	sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=ansi+local,
-	use=dgkeys+7b,
+	sgr0=\E[m, smso=\E[2;7m, use=ansi+cup, use=ansi+local,
+	use=ansi+sgrul, use=dgkeys+7b,
 
 # DASHER D210 series terminals in DG mode.
 # Like D200, but adds clear to end-of-screen and needs XON/XOFF.
@@ -17174,9 +17612,9 @@ cs10|colorscan|Datamedia Color Scan 10,
 	cols#80, lines#24,
 	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
 	cup=\E[%i%p1%02d;%p2%02dH, cuu1=\E[A, ind=\n, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smso=\E[7m, smul=\E[4m, use=ansi+erase,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, sgr0=\E[m,
+	use=ansi+erase, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt100+pf1-pf4,
 
 cs10-w|Datamedia Color Scan 10 with 132 columns,
 	cols#132,
@@ -17260,8 +17698,8 @@ dm3045|Datamedia 3045a,
 dm80|dmdt80|dt80|Datamedia dt80/1,
 	clear=\E[2J\E[H, cuf1=\E[C, cup=%i\E[%p1%d;%p2%dH,
 	cuu1=\E[A, ed=\E[J, el=\E[K, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
-	ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m\017$<2>,
-	smso=\E[7m, smul=\E[4m, use=vt100+4bsd,
+	ri=\EM, sgr0=\E[m\017$<2>, use=ansi+sgrso,
+	use=ansi+sgrul, use=vt100+4bsd,
 # 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
@@ -17394,8 +17832,8 @@ f1720|f1720a|fluke 1720A,
 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H,
 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ind=\ED,
 	is2=\E[H\E[2J, kcub1=^_, kcud1=^], kcuf1=^^, kcuu1=^\,
-	ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m,
-	smul=\E[4m, use=ansi+local1,
+	ri=\EM, sgr0=\E[m, use=ansi+local1, use=ansi+sgrso,
+	use=ansi+sgrul,
 
 #### Liberty Electronics (Freedom)
 #
@@ -17429,7 +17867,7 @@ f100-rv|freedom-rv|Liberty Freedom 100 in reverse video,
 # code for the down cursor key. When kcud1 is defined in terminfo
 # as ^V, the Control Character Quoting capability (^V in insert mode)
 # 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!!!
+# a ^V to, to quote the ^V that is being remapped!!!
 #
 # f110/f200 users will have to decide whether
 # to lose the down cursor key or the quoting capability. We will opt
@@ -17498,15 +17936,14 @@ go140|graphon go-140,
 	OTbs,
 	cols#80, it#8, lines#24,
 	clear=\E[H\E[2J$<10/>, cub1=^H,
-	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dl1=\E[M,
-	ed=\E[J$<10/>, el=\E[K, ht=^I,
-	if=/usr/share/tabset/vt100, il1=\E[L,
+	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, ed=\E[J$<10/>,
+	el=\E[K, ht=^I, if=/usr/share/tabset/vt100,
 	is2=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, ri=\EM,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
-	rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+local1,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\E[H,
+	ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, sgr0=\E[m,
+	smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt100+pf1-pf4,
 
 go140w|graphon go-140 in 132 column mode,
 	am,
@@ -17520,16 +17957,15 @@ go225|go-225|Graphon 225,
 	OTbs, am, mir, xenl,
 	cols#80, it#8, lines#25, vt#3,
 	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
-	home=\E[H, ht=^I, il1=\E[L, ind=\ED,
-	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m,
+	cuu1=\E[A, dch1=\E[P, ht=^I, ind=\ED,
+	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, rev=\E[7m,
 	rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l,
 	rmcup=\E[!p\E[?7h\E[2;1;1#w, rmir=\E[4l, rmkx=\E>,
-	rmso=\E[27m, rmul=\E[24m, rs1=\E[!p\E[?7h\E[2;1;1#w,
-	sgr0=\E[m, smam=\E[?7h, smcup=\E[2;0#w\E[1;25r,
-	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	rs1=\E[!p\E[?7h\E[2;1;1#w, sgr0=\E[m, smam=\E[?7h,
+	smcup=\E[2;0#w\E[1;25r, smir=\E[4h, smkx=\E=,
+	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl1, use=vt100+pf1-pf4,
 
 #### Harris (Beehive)
 #
@@ -17734,7 +18170,7 @@ ha8686|Harris 8686,
 #
 # They're now (1998) a subsidiary of General Electric, operating under the
 # marque "GEC-Marconi Hazeltine" and doing military avionics.  Web page
-# at <http://www.gec.com/cpd/1ncpd.htm#1.55>.
+# at <https://web.archive.org/web/19990223214534/http://www.gec.com/cpd/1ncpd.htm#1.55>.
 #
 
 # Since <cuf1> is blank, when you want to erase something you
@@ -17859,13 +18295,12 @@ hazel|exec80|h80|he80|Hazeltine Executive 80,
 	cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>,
 	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
 	ht=^I, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, rev=\E[7m$<2/>,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m$<2/>,
 	rf=/usr/share/tabset/vt100, ri=\EM$<5/>,
 	rmkx=\E[?1l\E>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr0=\E[m$<2/>, smkx=\E[?1h\E=, smso=\E[7m$<2/>,
-	smul=\E[4m$<2/>, use=ansi+csr,
+	smul=\E[4m$<2/>, use=ansi+csr, use=vt100+pf1-pf4,
 
 #### IBM
 #
@@ -17946,26 +18381,26 @@ ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display,
 	cols#80, it#8, lines#25,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
-	dch1=\E[P, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%dG,
-	ind=\E[S, is2=\Ec, kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P,
-	ked=\E[148q, kel=\E[142q, kend=\E[146q, kf1=\E[001q,
-	kf10=\E[010q, kf11=\E[011q, kf12=\E[012q, kf13=\E[013q,
-	kf14=\E[014q, kf15=\E[015q, kf16=\E[016q, kf17=\E[017q,
-	kf18=\E[018q, kf19=\E[019q, kf2=\E[002q, kf20=\E[020q,
-	kf21=\E[021q, kf22=\E[022q, kf23=\E[023q, kf24=\E[024q,
-	kf25=\E[025q, kf26=\E[026q, kf27=\E[027q, kf28=\E[028q,
-	kf29=\E[029q, kf3=\E[003q, kf30=\E[030q, kf31=\E[031q,
-	kf32=\E[032q, kf33=\E[033q, kf34=\E[034q, kf35=\E[035q,
-	kf36=\E[036q, kf4=\E[004q, kf5=\E[005q, kf6=\E[006q,
-	kf7=\E[007q, kf8=\E[008q, kf9=\E[009q, kich1=\E[139q,
-	kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q,
-	kri=\E[155q, krmir=\E[4l, ri=\E[T, rmir=\E[4l, rs2=\Ec,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dch1=\E[P, ech=\E[%p1%dX,
+	hpa=\E[%i%p1%dG, ind=\E[S, is2=\Ec, kcbt=\E[Z,
+	kclr=\E[144q, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
+	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
+	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
+	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
+	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
+	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
+	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
+	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
+	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
+	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
+	kf9=\E[009q, kich1=\E[139q, kil1=\E[140q, kind=\E[151q,
+	knp=\E[154q, kpp=\E[150q, kri=\E[155q, krmir=\E[4l,
+	ri=\E[T, rmir=\E[4l, rs2=\Ec,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t;8%;m,
-	smir=\E[4h, use=ansi+arrows, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
-	use=ecma+index,
+	smir=\E[4h, use=ansi+arrows, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrbold, use=ecma+index,
 
 ibmaed|IBM Experimental display,
 	OTbs, am, eo, msgr,
@@ -18067,14 +18502,14 @@ hft-old|AIWS High Function Terminal,
 	am, xon,
 	cols#80, lines#25,
 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
-	dl1=\E[M, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+	cuf1=\E[C, cuu1=\E[A, dch1=\E[P, ht=^I, ich1=\E[@, ind=\n,
 	invis=\E[8m, kf1=\E[001q, kf2=\E[002q, kf3=\E[003q,
 	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
 	kf8=\E[008q, kf9=\E[009q, knp=\E[153q, kpp=\E[159q,
-	ktbc=\E[010q, rev=\E[7m, rmir=\E6, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smir=\E6, smso=\E[7m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+erase, use=ibm+color,
+	ktbc=\E[010q, rev=\E[7m, rmir=\E6, sgr0=\E[m, smir=\E6,
+	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl1, use=ansi+sgrso, use=ansi+sgrul,
+	use=ibm+color,
 
 ibm-system1|system1|IBM system/1 computer,
 	am, xt,
@@ -18092,9 +18527,8 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
 	bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	ech=\E[%p1%dX, ed=\E[2J, el=\E[0K, home=\E[H,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[2J,
+	el=\E[0K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
 	kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P, ked=\E[148q,
 	kel=\E[142q, kend=\E[146q, kf1=\E[001q, kf10=\E[010q,
 	kf11=\E[011q, kf12=\E[012q, kf13=\E[013q, kf14=\E[014q,
@@ -18112,8 +18546,8 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
 	smacs=\E(0, smir=\E[4h, tbc=\E[3g, use=ansi+arrows,
-	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
-	use=ecma+index,
+	use=ansi+cup, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrbold, use=ecma+index,
 
 # "Megapel" refers to the display adapter, which was used with the IBM RT
 # aka IBM 6150.
@@ -18135,8 +18569,8 @@ ibm8514-c|IBM 8514 color display with standout and underline,
 
 #
 # AIX entries.  IBM ships these with AIX 3.2.5.
-# -- added rc, sc based on manpage -TD
-# -- added rmacs, smacs based on manpage -TD
+# -- added rc, sc based on man page -TD
+# -- added rmacs, smacs based on man page -TD
 # Note that we could use ibm+16color, but that is not how IBM defines this one.
 aixterm|IBM Aixterm Terminal Emulator,
 	acsc=jjkkllmmnnqqttuuvvwwxx, bold=\E[1m, rc=\E8, ri@,
@@ -18192,8 +18626,8 @@ i400|Infoton 400,
 	cols#80, lines#25,
 	bel=^G, clear=\E[2J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
 	cup=\E[%i%p1%3d;%p2%3dH, cuu1=\E[A,
-	dch1=\E[4h\E[2Q\E[P\E[4l\E[0Q, dl1=\E[M, el=\E[N,
-	il1=\E[L, ind=\n, rmir=\E[4l\E[0Q, smir=\E[4h\E[2Q,
+	dch1=\E[4h\E[2Q\E[P\E[4l\E[0Q, el=\E[N, ind=\n,
+	rmir=\E[4l\E[0Q, smir=\E[4h\E[2Q, use=ansi+idl1,
 
 # (addrinfo: removed obsolete ":bc=^Z:" -- esr)
 addrinfo|cursor-addressable Infoton,
@@ -18518,17 +18952,16 @@ intext2|intextii|INTERACTIVE modified owl 1251,
 	am, bw, ul,
 	cols#80, lines#24, xmc#0,
 	bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
-	el=\E[K,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, ed=\E[J, el=\E[K,
 	flash=\E[;;;;;;;;;2;;u$<200/>\E[;;;;;;;;;1;;u,
-	hpa=\E[%p1%{1}%+%dG, ht=^I, ich1=\E[@, il1=\E[L, ind=\E[S,
-	kbs=^H, kcub1=\ED\r, kcud1=\EB\r, kcuf1=\EC\r, kcuu1=\EA\r,
+	hpa=\E[%p1%{1}%+%dG, ht=^I, ich1=\E[@, ind=\E[S, kbs=^H,
+	kcub1=\ED\r, kcud1=\EB\r, kcuf1=\EC\r, kcuu1=\EA\r,
 	kf0=\E@\r, kf1=\EP\r, kf2=\EQ\r, kf3=\ES\r, kf4=\ET\r,
 	kf5=\EU\r, kf6=\EV\r, kf7=\EW\r, kf8=\EX\r, kf9=\EY\r,
 	khome=\ER\r, lf0=REFRSH, lf1=DEL CH, lf2=TABSET, lf3=GOTO,
 	lf4=+PAGE, lf5=+SRCH, lf6=-PAGE, lf7=-SRCH, lf8=LEFT,
 	lf9=RIGHT, ri=\E[T, rmso=\E[2 D, rmul=\E[2 D, smso=\E[6 D,
-	smul=\E[18 D, use=ansi+local1,
+	smul=\E[18 D, use=ansi+idl1, use=ansi+local1,
 
 #### Kimtron (abm, kt)
 #
@@ -18816,25 +19249,22 @@ prism9|p9|P9|MDC Prism-9 in ANSI mode,
 	cols#80, lines#24, vt#3, wsl#72,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[<4l, clear=^L,
 	cnorm=\E[<4h, cr=\r, csr=\E[%i%p1%d;%p2%d%%v, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dsl=\E[%}\024, ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K,
-	fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, ind=\n,
-	is2=\E[&p\E[<12l\E F, kclr=^L, kf1=\E[11~, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, nel=\r\n, prot=\E[32%{,
-	rc=\E[%z, rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L,
-	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	cud1=\n, dch=\E[%p1%dP, dch1=\E[P, dsl=\E[%}\024,
+	ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K, fsl=^T,
+	hpa=\E[%i%p1%d`, ind=\n, is2=\E[&p\E[<12l\E F, kclr=^L,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+	kf17=\E[31~, kf18=\E[32~, nel=\r\n, prot=\E[32%{, rc=\E[%z,
+	rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L, rmir=\E[4l,
 	rs2=\E[&p\E[<12l\E\sF\E[3g\E[9;17;25;33;41;49;57;65;73
 	    \sN,
 	sc=\E[%y,
 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m%?
 	    %p8%t\E[32%%{%;%?%p9%t\016%e\017%;,
-	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp,
+	sgr0=\E[0m\017, smir=\E[4h, tsl=\E[%i%p1%d%%},
+	vpa=\E[%i%p1%dd, use=ecma+underline, use=ecma+standout,
+	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+	use=xterm+r5+fkeys,
 
 # p9-w: Prism-9 in 132 column mode
 # --------------------------------
@@ -19052,19 +19482,19 @@ mm340|mime340|mime 340,
 mt4520-rv|micro-term 4520 reverse video,
 	am, hs, msgr, xenl, xon,
 	cols#80, it#8, lines#24, wsl#80,
-	bel=^G, cnorm=\E[0V\E8, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	cvvis=\E7\E[0U, dch=\E[%p1%dP, dch1=\E[P,
-	flash=\E[?5l$<200/>\E[?5h, fsl=\E[?5l\E[?5h, home=\E[H,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\ED,
+	bel=^G, cnorm=\E[0V\E8, cr=\r, cvvis=\E7\E[0U,
+	dch=\E[%p1%dP, dch1=\E[P, flash=\E[?5l$<200/>\E[?5h,
+	fsl=\E[?5l\E[?5h, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\ED,
 	is2=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H
 	    \E[J,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ll=\E[24;1H, nel=\EE,
-	rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l,
-	rmso=\E[0m, rmul=\E[24m,
+	ll=\E[24;1H, nel=\EE, rf=/usr/share/tabset/vt100, ri=\EM,
+	rmam=\E[?7l, rmso=\E[0m,
 	rs1=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[H\E[J,
-	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[g,
-	tsl=\E[25;1H, use=ansi+arrows, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, tbc=\E[g, tsl=\E[25;1H,
+	use=ecma+underline, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=vt100+pf1-pf4,
 
 # Fri Aug  5 08:11:57 1983
 # This entry works for the ergo 4000 with the following setups:
@@ -19083,12 +19513,11 @@ ergo4000|microterm ergo 4000,
 	ed=\E[0J$<15>, el=\E[0K$<13>, ht=^I, il1=\E[1L$<5*>,
 	ind=\ED$<20*>,
 	is2=\E<\E=\E[?1l\E[?4l\E[?5l\E[?7h\E[?8h$<300>,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=pf1, lf2=pf2, lf3=pf3,
-	lf4=pf4, ri=\EM$<20*>, rmam=\E[?7l, rmir=\E[4l,
-	rmkx=\E=$<4>, rmso=\E[m$<20>, sgr0=\E[m$<20>,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, lf1=pf1,
+	lf2=pf2, lf3=pf3, lf4=pf4, ri=\EM$<20*>, rmam=\E[?7l,
+	rmir=\E[4l, rmkx=\E=$<4>, rmso=\E[m$<20>, sgr0=\E[m$<20>,
 	smam=\E[?7m, smir=\E[4h$<6>, smkx=\E=$<4>,
-	smso=\E[7m$<20>, use=ansi+local1,
+	smso=\E[7m$<20>, use=ansi+local1, use=vt100+pf1-pf4,
 
 #### NCR
 #
@@ -19252,17 +19681,13 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
 	    200>,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf0=\EOy, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
-	kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~,
-	kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, kf28=\E[3~,
-	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
-	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i,
-	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, ri=\EM$<5>,
-	rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m,
+	kf0=\EOy, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~,
+	kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~,
+	kf28=\E[3~, kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~,
+	kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~,
+	krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8,
+	ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l,
+	rmkx=\E[?1l\E>,
 	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
 	    200>,
 	sc=\E7,
@@ -19270,9 +19695,10 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
 	sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
 	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
-	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
+	vpa=\E[%p1%dd$<40>, use=ecma+underline,
+	use=ecma+standout, use=ansi+sgrbold, use=decid+cpr,
 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
-	use=ncr260vt+sl,
+	use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys,
 
 ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard,
 	cols#132,
@@ -19310,17 +19736,13 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1
 	    ;1H\E>$<200>,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf0=\EOy, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
-	kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~,
-	kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, kf28=\E[3~,
-	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
-	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i,
-	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, ri=\EM$<5>,
-	rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m,
+	kf0=\EOy, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~,
+	kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~,
+	kf28=\E[3~, kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~,
+	kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~,
+	krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8,
+	ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l,
+	rmkx=\E[?1l\E>,
 	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1
 	    ;1H\E>$<200>,
 	sc=\E7,
@@ -19328,9 +19750,10 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
 	sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
 	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
-	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
+	vpa=\E[%p1%dd$<40>, use=ecma+underline,
+	use=ecma+standout, use=ansi+sgrbold, use=decid+cpr,
 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
-	use=ncr260vt+sl,
+	use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys,
 
 ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard,
 	cols#132,
@@ -19380,16 +19803,14 @@ ncr260wy325pp|NCR 2900/260 Wyse 325,
 	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E"\Ee4\Ex@\E`9
 	    \Ee7$<100>,
 	kDC=\ER, kEND=\EY, kHOM=\E{, kNXT=\EK, kPRT=\E7, kPRV=\EJ,
-	kRIT=^L, ka1=^^, kb2=\EJ, kbs=^H, kc1=\ET, kc3=\EK, kcbt=\EI,
-	kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, kdch1=\EW, kend=\ET,
-	kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r,
-	kf14=^AM\r, kf15=^AN\r, kf16=^AO\r, kf17=^A`\r, kf18=^Aa\r,
-	kf19=^Ab\r, kf2=^AA\r, kf20=^Ac\r, kf21=^Ad\r, kf22=^Ae\r,
-	kf23=^Af\r, kf24=^Ag\r, kf25=^Ah\r, kf26=^Ai\r, kf27=^Aj\r,
-	kf28=^Ak\r, kf29=^Al\r, kf3=^AB\r, kf30=^Am\r, kf31=^An\r,
-	kf32=^Ao\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r,
-	kf8=^AG\r, kf9=^AH\r, khome=^^, kich1=\Eq, knp=\EK, kpp=\EJ,
-	kprt=\EP, mc0=\EP, mc4=^T, mc5=^R,
+	kRIT=^L, ka1=^^, kb2=\EJ, kc1=\ET, kc3=\EK, kcbt=\EI, kcub1=^H,
+	kcud1=\n, kcuf1=^L, kcuu1=^K, kdch1=\EW, kend=\ET,
+	kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, kf16=^AO\r,
+	kf17=^A`\r, kf18=^Aa\r, kf19=^Ab\r, kf20=^Ac\r, kf21=^Ad\r,
+	kf22=^Ae\r, kf23=^Af\r, kf24=^Ag\r, kf25=^Ah\r, kf26=^Ai\r,
+	kf27=^Aj\r, kf28=^Ak\r, kf29=^Al\r, kf30=^Am\r, kf31=^An\r,
+	kf32=^Ao\r, khome=^^, kich1=\Eq, knp=\EK, kpp=\EJ, kprt=\EP,
+	mc0=\EP, mc4=^T, mc5=^R,
 	mrcup=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c$<10>,
 	nel=\037$<5>, rev=\EG4, ri=\Ej$<5>, rmacs=\EH\003\EcB0,
 	rmam=\Ed., rmir=\Er, rmso=\EG0, rmul=\EG0, rmxon=\Ec20,
@@ -19404,7 +19825,8 @@ ncr260wy325pp|NCR 2900/260 Wyse 325,
 	     %t%{63}%e%p1%{15}%=%t%{56}%;\Edy%c11$<100>,
 	sgr0=\EG0\EcB0\EcD$<15>, smacs=\EH\002\EcB1, smam=\Ed/,
 	smir=\Eq, smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0,
-	use=ncr260vp+sl,
+	use=ncr260vp+sl, use=tvi920b+fn, use=ansi+arrows,
+	use=ansi+apparrows,
 ncr260wy325wpp|NCR 2900/260 Wyse 325 wide mode,
 	cols#132,
 	cup=\Ea%i%p1%dR%p2%dC$<30>,
@@ -19597,10 +20019,10 @@ ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal,
 	home=\E[H$<2>$<80>, il=\E[%p1%dL$<80>,
 	il1=\E[B\E[L$<80>, ind=\ED,
 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3l\E(B\E)0$<200>,
-	kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kent=\r, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, mc0=\E[i$<100>, nel=\EE, rc=\E8,
-	rev=\E[7m$<30>, ri=\EM$<50>, rmacs=\017$<90>,
-	rmir=\E[4l$<80>, rmso=\E[0m$<30>, rmul=\E[0m$<30>,
+	kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kent=\r, mc0=\E[i$<100>,
+	nel=\EE, rc=\E8, rev=\E[7m$<30>, ri=\EM$<50>,
+	rmacs=\017$<90>, rmir=\E[4l$<80>, rmso=\E[0m$<30>,
+	rmul=\E[0m$<30>,
 	rs2=\Ec\E[12;31h\E[?3;4;5;10l\E[?6;7;19;25h\E[33;34l\E[0m\E(
 	    B\E)0\E%/0n\E[P\031$<200>,
 	sc=\E7,
@@ -19609,6 +20031,7 @@ ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal,
 	sgr0=\017\E[0m$<120>, smacs=\016$<90>, smir=\E[4h$<80>,
 	smso=\E[7m$<30>, smul=\E[4m$<30>, tbc=\E[3g$<40>,
 	tsl=\E[>+1$<70>, use=decid+cpr, use=vt100+4bsd,
+	use=vt100+pf1-pf4,
 ncrvt100wan|NCRVT100WPP|ncrvt100wpp|NCR VT100 emulation of the 2900 terminal,
 	cols#132,
 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3h\E(B\E)0$<200>,
@@ -19857,17 +20280,16 @@ uts30|Sperry UTS30 with cp/m@1R1,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\ER, clear=^L,
 	cnorm=\ES, cr=\r, csr=\EU%p1%{32}%+%c%p2%{32}%+%c,
-	cub1=^H, cud1=\E[B, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dch1=\EM, dl=\E[%p1%dM, dl1=\EL, ed=\E[J, el=\E[K, fsl=\r,
-	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL,
+	cub1=^H, dch=\E[%p1%dP, dch1=\EM, dl=\E[%p1%dM, dl1=\EL,
+	fsl=\r, ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL,
 	il1=\EN, ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H,
 	khome=\E[H, rc=\EX, rev=\E[7m,
 	rf=/usr/share/tabset/vt100, ri=\EI, rin=\E[%p1%dA,
 	rmacs=\Ed, rmam=\E[?7l,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\EW,
 	sgr0=\E[m, smacs=\EF, smam=\E[?7m, tsl=\E], uc=\EPB,
-	use=ansi+apparrows, use=ansi+local, use=ansi+sgrso,
-	use=ansi+sgrul,
+	use=ansi+apparrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 
 #### Tandem
 #
@@ -19914,17 +20336,18 @@ dt100|dt-100|Tandy DT-100 terminal,
 	cols#80, lines#24, xmc#1,
 	acsc=jjkkllmmnnqqttuuvvwwxx, bel=^G, clear=\E[H\E[2J,
 	cr=\r, csr=\E[%p1%2d;%p2%2dr, cub1=^H,
-	cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
-	is2=\E[?3l\E)0\E(B, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kf1=\E[?3i, kf10=\E[?5i, kf2=\E[2i, kf3=\E[@,
-	kf4=\E[M, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
-	kf9=\E[21~, khome=\E[H, knp=\E[29~, kpp=\E[28~, lf1=f1,
-	lf2=f2, lf3=f3, lf4=f4, lf5=f5, lf6=f6, lf7=f7, lf8=f8, ri=\EM,
-	rmacs=^O, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smacs=^N,
-	smso=\E[7m, smul=\E[4m, use=ansi+local1, use=vt220+cvis,
+	cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[P, ed=\E[J, el=\E[K,
+	home=\E[H, ht=^I, ich1=\E[@, ind=\n, is2=\E[?3l\E)0\E(B,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[?3i,
+	kf10=\E[?5i, kf2=\E[2i, kf3=\E[@, kf4=\E[M, kf5=\E[17~,
+	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, khome=\E[H,
+	knp=\E[29~, kpp=\E[28~, lf1=f1, lf2=f2, lf3=f3, lf4=f4, lf5=f5,
+	lf6=f6, lf7=f7, lf8=f8, ri=\EM, rmacs=^O, sgr0=\E[m, smacs=^N,
+	use=ansi+idl1, use=ansi+local1, use=ansi+sgrso,
+	use=ansi+sgrul, use=vt220+cvis,
 dt100w|dt-100w|Tandy DT-100 terminal (wide mode),
 	cols#132, use=dt100,
+
 dt110|Tandy DT-110 emulating ANSI,
 	xon,
 	cols#80, lines#24,
@@ -19933,14 +20356,13 @@ dt110|Tandy DT-110 emulating ANSI,
 	cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[0P, dl1=\E[0M,
 	ed=\E[0J, el=\E[0K, enacs=\E(B\E)0, home=\E[H, ht=^I,
 	ich1=\E[0@, il1=\E[0L, ind=\n, is2=\E[?3l\E)0\E(B,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[K,
-	kf1=\E[1~, kf10=\E[10~, kf2=\E[2~, kf3=\E[3~, kf4=\E[4~,
-	kf5=\E[5~, kf6=\E[6~, kf7=\E[7~, kf8=\E[8~, kf9=\E[9~,
-	khome=\E[G, kich1=\E[@, knp=\E[26~, kpp=\E[25~, lf0=f1,
-	lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf8=f9,
-	lf9=f10, ri=\EM, rmacs=^O, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smacs=^N, smso=\E[7m, smul=\E[4m, use=ansi+local1,
-	use=vt220+cvis,
+	kend=\E[K, kf1=\E[1~, kf10=\E[10~, kf2=\E[2~, kf3=\E[3~,
+	kf4=\E[4~, kf5=\E[5~, kf6=\E[6~, kf7=\E[7~, kf8=\E[8~,
+	kf9=\E[9~, khome=\E[G, kich1=\E[@, knp=\E[26~, kpp=\E[25~,
+	lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8,
+	lf8=f9, lf9=f10, ri=\EM, rmacs=^O, sgr0=\E[m, smacs=^N,
+	use=ansi+cup, use=ansi+local1, use=ansi+sgrso,
+	use=ansi+sgrul, use=vt100+noapp, use=vt220+cvis,
 pt210|TRS-80 PT-210 printing terminal,
 	hc, os,
 	cols#80,
@@ -20085,6 +20507,7 @@ tek4025ex|4025ex|4027ex|Tektronix 4025 w/!,
 	is2=\037com\s33\r\n!sto\s9\,17\,25\,33\,41\,49\,57\,65\,73
 	    \r,
 	rmcup=\037com 33\r, smcup=!com 31\r, use=tek4025,
+
 tek4105|Tektronix 4105,
 	OTbs, am, mir, msgr, ul, xenl, xt,
 	cols#79, it#8, lines#29,
@@ -20136,22 +20559,22 @@ tek4105a|Tektronix 4105 (BRL),
 	OTkn#8, cols#80, lines#30, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
 	civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
-	cvvis=\E%!0\ETD70\E%!1, dch=\E[%p1%dP, dch1=\E[P,
-	ech=\E[%p1%dX, home=\E[H, ind=\n, is2=\E%!1, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
-	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
-	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
-	ll=\E[30;H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	cub1=^H, cud1=\n, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ind=\n, is2=\E%!1,
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
+	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
+	lf5=F6, lf6=F8, ll=\E[30;H, nel=\EE, rev=\E[7m, ri=\EM,
+	rmacs=^O, rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l,
+	rmkx=\E[?1l\E>,
 	rs2=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
 	    \ELI100\ELLA>\ELM0\EKE0\ENF1\EKS0\END0\E%!1\Ec\E[?3;5l
 	    \E[?7;8h\E[r\E[m\E>,
 	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
+	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ecma+index,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+	use=ecma+index,
 
 # Tektronix 4106/4107/4109 from BRL
 # The following setup modes are assumed for normal operation:
@@ -20179,22 +20602,22 @@ tek4106brl|tek4107brl|tek4109brl|Tektronix 4106 4107 or 4109,
 	cols#80, lines#32, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
 	civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
-	cvvis=\E%!0\ETD70\E%!1, dch=\E[%p1%dP, dch1=\E[P,
-	ech=\E[%p1%dX, home=\E[H, ind=\n, is2=\E%!1, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
-	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
-	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
-	ll=\E[32;H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	cub1=^H, cud1=\n, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ind=\n, is2=\E%!1,
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
+	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
+	lf5=F6, lf6=F8, ll=\E[32;H, nel=\EE, rev=\E[7m, ri=\EM,
+	rmacs=^O, rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l,
+	rmkx=\E[?1l\E>, rmso=\E[m,
 	rs1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
 	    \ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3
 	    ;5l\E[?7;8h\E[r\E[m\E>,
 	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ecma+index,
+	smkx=\E[?1h\E=, smso=\E[7;42m, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+sgrul,
+	use=ecma+index,
 
 # Refer to:
 # TEK Programmer's Reference
@@ -20263,14 +20686,15 @@ tek4112|tek4114|Tektronix 4110 series,
 	cols#80, lines#34,
 	cbt=\E[Z, clear=\E[2J\E[0;0H, cub1=^H, cud1=\E[B,
 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch1=\E[P,
-	dl1=\E[M, ed=\E[0J, el=\E[0K, ich1=\E[@, il1=\E[L,
-	ind=\E7\E[0;0H\E[M\E8, is2=\E3!1, ri=\E7\E[0;0H\E[L\E8,
-	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+	ed=\E[0J, el=\E[0K, ich1=\E[@, ind=\E7\E[0;0H\E[M\E8,
+	is2=\E3!1, ri=\E7\E[0;0H\E[L\E8, sgr0=\E[m,
+	use=ansi+idl1, use=ansi+sgrso, use=ansi+sgrul,
 tek4112-nd|Tektronix 4112 not in dialog area,
 	OTns,
 	cuu1=^K, use=tek4112,
 tek4112-5|Tektronix 4112 in 5 line dialog area,
 	lines#5, use=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
@@ -20305,16 +20729,15 @@ otek4115|Tektronix 4115 (old),
 	cols#80, it#8, lines#34,
 	cbt=\E[Z, clear=\E[H\E[2J,
 	cnorm=\E%!0\ELBG8\E%!1\E[34;1H,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E%!0\ELBB2\E%!1,
-	dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	if=/usr/share/tabset/vt100, il1=\E[L,
+	cvvis=\E%!0\ELBB2\E%!1, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I,
+	if=/usr/share/tabset/vt100,
 	is2=\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,
 	kbs=^H, ri=\EM, rmam=\E[?7l,
 	rmcup=\E%!0\ELBG8\E%!1\E[34;1H\E[J, rmir=\E[4l,
-	rmkx=\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h,
-	smcup=\E%!0\ELBB2\E%!1, smir=\E[4h, smkx=\E=, smso=\E[7m,
-	smul=\E[4m, use=ansi+local1,
+	rmkx=\E>, sgr0=\E[m, smam=\E[?7h, smcup=\E%!0\ELBB2\E%!1,
+	smir=\E[4h, smkx=\E=, use=ansi+cup, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
 tek4115|Tektronix 4115 entry with more ANSI capabilities (new),
 	am, xon,
 	cols#80, lines#34,
@@ -20350,17 +20773,16 @@ tek4207|Tektronix 4207 graphics terminal with memory,
 	am, bw, mir, msgr, ul, xenl,
 	cols#80, it#8, lines#32,
 	blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J$<156/>,
-	cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\EM, dch1=\E[P$<4/>, dl1=\E[M$<3/>, ed=\E[J,
-	el=\E[K$<5/>, home=\E[H, ht=^I, ich1=\E[@$<4/>,
-	il1=\E[L$<3/>, ind=\E[S, invis=\E[=6;<5,
+	cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\EM, dch1=\E[P$<4/>,
+	dl1=\E[M$<3/>, ed=\E[J, el=\E[K$<5/>, ht=^I,
+	ich1=\E[@$<4/>, il1=\E[L$<3/>, ind=\E[S, invis=\E[=6;<5,
 	is2=\E%!0\ELBP0\E%!1\E[H\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8
 	    C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J,
 	kcub1=\E[D, kcud1=\ED, kcuf1=\E[C, kcuu1=\EM, khome=\E[H,
 	rev=\E[7m, ri=\E[T,
-	rmcup=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f, rmso=\E[m,
-	rmul=\E[m, sgr0=\E[m, smcup=\E[?6l\E[H\E[J, smso=\E[7m,
-	smul=\E[4m, tbc=\E[1g,
+	rmcup=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f, sgr0=\E[m,
+	smcup=\E[?6l\E[H\E[J, tbc=\E[1g, use=ansi+cup,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 # From: <carolyn@dali.berkeley.edu>  Thu Oct 31 12:54:27 1985
 # (tek4404: There was a "\!" in <smcup> that I replaced with "\E!".
@@ -20369,13 +20791,13 @@ tek4404|Tektronix 4404,
 	OTbs,
 	cols#80, it#8, lines#32,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
-	dl1=\E[1M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\E[2I,
-	il1=\E[1L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	rmcup=\E[1;1H\E[0J\E[?6h\E[?1l, rmir=\E[4l,
-	rmkx=\E[?1h, rmso=\E[27m, rmul=\E[m, sgr0=\E[m,
+	cuf1=\E[C, cuu1=\E[A, dch1=\E[P, dl1=\E[1M, ed=\E[J, el=\E[K,
+	ht=^I, hts=\E[2I, il1=\E[1L, kcub1=\E[D, kcud1=\E[B,
+	kcuf1=\E[C, kcuu1=\E[A, rmcup=\E[1;1H\E[0J\E[?6h\E[?1l,
+	rmir=\E[4l, rmkx=\E[?1h, sgr0=\E[m,
 	smcup=\E%\E!1\E[1;32r\E[?6l\E>, smir=\E[4h,
-	smkx=\E[?1l, smso=\E[7m, smul=\E[4m, use=ansi+csr,
+	smkx=\E[?1l, use=ecma+standout, use=ansi+csr,
+	use=ansi+cup, use=ansi+sgrul,
 
 # Some unknown person wrote:
 # I added the is string - straight Unix has ESC ; in the login
@@ -20409,11 +20831,10 @@ tek4205|Tektronix 4205,
 	colors#8, cols#80, it#8, lines#30, ncv#49, pairs#63,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[=7;<4m, cbt=\E[Z,
-	clear=\E[2J\E[H, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	dch1=\E[1P, dim=\E[=1;<6m, dl=\E[%p1%dM, dl1=\E[1M,
-	ech=\E%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
-	home=\E[H, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L,
-	ind=\ED,
+	clear=\E[2J\E[H, cr=\r, dch1=\E[1P, dim=\E[=1;<6m,
+	dl=\E[%p1%dM, dl1=\E[1M, ech=\E%p1%dX, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=\E)0, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL,
+	il1=\E[1L, ind=\ED,
 	initc=\E%%!0\ETF4%?%p1%{0}%=%t0%e%p1%{1}%=%t4%e%p1%{2}%=%t3
 	      %e%p1%{3}%=%t5%e%p1%{4}%=%t2%e%p1%{5}%=%t6%e%p1%{6}%=
 	      %t7%e1%;%?%p2%{125}%<%t0%e%p2%{250}%<%tA2%e%p2%{375}%<
@@ -20431,7 +20852,7 @@ tek4205|Tektronix 4205,
 	oc=\E%!0\ETFB000001F4F4F42F40030F404A4C<F450F4F46F40F47F4F40
 	   \E%!1,
 	op=\E[39;40m, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=,
-	rmir=\E[4l, rmso=\E[=0;<1m, rmul=\E[24m,
+	rmir=\E[4l, rmso=\E[=0;<1m,
 	setb=\E[=%?%p1%{0}%=%t0m%e%p1%{1}%=%t4m%e%p1%{2}%=%t3m%e%p1
 	     %{3}%=%t5m%e%p1%{4}%=%t2m%e%p1%{5}%=%t6m%e%p1%{6}%=%t7m
 	     %e1m%;,
@@ -20440,7 +20861,8 @@ tek4205|Tektronix 4205,
 	     %e1m%;,
 	sgr0=\E[=0;<1m\E[24;25;27m\017, smacs=^N,
 	smcup=\E%%!1\E[?6l\E[2J, smir=\E[4h, smso=\E[=2;<3m,
-	smul=\E[4m, tbc=\E[1g, use=ansi+local,
+	smul=\E[4m, tbc=\E[1g, use=ecma+underline, use=ansi+cup,
+	use=ansi+local,
 
 #### Teletype (tty)
 #
@@ -20587,18 +21009,16 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX,
 	cols#80, it#8, lines#24,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, clear=\Ec, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H,
-	hpa=\E[%i%p1%dG, ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB,
-	invis=\E[30;40m, kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240,
-	kf10=\251, kf2=\241, kf3=\242, kf4=\243, kf5=\244, kf6=\245,
-	kf7=\246, kf8=\247, kf9=\250, kich1=\E[^H, knp=\E[U,
-	kpp=\E[V, ll=\E[24;1H, nel=\r, rev=\E[7m, ri=\E[T\E[A,
-	rin=\E[%p1%dT\E[%p1%dA,
+	bel=^G, clear=\Ec, cr=\r, ech=\E[%p1%dX, hpa=\E[%i%p1%dG,
+	ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m,
+	kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241,
+	kf3=\242, kf4=\243, kf5=\244, kf6=\245, kf7=\246, kf8=\247,
+	kf9=\250, kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H,
+	nel=\r, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t30;40%;m,
-	sgr0=\E[m, use=ansi+arrows, use=ansi+local,
-	use=ansi+sgrbold,
+	sgr0=\E[m, use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+local, use=ansi+sgrbold,
 
 #### Apple II
 #
@@ -20770,12 +21190,11 @@ lisa|Apple Lisa console display (black on white),
 	OTbs, am, eo, msgr,
 	cols#88, it#8, lines#32,
 	acsc=jdkclfmenbqattuvvuwsx`, civis=\E[5h, clear=^L,
-	cnorm=\E[5l, cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P,
-	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@,
-	il1=\E[L, is2=\E>\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, rmacs=\E[10m, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smacs=\E[11m, smso=\E[7m, smul=\E[4m,
-	use=ansi+local1,
+	cnorm=\E[5l, cub1=^H, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I,
+	ich1=\E[@, is2=\E>\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+	kcuf1=\E[C, kcuu1=\E[A, rmacs=\E[10m, sgr0=\E[m,
+	smacs=\E[11m, use=ansi+cup, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
 liswb|Apple Lisa console display (white on black),
 	is2=\E>\E[0;7m\014, rmso=\E[0;7m, rmul=\E[0;7m,
 	smso=\E[m, smul=\E[4m, use=lisa,
@@ -20795,14 +21214,14 @@ lisaterm|Apple Lisa or Lisa/2 running LisaTerm VT100 emulation,
 	OTbs, OTpt, am, xenl, xon,
 	OTkn#4, cols#80, it#8, lines#24, vt#3,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
-	home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP, kf1=\EOQ,
-	kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, rev=\E[7m,
-	ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	cub1=^H, cud1=\n, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ind=\n,
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3,
+	lf3=F4, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
 	rs1=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r,
-	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, use=ansi+csr, use=ansi+local,
+	sgr0=\E[m, smkx=\E[?1h\E=, tbc=\E[3g, use=ansi+csr,
+	use=ansi+cup, use=ansi+local, use=ansi+sgrso,
+	use=ansi+sgrul,
 
 # Lisaterm in 132 column ("wide") mode.
 lisaterm-w|Apple Lisa with Lisaterm in 132 column mode,
@@ -20894,15 +21313,14 @@ amiga|Amiga ANSI,
 	OTbs, am, bw, xenl,
 	cols#80, lines#24,
 	acsc=, bel=^G, blink=\E[7;2m, bold=\E[1m, cbt=\E[Z,
-	civis=\E[0 p, cnorm=\E[ p, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, home=\E[H,
-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
+	civis=\E[0 p, cnorm=\E[ p, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
 	is2=\E[20l, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
 	kcuu1=\E[A, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~, kf3=\E[2~,
 	kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~, kf8=\E[7~,
-	kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O, rmso=\E[m,
-	rmul=\E[m, rs1=\Ec, sgr0=\E[m, smacs=^N, smso=\E[7m,
-	smul=\E[4m, use=ansi+erase, use=ansi+idl, use=ansi+local,
+	kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O, rs1=\Ec, sgr0=\E[m,
+	smacs=^N, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 	use=ecma+index,
 
 # From: Hans Verkuil <hans@wyst.hobby.nl>, 4 Dec 1995
@@ -20957,13 +21375,14 @@ amiga-vnc|Amiga using VNC console (black on light gray),
 	kf8=\E[7~, kf9=\E[8~, khlp=\E[?~, khome=\E[44~, kll=\E[45~,
 	kmous=\E[M, knp=\E[42~, kpp=\E[41~, nel=\EE, oc=\E[0m,
 	rev=\E[7m, ri=\EM, rmcup=\E[?7h\E[r\E[J, rmkx=\E[?1l,
-	rmso=\E[21m, rmul=\E[24m, rs1=\Ec,
+	rmso=\E[21m, rs1=\Ec,
 	rs2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h,
 	setab=\E[%?%p1%{8}%>%t%'F'%p1%+%d%e4%p1%d%;m,
 	setaf=\E[%?%p1%{8}%>%t%'2'%p1%+%d%e3%p1%d%;m,
 	sgr0=\E[0m\017\E[30;85;>15m, smcup=\E[?7h, smkx=\E[?1h,
-	smso=\E[1m, smul=\E[4m, use=ansi+arrows, use=ansi+erase,
-	use=ansi+local, use=ecma+index,
+	smso=\E[1m, smul=\E[4m, use=ecma+underline,
+	use=ansi+arrows, use=ansi+erase, use=ansi+local,
+	use=ecma+index,
 
 # MorphOS on Genesi Pegasos
 # By Pavel Fedin <sonic_amiga@rambler.ru>
@@ -21068,24 +21487,22 @@ osexec|Osborne executive,
 # See
 #	https://web.archive.org/web/20120703021949/http://www.minix3.org/manpages/html4/console.html
 minix|minix console (v3),
-	NQ,
 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
 	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
 	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
-	kdch1=^?, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
+	kdch1=^?, kend=\E[Y, kf0=\E[21~, kf10=\E[21~,
 	kf11=\E[11;2~, kf12=\E[12;2~, kf13=\E[13;2~,
 	kf14=\E[14;2~, kf15=\E[15;2~, kf16=\E[17;2~,
-	kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf2=\E[12~,
+	kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~,
 	kf20=\E[21;2~, kf21=\E[11;5~, kf22=\E[12;5~,
 	kf23=\E[13;5~, kf24=\E[14;5~, kf25=\E[15;5~,
 	kf26=\E[17;5~, kf27=\E[18;5~, kf28=\E[19;5~,
-	kf29=\E[20;5~, kf3=\E[13~, kf30=\E[21;5~, kf31=\E[11;6~,
+	kf29=\E[20;5~, kf30=\E[21;5~, kf31=\E[11;6~,
 	kf32=\E[12;6~, kf33=\E[13;6~, kf34=\E[14;6~,
 	kf35=\E[15;6~, kf36=\E[17;6~, kf37=\E[18;6~,
-	kf38=\E[19;6~, kf39=\E[20;6~, kf4=\E[14~, kf40=\E[21;6~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	kich1=\E[@, knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@,
-	use=minix-3.0,
+	kf38=\E[19;6~, kf39=\E[20;6~, kf40=\E[21;6~, kich1=\E[@,
+	knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@,
+	use=xterm+r5+fkeys, use=minix-3.0,
 
 minix-3.0|minix console (v3.0),
 	use=ecma+color, use=minix-1.7,
@@ -21102,12 +21519,12 @@ minix-old|minix-1.5|minix console (v1.5),
 	xon, NQ,
 	cols#80, it#8, lines#25,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[0J, cr=\r,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	ed=\E[0J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@,
-	ich1=\E[@, ind=\n, kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T,
-	kf4=\E[S, kf5=\E[G, nel=\r\n, rev=\E[7m, ri=\EM, rmso=\E[0m,
-	rmul=\E[0m, sgr0=\E[0m, smso=\E[7m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+idl, use=ansi+local,
+	cub1=^H, dch=\E[%p1%dP, dch1=\E[P, ed=\E[0J, el=\E[K, ht=^I,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\n, kf0=\E[Y, kf1=\E[V,
+	kf2=\E[U, kf3=\E[T, kf4=\E[S, kf5=\E[G, nel=\r\n, rev=\E[7m,
+	ri=\EM, rmso=\E[0m, rmul=\E[0m, sgr0=\E[0m, smso=\E[7m,
+	smul=\E[4m, use=ansi+arrows, use=ansi+cup, use=ansi+idl,
+	use=ansi+local,
 
 # The linewrap option can be specified by editing /usr/include/minix/config.h
 # before recompiling the minix 1.5 kernel.
@@ -21161,15 +21578,14 @@ mai|basic4|MAI Basic Four in ANSI mode,
 	cols#82, it#8, lines#25,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=^]^_, cnorm=\E[?7h,
 	cr=\r, cub1=^H, cud1=\n, cuf1=^X, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=^Z, cvvis=\E[?7l, dch1=\E[1P, dl1=\E[M, ed=^_, el=^^,
-	home=^], ht=^I, if=/usr/share/tabset/vt100, il1=\E[L,
-	ind=\ED,
+	cuu1=^Z, cvvis=\E[?7l, dch1=\E[1P, ed=^_, el=^^, home=^],
+	ht=^I, if=/usr/share/tabset/vt100, ind=\ED,
 	is2=\E>\E[?1h\E[?7h\E[?5l\017\E(B\E[m\E[20l\E[1;24r\E[24;1H,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
-	kf7=\EOV, kf8=\EOW, nel=\r\ED, rev=\E[7m, ri=\E[T,
-	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smir=\E[4h,
-	smso=\E[7m, smul=\E[4m, use=ansi+csr,
+	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, nel=\r\ED, rev=\E[7m,
+	ri=\E[T, rmir=\E[4l, sgr0=\E[m, smir=\E[4h, use=ansi+csr,
+	use=ansi+idl1, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt100+pf1-pf4,
 
 # basis from Peter Harrison, Computer Graphics Lab, San Francisco
 #   ucbvax!ucsfmis!harrison ...uucp / ucbvax!ucsfmis!harrison@BERKELEY ...ARPA
@@ -21221,18 +21637,17 @@ m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel 2 mode te'le'infor
 	cols#80, it#8, lines#24, wsl#72, xmc#0,
 	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx, bel=^G,
 	blink=\E[5m, bold=\E[1m, civis=\E[<1h, cnorm=\E[<1l, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	flash=^G, fsl=\n, home=\E[H, ht=^I, ind=\n, ip=$<7/>,
-	is1=\E:1}\Ec\E[?4l\E[12h, is2=\Ec\E[12h\E)0,
+	dch=\E[%p1%dP, dch1=\E[P, flash=^G, fsl=\n, ht=^I, ind=\n,
+	ip=$<7/>, is1=\E:1}\Ec\E[?4l\E[12h, is2=\Ec\E[12h\E)0,
 	is3=\E[?3l, kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kf0=\EOp,
 	kf1=\EOq, kf10=\EOp, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
 	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, kich1=\E[4h,
 	kil1=\E[4l, knp=\EOn, kpp=\EOR, ll=\E[24;80H, mc0=\E[i,
 	nel=\r\n, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E[?4l\E[12h,
-	rs2=\Ec\E)0, sgr0=\E[m, smacs=^N, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tsl=^_@A, use=ansi+arrows, use=ansi+cpr,
-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	rs1=\Ec\E[?4l\E[12h, rs2=\Ec\E)0, sgr0=\E[m, smacs=^N,
+	smir=\E[4h, tsl=^_@A, use=ecma+underline,
+	use=ecma+standout, use=ansi+arrows, use=ansi+cpr,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
 	use=ansi+local,
 
 # From: Alexandre Montaron <canal@mygale.org>, 18 Jun 1998, updated 19 Sep 2016
@@ -21310,15 +21725,13 @@ minitel1b-80|minitel 1-bistandard (standard teleinformatique),
 	kf22=\EOP#, kf23@, kf24@, kf3=\EOs, kf4=\EOt, kf5=\EOu,
 	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khlp=\EOm, knp=\EOn,
 	kpp=\EOR, krfr=\EOS, lf1@, lf2@, lf3@, lf4@, lf5@, lf6@, nel=\EE,
-	op@, rc=\E8, rep@, rev=\E[7m, ri=\EM, rmkx@, rmso=\E[27m,
-	rmul=\E[24m,
+	op@, rc=\E8, rep@, rev=\E[7m, ri=\EM, rmkx@,
 	rs2=\036\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[
 	    H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M
 	    \E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2
 	    M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[
 	    2M\E[H\E[J\E[m,
 	sc=\E7, setab@, setaf@, setb@, setf@, sgr@, sgr0=\E[m, smkx@,
-	smso=\E[7m, smul=\E[4m,
 	tsl=\037@%?%p1%{63}%<%t%p1%'A'%+%c%e\177%p1%{62}%-%Pa%?%ga
 	    %{1}%&%t\011%;%?%ga%{2}%&%t\011\011%;%?%ga%{4}%&%t\011
 	    \011\011\011%;%?%ga%{07}%>%t\011\011\011\011\011\011
@@ -21339,7 +21752,7 @@ minitel1b-80|minitel 1-bistandard (standard teleinformatique),
 	   \365o\,\366o\,\372u\,\373u\,\374u\,\375y\,\377y\,\267.\,
 	   \327x\,\367/\,\261\E7\E[4m+\E8\E[C\,\,0\017%\016\,x|\,y
 	   \E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8\E[C,
-	use=minitel1b,
+	use=ecma+underline, use=ecma+standout, use=minitel1b,
 
 minitel1-nb|minitel 1 (40cols) noir & blanc sans couleurs avec bold et dim ...,
 	colors@, pairs@,
@@ -21455,8 +21868,8 @@ screen.minitel1b|Screen specific for minitel1b,
 screen.minitel1b-80|screen.minitel2-80|screen.minitel12-80|Screen specific for minitel1b-80 minitel2-80 and minitel12-80,
 	colors@, ncv@, pairs@,
 	bold=\E[1m, kent=\EOM, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@,
-	kf19@, kf20@, kf21@, kf22@, kf23@, kf24@, khlp=\EOm, op@,
-	rmul=\E[24m, setab@, setaf@, setb@, setf@, smul=\E[4m,
+	kf19@, kf20@, kf21@, kf22@, kf23@, kf24@, khlp=\EOm, op@, setab@,
+	setaf@, setb@, setf@, use=ecma+underline,
 	use=screen.minitel1b,
 
 screen.minitel1-nb|Screen specific for minitel1-nb,
@@ -21472,7 +21885,7 @@ screen.minitel1b-nb|Screen specific for minitel1b-nb,
 # From: Alexandre Montaron, 29 Sep 2016
 
 linux-m1|Linux Minitel 1 "like" Couleurs,
-	am, bw@, ccc, mir, msgr, xenl,
+	am, ccc, mir, msgr, xenl,
 	it#8, ncv#16,
 	acsc=a\261f\370g\361h\260j\274k\273l\311m\310n\316q\315t
 	     \314u\271v\312w\313x\272y\363z\362{\343|\252~\372,
@@ -21484,20 +21897,14 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	      %{255}%&%02X,
 	is2=\E]R\E]P3FFFF80\E[?8c, ka1=\EOw, ka3=\EOy, kb2=\E[G,
 	kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E\r,
-	kdl1=\E\E[A, kent=\EOM, kf1=\E[[A, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D,
-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, kil1=\E\E[B, kmous=\E[M, nel=\EE,
-	oc=\E]R\E]P3FFFF80, op=\E[39;49m, rev=\E[7m, ri=\EM,
-	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmpch=\E[10m,
-	rmso=\E[27m, rs1=\Ec, rs3=\E[37;40m\E[8], sgr0=\E[m,
-	smacs=^N, smam=\E[?7h, smir=\E[4h, smpch=\E[11m,
-	smso=\E[7m, tbc=\E[3g, vpa=\E[%i%p1%dd, .VN=\E[?5l,
-	.VR=\E[?5h, .am@, .ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H,
-	.rmcup=, .rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c,
-	.smul=\E[4m,
+	kdl1=\E\E[A, kent=\EOM, khome=\E[1~, kil1=\E\E[B,
+	kmous=\E[M, nel=\EE, oc=\E]R\E]P3FFFF80, op=\E[39;49m,
+	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
+	rmpch=\E[10m, rs1=\Ec, rs3=\E[37;40m\E[8], sgr0=\E[m,
+	smacs=^N, smam=\E[?7h, smir=\E[4h, smpch=\E[11m, tbc=\E[3g,
+	.VN=\E[?5l, .VR=\E[?5h, .am@, .ich=\E[%p1%d@, .ich1=\E[@,
+	.ll=\E[99H, .rmcup=, .smcup=\E]R\E]P3FFFF80\E[?8c,
+	.smul=\E[4m, .use=ecma+underline,
 	E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
@@ -21506,10 +21913,12 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
 	   \n\n\n\n\n\n\n\n\n\n,
-	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=ansi+local1,
-	use=klone+color, use=vt220+pcedit, use=vt220+cvis,
-	use=linux+decid,
+	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local1, use=ansi+rca2, use=ansi+sgrso,
+	use=klone+color, use=linux+decid, use=linux+lockeys,
+	use=vt220+pcedit, use=vt220+cvis, use=vt220+sfkeys,
+	use=vt220+ufkeys,
 
 # 1. Using double-shapes for VT100 graphical chars (eg: mc).
 # 2. Native brown color corrected to good yellow color.
@@ -21566,9 +21975,7 @@ linux-s|Linux console with added status line at bottom,
 
 screen.linux-m1|Linux m1 specific for screen,
 	ncv@,
-	kclr=\E\r, kdl1=\E\E[A, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf20=\E[34~, kil1=\E\E[B, rmul@, smul@,
+	kclr=\E\r, kdl1=\E\E[A, kil1=\E\E[B, rmul@, smul@,
 	u8=\E[?1;2c,
 	E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
@@ -21579,6 +21986,7 @@ screen.linux-m1|Linux m1 specific for screen,
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
 	   \n\n\n\n\n\n\n\n\n\n,
 	use=decid+cpr, use=xterm+x11mouse, use=screen,
+	use=vt220+sfkeys,
 
 screen.linux-m1b|Linux m1b specific for screen,
 	colors@, pairs@,
@@ -21592,33 +22000,33 @@ screen.linux-m2|Linux m2 specific for screen,
 # Putty :
 
 putty-m1|Putty Minitel 1 "like" Couleurs,
-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
-	use=ecma+index, use=linux-m1,
+	dim@, .E3=\E[300S, use=ecma+underline,
+	use=xterm+r5+lockeys, use=xterm+alt47,
+	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+	use=linux-m1,
 
 putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
-	use=ecma+index, use=linux-m1b,
+	dim@, .E3=\E[300S, use=ecma+underline,
+	use=xterm+r5+lockeys, use=xterm+alt47,
+	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+	use=linux-m1b,
 
 putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
 	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
 	     {||}}~~,
-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
-	use=ecma+index, use=linux-m2,
+	dim@, .E3=\E[300S, use=ecma+underline,
+	use=xterm+r5+lockeys, use=xterm+alt47,
+	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+	use=linux-m2,
 
 putty+screen|PuTTY with screen resizing extensions (building-block),
 	.WS=\E[8;%p1%d;%p2%dt, Z0=\E[?3h, Z1=\E[?3l,
 
 putty-screen|PuTTY with screen resizing extensions,
-	WS=\E[8;%p1%d;%p2%dt, Z0=\E[?3h, Z1=\E[?3l, use=putty,
+	WS=\E[8;%p1%d;%p2%dt, use=putty+screen, use=putty,
 
 screen.putty-m1|Putty m1 specific for screen,
-	dim@, rmul=\E[24m, smul=\E[4m, E3@, use=screen.linux-m1,
+	dim@, E3@, use=ecma+underline, use=screen.linux-m1,
 
 screen.putty-m1b|Putty m1b specific for screen,
 	colors@, pairs@,
@@ -21780,10 +22188,10 @@ bg2.0|bg3.10|BBN BitGraph 2.0 or later (no init),
 	bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H,
 	cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>,
 	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=PF1, lf2=PF2, lf3=PF3,
-	lf4=PF4, rmkx=\E>, rmso=\E[m, sgr0=\E[m, smkx=\E=,
-	smso=\E[7m, use=ansi+csr, use=ansi+local1,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, lf1=PF1,
+	lf2=PF2, lf3=PF3, lf4=PF4, rmkx=\E>, sgr0=\E[m, smkx=\E=,
+	use=ansi+csr, use=ansi+local1, use=ansi+sgrso,
+	use=vt100+pf1-pf4,
 
 bg1.25rv|BBN BitGraph 1.25 (reverse video),
 	flash=\E[?5l$<200/>\E[?5h, is2=\E>\E[?5h\E[?7h,
@@ -21798,8 +22206,8 @@ bg1.25|BBN BitGraph 1.25,
 	cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>,
 	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>, kf1=\EP,
 	kf2=\EQ, kf3=\ER, kf4=\ES, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4,
-	ll=\E[64;1H, rmam=\E[?7l, rmkx=\E>, rmso=\E[m, sgr0=\E[m,
-	smam=\E[?7h, smkx=\E=, smso=\E[7m, use=ansi+local1,
+	ll=\E[64;1H, rmam=\E[?7l, rmkx=\E>, sgr0=\E[m, smam=\E[?7h,
+	smkx=\E=, use=ansi+local1, use=ansi+sgrso,
 	use=vt52+arrows,
 
 #### Bull (bq, dku, vip)
@@ -21870,14 +22278,14 @@ bg1.25|BBN BitGraph 1.25,
 # This entry covers the following terminals:
 # dku7102, tws2102, and tws models 2105 to 2112
 tws-generic|dku7102|Bull Questar tws terminals,
-	am, eslok, hs, mir, msgr, xenl, xhp@, xon,
+	am, mir, msgr, xenl, xhp@, xon,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggj)k\,l&m#n/ooppq*rrsst'u-v+w.x%yyzz{{||}}~~,
 	bel=^G, blink=\E[0;5m, civis=\E[1r, clear=\E[2J,
 	cnorm=\E[r, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%df,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[0;2m,
-	dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v, fsl=\E[v,
-	home=\E[H, ht=\E[I, ind=\n, invis=\E[0;8m,
+	dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v, fsl=\E[v, ht=\E[I,
+	ind=\n, invis=\E[0;8m,
 	is1=\E[?=h\Ec\E`\E[?>h\EPY99:98\E\\,
 	is2=\E[5;>;12;18;?<l\E[=h\EP1s\E\\\E[\027p,
 	is3=\Eb\E[?<h, kcbt=\E[Z, kctab=\E[g, kdch1=\E[P,
@@ -21893,8 +22301,9 @@ tws-generic|dku7102|Bull Questar tws terminals,
 	sgr0=\E[m\017, smacs=^N, smcup=\E[?>h\EPY99:98\E\\,
 	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m,
 	tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows,
-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ansi+sgrdim,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+sgrdim,
+	use=dec+sl,
 
 tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA,
 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
@@ -22000,23 +22409,21 @@ bq300|Bull VT320 ISO Latin 1 80 columns terminal,
 	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
 	    l,
 	is3=\E[0$}\E[?25h\E[2l\E[H\E[J, ka1=\EOw, ka3=\EOy,
-	kb2=\EOu, kc1=\EOq, kc3=\EOs, kf1=\EOP, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
-	nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
-	rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
+	kb2=\EOu, kc1=\EOq, kc3=\EOs, khlp=\E[28~, krdo=\E[29~,
+	lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM,
+	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l,
+	rmkx=\E[?1l\E>, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B,
+	s1ds=\E(0,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;m%?%p9%t\E(0%e\E(B%;,
 	sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h,
-	smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr,
+	smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smul=\E[4m,
+	tsl=\E[1$}\E[2$~, use=ecma+underline,
+	use=ecma+standout, use=ansi+enq, use=ansi+csr,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+pp, use=dec+sl, use=vt100+4bsd, use=vt220+cvis,
-	use=vt220+vtedit,
+	use=ansi+pp, use=dec+sl, use=vt100+4bsd,
+	use=vt100+pf1-pf4, use=vt220+cvis, use=vt220+vtedit,
+	use=vt220+sfkeys, use=vt220+ufkeys,
 
 bq300-rv|Bull VT320 reverse 80 columns,
 	flash=\E[?5l$<50>\E[?5h,
@@ -22469,11 +22876,10 @@ gigi|vk100|DEC gigi graphics terminal,
 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ht=^I, ind=\n,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?20l\E[?7h\E[?8h,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, ri=\EM,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7;31m,
-	smul=\E[4m, use=ansi+local,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\E[H,
+	ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, sgr0=\E[m,
+	smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7;31m,
+	use=ansi+local, use=ansi+sgrul, use=vt100+pf1-pf4,
 
 # 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,
@@ -22534,8 +22940,7 @@ ln03|DEC ln03 laser printer,
 	hc,
 	cols#80, lines#66,
 	bel=^G, cr=\r, cud1=\n, hd=\EK, ht=^I, hu=\EL, ind=\n, nel=\r\n,
-	rmso=\E[22m, rmul=\E[24m, sgr0=\E[m, smso=\E[1m,
-	smul=\E[4m,
+	rmso=\E[22m, sgr0=\E[m, smso=\E[1m, use=ecma+underline,
 ln03-w|DEC ln03 laser printer 132 cols,
 	cols#132,
 	kbs=^H, kcub1=^H, kcud1=\n, use=ln03,
@@ -22567,13 +22972,13 @@ ddr|rebus3180|ddr3180|Rebus/DDR 3180 VT100 emulator,
 	cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>,
 	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I,
 	ind=\ED$<5/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, rev=\E[7m$<2/>,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rev=\E[7m$<2/>,
 	rf=/usr/share/tabset/vt100, ri=\EM$<5/>, rmam=\E[7l,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m$<2/>,
+	rmkx=\E[?1l\E>, rmul=\E[m$<2/>,
 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
-	sgr0=\E[m$<2/>, smam=\E[7l, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m$<2/>, use=ansi+csr,
+	sgr0=\E[m$<2/>, smam=\E[7l, smkx=\E[?1h\E=,
+	smul=\E[4m$<2/>, use=ansi+csr, use=ansi+sgrso,
+	use=vt100+pf1-pf4,
 
 #### Evans & Sutherland
 #
@@ -22644,15 +23049,16 @@ h19-a|h19a|heath-ansi|heathkit-a|Heathkit h19 ANSI mode,
 	OTbs, am, mir, msgr,
 	cols#80, it#8, lines#24,
 	acsc=, bel=^G, clear=\E[2J, cnorm=\E[>4l, cr=\r, cub1=^H,
-	cud1=\E[1B, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[1A, cvvis=\E[>4h, dch1=\E[1P, dl1=\E[1M$<1*>,
-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[1L$<1*>, ind=\n,
+	cud1=\E[1B, cuf1=\E[1C, cuu1=\E[1A, cvvis=\E[>4h,
+	dch1=\E[1P, dl1=\E[1M$<1*>, ed=\E[J, el=\E[K, ht=^I,
+	il1=\E[1L$<1*>, ind=\n,
 	is2=\E<\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m\E[?7h,
 	kbs=^H, kcub1=\E[1D, kcud1=\E[1B, kcuf1=\E[1C, kcuu1=\E[1A,
 	kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP,
 	kf7=\EOQ, kf8=\EOR, khome=\E[H, lf6=blue, lf7=red, lf8=white,
-	ri=\EM, rmacs=\E[11m, rmam=\E[?7l, rmir=\E[4l, rmso=\E[m,
-	smacs=\E[10m, smam=\E[?7h, smir=\E[4h, smso=\E[7m,
+	ri=\EM, rmacs=\E[11m, rmam=\E[?7l, rmir=\E[4l,
+	smacs=\E[10m, smam=\E[?7h, smir=\E[4h, use=ansi+cup,
+	use=ansi+sgrso,
 h19-bs|Heathkit w/keypad shifted,
 	rmkx=\Eu, smkx=\Et, use=h19-b,
 h19-us|h19us|h19-smul|Heathkit w/keypad shifted/underscore cursor,
@@ -22758,18 +23164,19 @@ z29a|z29a-kc-bc|h29a-kc-bc|Heath/Zenith 29 in ANSI mode,
 	OTkn#10, cols#80, it#8, lines#24,
 	OTbc=\ED, bel=^G, blink=\E[5m, bold=\E[2m, clear=\E[2J,
 	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
-	dim=\E[2m, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l,
-	home=\E[H, ht=^I, hts=\EH, if=/usr/share/tabset/vt100,
-	ind=\ED, kclr=\E[J, ked=\E[J, kf0=\E[~, kf1=\EOS, kf2=\EOT,
-	kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, kf8=\EOR,
-	kf9=\EOX, khome=\E[H, lf0=help, mc0=\E#7, nel=\r\ED, rc=\E[r,
-	rev=\E[7m, ri=\EM, rmcup=\E[?7h, rmso=\E[m, rmul=\E[m,
+	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dsl=\E[>1l, ed=\E[J,
+	el=\E[K, fsl=\E[u\E[>5l, ht=^I, hts=\EH,
+	if=/usr/share/tabset/vt100, ind=\ED, kclr=\E[J, ked=\E[J,
+	kf0=\E[~, kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW,
+	kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help,
+	mc0=\E#7, nel=\r\ED, rc=\E[r, rev=\E[7m, ri=\EM,
+	rmcup=\E[?7h, rmso=\E[m,
 	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m
 	    \E[11m,
-	sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m,
-	tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K,
-	use=ansi+apparrows, use=ansi+idl, use=ansi+local,
+	sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, tbc=\E[3g,
+	tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K, use=ansi+apparrows,
+	use=ansi+cup, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrul,
 
 z29a-kc-uc|h29a-kc-uc|Zenith z29 ANSI mode with keyclick and underscore cursor,
 	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11
@@ -22790,19 +23197,19 @@ z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
 	acsc=0a``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
 	blink=\E[5m, bold=\E[1m, cbt=\E[1Z, civis=\E[>5h,
 	clear=\E[2J\E[H, cnorm=\E[>5l, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM,
-	dl1=\E[1M, dsl=\E[>1l, ed=\E[0J, el=\E[0K, el1=\E[1K,
-	fsl=\E[u, home=\E[H, il=\E[%p1%dL, il1=\E[1L, ind=\n,
-	is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J, ka1=\EOw, ka3=\EOu,
-	kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J, kf1=\EOS, kf2=\EOT,
-	kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, kf8=\EOR,
-	kf9=\EOX, khlp=\E[~, ll=\E[24;1H, mc0=\E[?19h\E[i, rc=\E[u,
-	rev=\E[7m, rmacs=\E(B, rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m,
-	rmul=\E[0m, rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0,
-	smir=\E[4h, smkx=\E[>7h, smso=\E[7m, smul=\E[4m,
+	csr=\E[%i%p1%d;%p2%dr, cub1=^H, dch=\E[%p1%dP,
+	dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[>1l,
+	ed=\E[0J, el=\E[0K, el1=\E[1K, fsl=\E[u, il=\E[%p1%dL,
+	il1=\E[1L, ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J,
+	ka1=\EOw, ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J,
+	kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP,
+	kf7=\EOQ, kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
+	mc0=\E[?19h\E[i, rc=\E[u, rev=\E[7m, rmacs=\E(B,
+	rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m, rmul=\E[0m,
+	rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0, smir=\E[4h,
+	smkx=\E[>7h, smso=\E[7m, smul=\E[4m,
 	tsl=\E[s\E[>1h\E[25;%i%p1%dH, use=ansi+arrows,
-	use=ansi+local, use=ansi+pp, use=ansi+tabs,
+	use=ansi+cup, use=ansi+local, use=ansi+pp, use=ansi+tabs,
 
 # From: Brad Brahms <Brahms@USC-ECLC>
 z100|h100|z110|z-100|h-100|Heath/Zenith z-100 pc with color monitor,
@@ -22921,13 +23328,12 @@ graphos|graphos III,
 	am, mir,
 	cols#80, it#8, lines#24,
 	clear=\E[H\E[2J, cnorm=\Ez56;2;0;0z\Ez73z\Ez4;1;1z,
-	cr=\r, cub1=^H, cud=\E[%p1%dB, cup=\E[%i%p1%d;%p2%dH,
-	cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
+	cr=\r, cub1=^H, cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P,
+	ht=^I, ind=\ED, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
 	rmir=\E[4l, sc=\E7, sgr0=\E[m, smdc=\E[4h, smir=\E[4h,
-	use=ansi+arrows, use=ansi+idl, use=ansi+local,
-	use=ansi+sgrso,
+	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
+	use=vt100+pf1-pf4,
 
 graphos-30|graphos III with 30 lines,
 	lines#30,
@@ -22992,15 +23398,13 @@ modgraph48|mod|Modgraph w/48 lines,
 	OTbs, OTpt, am, xenl,
 	cols#80, it#8, lines#48, vt#3,
 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J,
-	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[A, ed=\E[J, el=\E[K,
-	flash=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q,
-	home=\E[H, ht=^I, is2=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h,
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs1=\E=\E[0q\E>,
-	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	use=ansi+csr,
+	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\E[A, ed=\E[J,
+	el=\E[K, flash=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q,
+	ht=^I, is2=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h, kbs=^H,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m,
+	ri=\EM, rmkx=\E[?1l\E>, rs1=\E=\E[0q\E>, sgr0=\E[m,
+	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+cup,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
 
 #### Morrow Designs
 #
@@ -23087,13 +23491,12 @@ rt6221|Ramtek 6221 80x24,
 	hts=\EH, ind=\n, is2=\E)0, kbs=^H, kcub1=\E[D, kcud1=\E[B,
 	kcuf1=\E[C, kcuu1=\E[A, kf0=\EOP, kf1=\EOQ, kf2=\EOR,
 	kf3=\EOS, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[24;1H,
-	nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E>, rmso=\E[m,
-	rmul=\E[m,
+	nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E>,
 	rs1=\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>,
-	sgr0=\E[m, smacs=^N, smkx=\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, use=ansi+csr, use=ansi+local,
+	sgr0=\E[m, smacs=^N, smkx=\E=, tbc=\E[3g, use=ansi+csr,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 
 # [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)].
 rt6221-w|Ramtek 6221 160x48,
@@ -23129,9 +23532,8 @@ rca|RCA vp3301/vp3501,
 hirez100|Selanar HiREZ-100,
 	OTbs, OTpt, mir, msgr, xon,
 	OTkn#4, cols#80, it#8, lines#48, vt#3,
-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
-	dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ht=^I, hts=\EH,
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H,
+	cud1=\n, cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, ht=^I, hts=\EH,
 	is2=\E<\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
 	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1,
 	lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[48H, mc0=\E[i,
@@ -23140,8 +23542,8 @@ hirez100|Selanar HiREZ-100,
 	rs1=\030\E2\E<\E[4i\E[?4i\E[12h\E[2;4;20l\E[?0;7h\E[?1;3;6;1
 	    9l\E[r\E[m\E(B\017\E)0\E>,
 	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, tbc=\E[3g,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+sgrso, use=ansi+sgrul,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 
 hirez100-w|Selanar HiREZ-100 in 132-column mode,
 	cols#132, use=hirez100,
@@ -23154,9 +23556,9 @@ vsc|Signetics Vsc Video driver by RMC,
 	am, msgr,
 	cols#80, it#8, lines#26,
 	clear=\E[;H\E[2J$<50/>, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
-	ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, rev=^_\s,
-	rmso=^_!, rmul=^_#, sgr0=^_!, smso=^_\s, smul=^_",
+	cuu1=\E[A, el=\E[K, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n,
+	nel=\r\n, rev=^_\s, rmso=^_!, rmul=^_#, sgr0=^_!, smso=^_\s,
+	smul=^_", use=ansi+cup,
 
 #### Soroc
 #
@@ -23278,14 +23680,14 @@ synertek|ktm|synertek380|Synertek KTM 3/80 tubeless terminal,
 # https://ub.fnwi.uva.nl/computermuseum/tab13215g.html
 #	This monochrome graphics terminal of TAB Products, California, is a DEC
 #	VT52/VT100/VT132 compatible alphanumeric terminal (TAB 132/15),
-#	factory-fitted with additional hardware for Tektronix 4010 emulation. 
-#	Also the terminal understands a selection of Tektronix 4027 commands. 
+#	factory-fitted with additional hardware for Tektronix 4010 emulation.
+#	Also the terminal understands a selection of Tektronix 4027 commands.
 tab132|tab|tab132-15|tab 132/15,
 	da, db,
 	OTdN@, lm#96,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, il1=\E[L,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P,
 	is2=\E[?7h\E[?3l\E[?5l, rmir=\E[4l, rmkx@, smir=\E[4h,
-	smkx@, use=decid+cpr, use=vt100+4bsd,
+	smkx@, use=ansi+idl1, use=decid+cpr, use=vt100+4bsd,
 tab132-w|tab132 in wide mode,
 	cols#132,
 	is2=\E[?7h\E[?3h\E[?5l, use=tab132,
@@ -23340,7 +23742,7 @@ t1061f|Teleray 1061 with fast PROMs,
 # "Teleray Arpa Special", officially designated as
 # "Teleray Arpa network model 10" with "Special feature 720".
 # This is the new (1981) fast microcode updating the older "arpa" proms
-# (which gave meta-key and programmable-fxn keys).  720 is much much faster,
+# (which gave meta-key and programmable-fxn keys).  720 is much, much faster,
 # converts the keypad to programmable function keys, and has other goodies.
 # Standout mode is still broken (magic cookie, etc) so is suppressed as no
 # programs handle such lossage properly.
@@ -23364,13 +23766,12 @@ t16|Teleray 16,
 	am, da, db, mir, xhp, xt,
 	cols#80, lines#24,
 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H,
-	cup=%i\E[%p1%d;%p2%df, dch1=\E[P, dl1=\E[M, ed=\E[0J,
-	el=\E[0K, home=\E[H, ht=^I, il1=\E[L, ind=\n, kf1=^Z1,
-	kf10=^Z0, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7,
-	kf8=^Z8, kf9=^Z9, ri=\E[T, rmcup=\E[V\E[24;1f\E[?38h,
-	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smcup=\E[U\E[?38l, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	use=ansi+local1,
+	cup=%i\E[%p1%d;%p2%df, dch1=\E[P, ed=\E[0J, el=\E[0K,
+	home=\E[H, ht=^I, ind=\n, kf1=^Z1, kf10=^Z0, kf2=^Z2, kf3=^Z3,
+	kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7, kf8=^Z8, kf9=^Z9, ri=\E[T,
+	rmcup=\E[V\E[24;1f\E[?38h, rmir=\E[4l, sgr0=\E[m,
+	smcup=\E[U\E[?38l, smir=\E[4h, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
 
 #### Texas Instruments (ti)
 #
@@ -23410,15 +23811,14 @@ ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 VT220 mode 7 bit CTRL,
 	da, db, in,
 	cbt=\E[Z, clear=\E[H\E[2J$<6>, dch=\E[%p1%dP$<250>,
 	ech=\E[%p1%dX$<20>, ed=\E[J$<6>, el=\E[0K,
-	enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>,
-	hpa=\E[%p1%{1}%+%dG, hts=\E[0W, ich=\E[%p1%d@$<250>,
-	il=\E[%p1%dL$<36>, ip=$<10>, is2=\E[1;24r\E[24;1H,
-	kcmd=\E[29~, kdch1=\E[P, kent=\n, kf1=\E[17~, kf10=\E[28~,
-	kf11=\E[29~, kf12=\E[31~, kf2=\E[18~, kf3=\E[19~,
-	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~,
-	kf9=\E[26~, khome=\E[H, kich1=\E[@, knp=\E[S, kpp=\E[T,
-	kprt=^X, prot=\E&, rmacs=\017$<2>, rs2=\E[!p, sgr@,
-	smacs=\016$<2>, vpa=\E[%p1%{1}%+%dd, use=vt220,
+	enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>, hts=\E[0W,
+	ich=\E[%p1%d@$<250>, il=\E[%p1%dL$<36>, ip=$<10>,
+	is2=\E[1;24r\E[24;1H, kcmd=\E[29~, kdch1=\E[P, kent=\n,
+	kf1=\E[17~, kf10=\E[28~, kf11=\E[29~, kf12=\E[31~,
+	kf2=\E[18~, kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~,
+	kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khome=\E[H, kich1=\E[@,
+	knp=\E[S, kpp=\E[T, kprt=^X, prot=\E&, rmacs=\017$<2>,
+	rs2=\E[!p, sgr@, smacs=\016$<2>, use=ansi+rca, use=vt220,
 #
 # Texas Instruments 916 VDT 8 bit control mode
 #
@@ -23444,25 +23844,25 @@ ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL,
 	cols#80, it#8, lines#24,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
 	csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH,
-	cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\E[16~, kf6=\E[17~, kf7=\E[18~,
+	cvvis=\E[?31h, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
+	ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+	kcuu1=\E[A, kdch1=\E[P, kf5=\E[16~, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, kich1=\E[@, rc=\E8, rev=\E[7m,
-	ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+local1, use=vt220+cvis,
+	ri=\EM, sc=\E7, sgr0=\E[m, tbc=\E[3g, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt100+pf1-pf4, use=vt220+cvis,
 ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL,
 	am, xon,
 	cols#80, it#8, lines#24,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
 	csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH,
-	cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\233P, kf1=\217P, kf2=\217Q,
-	kf3=\217R, kf4=\217S, kf5=\23316~, kf6=\23317~,
-	kf7=\23318~, kf8=\23319~, kf9=\23320~, kich1=\233@, rc=\E8,
-	rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+local1,
+	cvvis=\E[?31h, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
+	ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+	kcuu1=\E[A, kdch1=\233P, kf1=\217P, kf2=\217Q, kf3=\217R,
+	kf4=\217S, kf5=\23316~, kf6=\23317~, kf7=\23318~,
+	kf8=\23319~, kf9=\23320~, kich1=\233@, rc=\E8, rev=\E[7m,
+	ri=\EM, sc=\E7, sgr0=\E[m, tbc=\E[3g, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
 	use=vt220+cvis,
 ti924w|Texas Instruments 924 VDT 7 bit - 132 column mode,
 	cols#132, use=ti924,
@@ -23489,14 +23889,14 @@ ti_ansi|basic entry for ti928,
 	am, bce, eo, xenl, xon,
 	colors#8, cols#80, it#8, lines#25, pairs#64,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[2J\E[H,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\E[S,
-	kend=\E[F, kf0=\E[V, kf1=\E[M, kf2=\E[N, kf3=\E[O, kf4=\E[P,
-	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, knp=\E[G,
-	kpp=\E[I, op=\E[37;40m, ri=\E[T, rmso=\E[m, rmul=\E[m,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m,
-	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+local1,
+	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, dch1=\E[P, ed=\E[J,
+	el=\E[K, ht=^I, ich1=\E[@, ind=\E[S, kend=\E[F, kf0=\E[V,
+	kf1=\E[M, kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R,
+	kf7=\E[S, kf8=\E[T, kf9=\E[U, knp=\E[G, kpp=\E[I,
+	op=\E[37;40m, ri=\E[T, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm, sgr0=\E[m, use=ansi+arrows,
+	use=ansi+cup, use=ansi+idl1, use=ansi+local1,
+	use=ansi+sgrso, use=ansi+sgrul,
 #
 #       928 VDT 7 bit control mode
 #
@@ -23599,20 +23999,19 @@ att6386|at386|386at|AT&T WGS 6386 console,
 	cols#80, lines#25,
 	acsc=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~,
 	bel=^G, civis=\E[=C, clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J,
-	el=\E[K, home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
+	dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, ich=\E[%p1%d@,
 	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
-	is2=\E[0;10;39m, kcbt=^], kdch1=\E[P, kend=\E[Y, kf1=\EOP,
-	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, kf3=\EOR,
-	kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
-	kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0, nel=\r\E[S,
-	rc=\E8, ri=\E[T, rmacs=\E[10m, sc=\E7,
+	is2=\E[0;10;39m, kcbt=^], kdch1=\E[P, kend=\E[Y, kf10=\EOY,
+	kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+	kf9=\EOX, kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0,
+	nel=\r\E[S, rc=\E8, ri=\E[T, rmacs=\E[10m, sc=\E7,
 	sgr=\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,
-	sgr0=\E[0;10m, smacs=\E[12m, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
-	use=ansi+sgrbold, use=ecma+index, use=klone+color,
+	sgr0=\E[0;10m, smacs=\E[12m, use=ansi+arrows,
+	use=ansi+cup, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rca2, use=ansi+sgrbold, use=ecma+index,
+	use=klone+color, use=vt100+pf1-pf4,
 
 # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
 pc6300plus|AT&T 6300 plus,
@@ -23625,9 +24024,9 @@ pc6300plus|AT&T 6300 plus,
 	ich1=\E[1@, il1=\E[1L, ind=\n, invis=\E[9m, kbs=^H,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOc,
 	kf10=\EOu, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh,
-	kf7=\EOi, kf8=\EOj, kf9=\EOk, nel=\r\n, rev=\E[7m, rmso=\E[m,
-	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	use=ansi+local1,
+	kf7=\EOi, kf8=\EOj, kf9=\EOk, nel=\r\n, rev=\E[7m, sgr0=\E[m,
+	tbc=\E[3g, use=ansi+local1, use=ansi+sgrso,
+	use=ansi+sgrul,
 
 # From: Benjamin C. W. Sittler <bsittler@nmt.edu>
 #
@@ -23674,7 +24073,7 @@ pc6300plus|AT&T 6300 plus,
 # programs expecting VT100 graphics will usually be disappointed. For this
 # reason I have disabled the smacs/rmacs sequences, but they could easily be
 # re-enabled. Here are the relevant control sequences (from the ESCAPE(7)
-# manpage), should you wish to do so:
+# man page), should you wish to do so:
 #
 # SGR10 - Select font 0 - ESC [ 10 m or SO
 # SGR11 - Select font 1 - ESC [ 11 m or SI
@@ -23750,25 +24149,24 @@ att7300|unixpc|pc7300|3b1|s4|AT&T UNIX PC Model 7300,
 	am, xon,
 	cols#80, it#8, lines#24,
 	bel=^G, blink=\E[9m, bold=\E[1m, cbt=\E^I, civis=\E[=1C,
-	clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dim=\E[2m, ed=\E[0J,
-	el=\E[0K, home=\E[H, ich1=\E[@, ind=\n, invis=\E[9m,
-	is1=\017\E[=1w, kBEG=\ENB, kCAN=\EOW, kCPY=\END, kCRT=\EON,
-	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kFND=\EOX,
-	kHLP=\EOM, kHOM=\ENM, kIC=\ENJ, kLFT=\ENK, kMOV=\ENC,
-	kNXT=\ENH, kOPT=\EOR, kPRV=\ENG, kRDO=\EOT, kRIT=\ENL,
-	kRPL=\EOY, kSAV=\EOO, kUND=\EOS, kbeg=\ENb, kcan=\EOw,
-	kcbt=\E[Z, kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd,
-	kcrt=\EOn, kdch1=\ENf, ked=\E[J, kel=\EOa, kend=\E0,
-	kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg,
-	kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx, khlp=\EOm,
-	kich1=\ENj, kind=\E[B, kmov=\ENc, kmrk=\ENi, knp=\E[U,
-	knxt=\ENh, kopn=\EOv, kopt=\EOr, kpp=\E[V, kprt=\EOz,
-	kprv=\ENg, krdo=\EOt, kref=\EOb, krfr=\ENa, kri=\E[A,
-	krpl=\EOy, krst=\EOB, ksav=\EOo, kslt=\ENI, kund=\EOs,
-	nel=\EE, rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[0;10m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+idl, use=ansi+local,
+	clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, cub1=^H, dch1=\E[P,
+	dim=\E[2m, ed=\E[0J, el=\E[0K, ich1=\E[@, ind=\n,
+	invis=\E[9m, is1=\017\E[=1w, kBEG=\ENB, kCAN=\EOW,
+	kCPY=\END, kCRT=\EON, kDC=\ENF, kDL=\ENE, kEND=\ENN,
+	kEOL=\EOA, kFND=\EOX, kHLP=\EOM, kHOM=\ENM, kIC=\ENJ,
+	kLFT=\ENK, kMOV=\ENC, kNXT=\ENH, kOPT=\EOR, kPRV=\ENG,
+	kRDO=\EOT, kRIT=\ENL, kRPL=\EOY, kSAV=\EOO, kUND=\EOS,
+	kbeg=\ENb, kcan=\EOw, kcbt=\E[Z, kclo=\EOV, kclr=\E[J,
+	kcmd=\EOu, kcpy=\ENd, kcrt=\EOn, kdch1=\ENf, ked=\E[J,
+	kel=\EOa, kend=\E0, kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe,
+	kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx,
+	khlp=\EOm, kich1=\ENj, kind=\E[B, kmov=\ENc, kmrk=\ENi,
+	knp=\E[U, knxt=\ENh, kopn=\EOv, kopt=\EOr, kpp=\E[V,
+	kprt=\EOz, kprv=\ENg, krdo=\EOt, kref=\EOb, krfr=\ENa,
+	kri=\E[A, krpl=\EOy, krst=\EOB, ksav=\EOo, kslt=\ENI,
+	kund=\EOs, nel=\EE, rev=\E[7m, ri=\EM, sgr0=\E[0;10m,
+	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 
 #### Convergent Technology
 #
@@ -23865,10 +24263,10 @@ masscomp|masscomp workstation console,
 	OTbs, km, mir,
 	cols#80, it#8, lines#24,
 	clear=\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P,
-	dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, il1=\E[L,
-	is2=\EGc\EGb\EGw, kbs=^H, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, rmir=\E[4l, rmso=\E[m, rmul=\EGau,
-	smir=\E[4h, smso=\E[7m, smul=\EGu, use=ansi+local1,
+	ed=\E[J, el=\E[K, ht=^I, is2=\EGc\EGb\EGw, kbs=^H,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmir=\E[4l,
+	rmul=\EGau, smir=\E[4h, smul=\EGu, use=ansi+idl1,
+	use=ansi+local1, use=ansi+sgrso,
 masscomp1|masscomp large screen version 1,
 	cols#104, lines#36, use=masscomp,
 masscomp2|masscomp large screen version 2,
@@ -23883,7 +24281,7 @@ pmcons|pmconsole|PMAX console,
 	cols#128, lines#57,
 	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n, cuu1=^K, ht=^I,
 	ind=\n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+	use=vt100+pf1-pf4,
 
 #### Other consoles
 # The following is a version of the ibm-pc entry distributed with PC/IX,
@@ -23897,8 +24295,8 @@ pcix|PC/IX console,
 	am, bw, eo,
 	cols#80, lines#24,
 	clear=\Ec, cub1=^H, cup=\E[%i%p1%2d;%p2%2dH, ed=\E[J,
-	el=\E[K, home=\E[H, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smso=\E[7m, smul=\E[4m, use=ansi+local1,
+	el=\E[K, home=\E[H, sgr0=\E[m, use=ansi+local1,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 # (ibmpcx: this entry used to be known as ibmx.
 # It formerly included the following extension capabilities:
@@ -23914,11 +24312,11 @@ pcix|PC/IX console,
 ibmpcx|xenix|ibmx|IBM PC xenix console display,
 	OTbs, am, msgr,
 	cols#80, lines#25,
-	clear=^L, cub1=^H, cup=\E[%p1%d;%p2%dH, dch1=\E[P,
-	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ich1=\E[@, il1=\E[L,
-	kend=\E[d, kf1=\E[K, kf2=\E[L, kf3=\E[M, kf4=\E[N,
-	khome=\E[Y, knp=\E[e, kpp=\E[Z, use=ansi+arrows,
-	use=ansi+local1, use=klone+acs, use=klone+sgr8,
+	clear=^L, cub1=^H, cup=\E[%p1%d;%p2%dH, dch1=\E[P, ed=\E[J,
+	el=\E[K, home=\E[H, ich1=\E[@, kend=\E[d, kf1=\E[K, kf2=\E[L,
+	kf3=\E[M, kf4=\E[N, khome=\E[Y, knp=\E[e, kpp=\E[Z,
+	use=ansi+arrows, use=ansi+idl1, use=ansi+local1,
+	use=klone+acs, use=klone+sgr8,
 
 ######## OTHER OBSOLETE TYPES
 #
@@ -23995,16 +24393,15 @@ gs6300|emots|AT&T PC6300 with EMOTS terminal emulator,
 	acsc=++\,\,--..``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyz
 	     z{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\n, is2=\E[m,
-	kcbt=^R^I, kf1=\E[0s, kf2=\E[24s, kf3=\E[1s, kf4=\E[23s,
-	kf5=\E[2s, kf6=\E[22s, kf7=\E[3s, kf8=\E[21s, mc4=\E[4i,
-	mc5=\E[5i, op=\E[?;m, rev=\E[7m, ri=\E[L, rmacs=\E[10m,
-	rs1=\Ec, setb=\E[?;%p1%dm,
+	dch=\E[%p1%dP, dch1=\E[P, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\n, is2=\E[m, kcbt=^R^I, kf1=\E[0s, kf2=\E[24s,
+	kf3=\E[1s, kf4=\E[23s, kf5=\E[2s, kf6=\E[22s, kf7=\E[3s,
+	kf8=\E[21s, mc4=\E[4i, mc5=\E[5i, op=\E[?;m, rev=\E[7m,
+	ri=\E[L, rmacs=\E[10m, rs1=\Ec, setb=\E[?;%p1%dm,
 	setf=\E[?%?%p1%{0}%=%t0%e%p1%{1}%=%t2%e%p1%{1}%-%d%;m,
 	sgr0=\E[m\E[10m, smacs=\E[11m, smso=\E[1m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ansi+local,
+	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl, use=ansi+local,
 
 # From: <earle@smeagol.UUCP> 29 Oct 85 05:40:18 GMT
 # MS-Kermit with Heath-19 emulation mode enabled
@@ -24028,11 +24425,11 @@ versaterm|VersaTerm VT100 emulator for the Macintosh,
 	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I,
 	ich1=\E[1@$<7/>, il1=\E[1L$<9/>, is2=\E[1;24r\E[24;1H,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\n,
-	rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
+	nel=\r\n, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
 	ri=\EM$<5/>, rmkx=\E>\E[?1l, rmso=\E[m$<2/>,
 	rmul=\E[m$<2/>, rs1=\E>, sgr0=\E[m$<2/>, smkx=\E=\E[?1h,
 	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+csr,
+	use=vt100+pf1-pf4,
 
 # From: Rick Thomas <ihnp4!btlunix!rbt>
 # (xtalk: I added <rmam>/<smam> based on the init string.
@@ -24202,10 +24599,10 @@ d800|Direct 800/A,
 	bel=^G, clear=\E[1;1H\E[2J, cnorm=\E[>12h, cr=\r, cub1=^H,
 	cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
 	cvvis=\E[>12l, ed=\E[J, el=\E[K, ht=^I, ind=\ED, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
-	ri=\EM, rmacs=\E[m, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smacs=\E[1m, smso=\E[7m, smul=\E[4m,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf5=\EOT, kf6=\EOU,
+	kf7=\EOV, kf8=\EOW, ri=\EM, rmacs=\E[m, sgr0=\E[m,
+	smacs=\E[1m, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt100+pf1-pf4,
 digilog|digilog 333,
 	OTbs,
 	cols#80, lines#16,
@@ -24325,14 +24722,14 @@ teletec|Teletec Datascreen,
 v3220|LANPAR Vision II model 3220/3221/3222,
 	OTbs, am, mir, xenl,
 	cols#80, it#8, lines#24,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ht=^I,
-	il1=\E[L, is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~,
-	kf2=\E[3~, kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP,
-	kf7=\E[OQ, kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E=, smso=\E[7m,
-	smul=\E[4m, use=ansi+erase, use=ansi+local1,
+	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, ht=^I,
+	is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D, kcud1=\E[B,
+	kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~, kf2=\E[3~,
+	kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP, kf7=\E[OQ,
+	kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM, rmam=\E[?7l,
+	rmir=\E[4l, rmkx=\E>, sgr0=\E[m, smam=\E[?7h, smir=\E[4h,
+	smkx=\E=, use=ansi+erase, use=ansi+idl1, use=ansi+local1,
+	use=ansi+sgrso, use=ansi+sgrul,
 ######## ICH/ICH1 VERSUS RMIR/SMIR
 #
 # Some non-curses applications get confused if both ich/ich1 and rmir/smir
@@ -25121,7 +25518,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # SGR 39/49 reset the terminal's foreground and background colors to their
 # "default".
 #
-# XT is harder, since screen's manpage does not give more details.  For that,
+# XT is harder, since screen's man page does not give more details.  For that,
 # we must read screen's source-code.  For example, when XT is set, screen
 # assumes
 #
@@ -26061,7 +26458,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	* add mgterm, from NetBSD -TD
 #	* add alias sun-cgsix for sun-ss5 as per NetBSD
 #	* change cons25w to use rs2 for reset rather than rs1 -TD
-#	* add rc/sc to aixterm based on manpage -TD
+#	* add rc/sc to aixterm based on man page -TD
 #
 # 2000/5/13
 #	* remove ncv from xterm-16color, xterm-256color
@@ -26100,7 +26497,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	* rename cygwin to cygwinB19, adapt newer entry from Earnie Boyd -TD
 #
 # 2000-12-16
-#	* improved scoansi, based on SCO man-page, and testing console,
+#	* improved scoansi, based on SCO man page, and testing console,
 #	  scoterm with tack -TD
 #
 # 2001-01-27
@@ -27510,4 +27907,95 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ modify xgterm to work around line-drawing bug -TD
 #	+ use CSI 3J in vte-2017 (report by Sven Joachim)
 #
+# 2024-05-25
+#	+ review/update iTerm2 for 3.5.0 -TD
+#
+# 2024-07-27
+#	+ modify wezterm, omitting its broken left/right margin feature (report
+#	  by Thayne McCombs) -TD
+#
+# 2024-08-17
+#	+ review/update foot for 1.18.1 -TD
+#	+ add a note about DomTerm 3.2.0 -TD
+#
+# 2024-09-07
+#	+ update comments -TD
+#
+# 2024-10-05
+#	+ use xterm+alt+title in wezterm -TD
+#	+ update comments -TD
+#
+# 2024-10-26
+#	+ update ms-terminal -TD
+#	+ add ms-terminal-direct -TD
+#
+# 2024-11-02
+#	+ add extended-keys for djgpp 2.05 -TD
+#
+# 2024-12-28
+#	+ add ghostty -TD
+#
+# 2025-01-04
+#	+ cleanup use-clauses -TD
+#	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
+#	+ add vt220+ufkeys, vt220+sfkeys
+#
+# 2025-02-03
+#	+ add note for ghostty 1.1.0 -TD
+#
+# 2025-02-08
+#	+ update st (report by Alexander Kashpir) -TD
+#
+# 2025-02-15
+#	+ minor fixes to comments (report by Sven Joachim) -TD
+#
+# 2025-03-01
+#	+ add color to vt525 (Branden Robinson)
+#	+ add vt520-w and vt525-w (Branden Robinson)
+#
+# 2025-03-29
+#	+ add XM/xm to ms-terminal, to enable mouse with experimental Windows
+#	  driver -TD
+#
+# 2025-04-03
+#	+ add sclp -TD
+#	+ add op to vt525 -TD
+#
+# 2025-04-05
+#	+ update contour -TD
+#
+# 2025-04-12
+#	+ add pangoterm -TD
+#	+ add kf1 to kf5 to sclp (report by Werner Fink)
+#	+ add vt100+pf1-pf4 -TD
+#
+# 2025-04-26
+#	+ add illumos, sun-16color, sun-256color, sun-direct -TD
+#	+ add wyse+cvis -TD
+#
+# 2025-05-03
+#	+ update/correct some of the rv/xr strings, checked with tack -TD
+#	+ use ansi+rca in sclp -TD
+#	+ use vt220+pcedit in sclp (Werner Fink)
+#	+ move some building blocks from illumos to sun-color, based on
+#	  illumos source-history -TD
+#	+ improve use-clauses: ansi+cup, ansi+idl1, ansi+rca, ansi+rca2,
+#	  ansi+sgrso, ansi+sgrul -TD
+#	+ add ecma+standout, ecma+underline -TD
+#	+ add rv code for alacritty -TD
+#	+ add rv/xr codes for contour, foot, ghostty, iterm2, kitty, konsole,
+#	  vscode, vte, wezterm -TD
+#
+# 2025-05-10
+#	+ add rv/xr codes for domterm, mintty, mlterm -TD
+#	+ add xr code for putty -TD
+#	+ update teraterm to 5.0 -TD
+#	+ add rlogin-color -TD
+#
+# 2025-05-17
+#	+ use bracketed+paste in nsterm, rlogin-color, screen, terminology -TD
+#
+# 2025-07-19
+#	+ add xterm+keypad to pccon+base -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!