X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=man%2FMKterminfo.sh;h=7c0378cdcfdd017396d0e368cc428e11ecab6462;hp=a6f765a4f00cdbe1747e9e157fae09a0e0a59906;hb=51a395aaa20e4aa687310bb8cb1616ccf8e8fd0d;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce;ds=sidebyside

diff --git a/man/MKterminfo.sh b/man/MKterminfo.sh
index a6f765a4..7c0378cd 100755
--- a/man/MKterminfo.sh
+++ b/man/MKterminfo.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
+# $Id: MKterminfo.sh,v 1.17 2019/03/02 22:18:27 tom Exp $
+#
+# MKterminfo.sh -- generate terminfo.5 from Caps tabular data
+#
 #***************************************************************************
-# Copyright (c) 1998 Free Software Foundation, Inc.                        *
+# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
 # copy of this software and associated documentation files (the            *
@@ -27,10 +31,6 @@
 # authorization.                                                           *
 #***************************************************************************
 #
-# $Id: MKterminfo.sh,v 1.5 1998/09/06 00:20:01 tom Exp $
-#
-# MKterminfo.sh -- generate terminfo.5 from Caps tabular data
-#
 # This script takes terminfo.head and terminfo.tail and splices in between
 # them a table derived from the Caps data file.  Besides avoiding having
 # the docs fall out of sync with the table, this also lets us set up tbl
@@ -39,31 +39,50 @@
 # NOTE: The s in this script really are control characters.  It translates
 #  to \n because I couldn't get used to inserting linefeeds directly.  There
 # had better be no s in the table source text.
+#
+# keep the order independent of locale:
+if test "${LANGUAGE+set}"    = set; then LANGUAGE=C;    export LANGUAGE;    fi
+if test "${LANG+set}"        = set; then LANG=C;        export LANG;        fi
+if test "${LC_ALL+set}"      = set; then LC_ALL=C;      export LC_ALL;      fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+if test "${LC_COLLATE+set}"  = set; then LC_COLLATE=C;  export LC_COLLATE;  fi
+
 #
 head=$1
-caps=$2
-tail=$3
-cat <<'EOF'
-'\" t
-.\" DO NOT EDIT THIS FILE BY HAND!
-.\" It is generated from terminfo.head, Caps, and terminfo.tail.
-.\"
-.\" Note: this must be run through tbl before nroff.
-.\" The magic cookie on the first line triggers this under some man programs.
+shift 1
+caps=
+while test $# -gt 1
+do
+	caps="$caps $1"
+	shift 1
+done
+tail=$1
+cat <<EOF
+'\\" t
+.\\" DO NOT EDIT THIS FILE BY HAND!
+.\\" It is generated from terminfo.head, $caps, and terminfo.tail.
+.\\"
+.\\" Note: this must be run through tbl before nroff.
+.\\" The magic cookie on the first line triggers this under some man programs.
 EOF
 cat $head
 
 temp=temp$$
 sorted=sorted$$
 unsorted=unsorted$$
-trap "rm -f $sorted $temp $unsorted; exit 99" 1 2 5 15
+trap "code=\$?; rm -f $sorted $temp $unsorted; exit \$code" EXIT HUP INT QUIT TERM
+rm -f $sorted $temp $unsorted
 
-sed -n <$caps "\
+cat $caps | sed -n "\
 /%%-STOP-HERE-%%/q
-/^#%/s///p
+/^#%center/s, expand,,
+/^#%lw25/s, lw6 , lw7 ,
+/^#%/s/#%//p
 /^#/d
+s/[	][	]*/	/g
 s/$/T}/
-s/	[Y\-][B\-][C\-][G\-][E\-]\**	/	T{/
+s/	[A-Z0-9_()\-][A-Z0-9_()\-]*	[0-9\-][0-9\-]*	[Y\-][B\-][C\-][G\-][EK\-]\**	/	T{/
 s/	bool	/	/p
 s/	num	/	/p
 s/	str	/	/p
@@ -74,6 +93,7 @@ rm -f $temp
 saved=no
 while true
 do
+	data=
 	read data
 	test -z "$data" && break
 	case "$data" in #(vi
@@ -94,6 +114,7 @@ done <$unsorted
 test $saved = yes && sort $temp >>$sorted
 
 sed -e 's/^\.\.$//' $sorted | tr "\005\006" "\012\134"
-cat $tail
 
-rm -f $sorted $temp $unsorted
+sed	-e '/^center expand;/s, expand,,' \
+	-e '/^\.TS/,/^\\/s, lw[1-9][0-9]*\., l.,' \
+	$tail