ncurses 6.1 - patch 20190216

[ncurses.git] / man / MKterminfo.sh

diff --git a/man/MKterminfo.sh b/man/MKterminfo.sh
index 8160ca93748c179ed1cbafa5127fd7be253b95ed..4d9ae18c91174ac1c58ba26a1efcde83783cf55a 100755 (executable)
--- a/man/MKterminfo.sh
+++ b/man/MKterminfo.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: MKterminfo.sh,v 1.10 2002/06/29 20:04:28 tom Exp $
+# $Id: MKterminfo.sh,v 1.16 2018/03/17 18:03:51 Kir.Kolyshkin Exp $

 #
 # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
 #
 #***************************************************************************
 #
 # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
 #
 #***************************************************************************

-# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.              *
+# Copyright (c) 1998-2017,2018 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            *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
 # copy of this software and associated documentation files (the            *


@@ -65,15 +65,18 @@ cat $head
 temp=temp$$
 sorted=sorted$$
 unsorted=unsorted$$
 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 "\
 /%%-STOP-HERE-%%/q
 
 sed -n <$caps "\
 /%%-STOP-HERE-%%/q

-/^#%/s///p
+/^#%center/s, expand,,
+/^#%lw25/s, lw6 , lw7 ,
+/^#%/s/#%//p

 /^#/d
 /^#/d

-s/[    ]\+/    /g
+s/[    ][      ]*/     /g

 s/$/\ 5T}/
 s/$/\ 5T}/

-s/     [A-Z0-9_()\-]\+ [0-9\-]\+       [Y\-][B\-][C\-][G\-][EK\-]\**   /       T{\ 5/
+s/     [A-Z0-9_()\-][A-Z0-9_()\-]*     [0-9\-][0-9\-]* [Y\-][B\-][C\-][G\-][EK\-]\**   /       T{\ 5/

 s/     bool    /       /p
 s/     num     /       /p
 s/     str     /       /p
 s/     bool    /       /p
 s/     num     /       /p
 s/     str     /       /p


@@ -105,6 +108,7 @@ done <$unsorted
 test $saved = yes && sort $temp >>$sorted
 
 sed -e 's/^\.\.$//' $sorted | tr "\005\006" "\012\134"
 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