--- 2003-04-10-02/htdict Fri May 2 17:20:04 2003 +++ latest/htdict Fri May 2 17:21:25 2003 @@ -1,6 +1,6 @@ #!/bin/sh appname=`basename "$0"` - ver="0.4b-.2003041002" + ver="0.4b.2003050217" copy="2002, 2003" mail="PointedEars@gmx.de" mail_feedback="bug-htDICT@PointedEars.de" @@ -128,21 +128,24 @@ chk=`echo x | $fold 1> /dev/null` test -n "$chk" && fold="cat" # check for fmt - chk=`which fmt 2> /dev/null` - if [ -z "$chk" ]; then - fmt=$fold - else - # check for columns - fmt="fmt -$COLUMNS" - chk=`echo x | $fmt 2> /dev/null` - test -z "$chk" && fmt="fmt" - # check for -c|--crown-margin - chk=`echo x | $fmt -c 2> /dev/null` - if [ -n "$chk" ]; then - fmt=$fmt" -c" + fmt=cat + if [ $COLUMNS -ne 80 ]; then # output is preformatted for 80 cols + chk=`which fmt 2>/dev/null` + if [ $? -ne 0 ]; then + fmt=$fold else - chk=`echo x | $fmt --crown-margin 2> /dev/null` - test -n "$chk" && fmt=$fmt" --crown-margin" + # check for columns + fmt="fmt -$COLUMNS" + chk=`echo x | $fmt 2>/dev/null` + test -z "$chk" && fmt="fmt" + # check for -c|--crown-margin + chk=`echo x | $fmt -c 2>/dev/null` + if [ -n "$chk" ]; then + fmt=$fmt" -c" + else + chk=`echo x | $fmt --crown-margin 2>/dev/null` + test -n "$chk" && fmt=$fmt" --crown-margin" + fi fi fi