X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/474bd097015dae38cd69437de0423c2a3ca0ff32..2ca027a15f209e2a73b8c7da9115167f2dc8f8a2:/etc/mhn.defaults.sh

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 7f00764e..dbb38cd9 100755
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -9,7 +9,7 @@
 if [ -n "$1" ]; then
     SEARCHPATH=$1
 else
-    SEARCHPATH="$PATH:/usr/demo/SOUND"
+    SEARCHPATH="$PATH"
 fi
 
 # If a search program is passed to the script, we
@@ -27,20 +27,20 @@ trap "rm -f $TMP" 0 1 2 3 13 15
 
 PGM="`$SEARCHPROG $SEARCHPATH w3m`"
 if [ ! -z "$PGM" ]; then
-  echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
-$PGM "'-dump "${charset:+-I $charset}" -O utf-8 -T text/html %F' >> $TMP
-else
-  PGM="`$SEARCHPROG $SEARCHPATH lynx`"
-  if [ ! -z "$PGM" ]; then
-    #### lynx indents with 3 spaces, remove them and any trailing spaces.
     echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
-$PGM "'-child -dump -force_html "${charset:+--assume_charset $charset}" %F | '"\
-expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
-  else
-    PGM="`$SEARCHPROG $SEARCHPATH elinks`"
+$PGM "'-dump ${charset:+-I "$charset"} -O utf-8 -T text/html %F' >> $TMP
+else
+    PGM="`$SEARCHPROG $SEARCHPATH lynx`"
     if [ ! -z "$PGM" ]; then
-      echo "mhfixmsg-format-text/html: $PGM -dump -force-html -no-numbering \
--eval 'set document.browse.margin_width = 0' %F" >> $TMP
+        #### lynx indents with 3 spaces, remove them and any trailing spaces.
+        echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
+$PGM "'-child -dump -force_html ${charset:+--assume_charset "$charset"} %F | '"\
+expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
+    else
+        PGM="`$SEARCHPROG $SEARCHPATH elinks`"
+        if [ ! -z "$PGM" ]; then
+          echo "mhfixmsg-format-text/html: $PGM -dump -force-html \
+-no-numbering -eval 'set document.browse.margin_width = 0' %F" >> $TMP
     fi
   fi
 fi
@@ -66,17 +66,17 @@ fi
 
 PGM="`$SEARCHPROG $SEARCHPATH xv`"
 if [ ! -z "$PGM" ]; then
-    echo "mhshow-show-image: %p$PGM -geometry =-0+0 %f" >> $TMP
+    echo "mhshow-show-image: %l$PGM -geometry =-0+0 %f" >> $TMP
 elif [ ! -z $"NETPBM" -a ! -z "$XWUD" ]; then
-    echo "mhshow-show-image/gif: %p${NETPBMDIR}giftopnm | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pnm: %p${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pgm: %p${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-ppm: %p${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-xwd: %p$XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/gif: %l${NETPBMDIR}giftopnm | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-pnm: %l${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-pgm: %l${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-ppm: %l${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-xwd: %l$XWUD -geometry =-0+0" >> $TMP
 
     PGM="`$SEARCHPROG $SEARCHPATH djpeg`"
     if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-image/jpeg: %p$PGM -Pg | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+	echo "mhshow-show-image/jpeg: %l$PGM -Pg | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
     fi
 fi
 
@@ -85,7 +85,7 @@ if [ -f "/dev/audioIU" ]; then
     if [ ! -z "$PGM" ]; then
 	echo "mhstore-store-audio/basic: %m%P.au" >> $TMP
         echo "mhbuild-compose-audio/basic: ${AUDIODIR}recorder %f -au -pause > /dev/tty" >> $TMP
-        echo "mhshow-show-audio/basic: %p${AUDIODIR}splayer -au" >> $TMP
+        echo "mhshow-show-audio/basic: %l${AUDIODIR}splayer -au" >> $TMP
     fi
 elif [ -f "/dev/audio" ]; then
     PGM="`$SEARCHPROG $SEARCHPATH raw2audio`"
@@ -99,7 +99,7 @@ elif [ -f "/dev/audio" ]; then
 	else
 	    echo "mhbuild-compose-audio/basic: trap \"exit 0\" 2 && ${AUDIODIR}record | ${AUDIODIR}raw2audio -F" >> $TMP
 	fi
-	echo "mhshow-show-audio/basic: %p${AUDIODIR}raw2audio 2>/dev/null | ${AUDIODIR}play" >> $TMP
+	echo "mhshow-show-audio/basic: %l${AUDIODIR}raw2audio 2>/dev/null | ${AUDIODIR}play" >> $TMP
 
 	PGM="`$SEARCHPROG $SEARCHPATH adpcm_enc`"
 	if [ ! -z "$PGM" ]; then
@@ -109,44 +109,80 @@ elif [ -f "/dev/audio" ]; then
 	    else
 		echo "mhbuild-compose-audio/x-next: ${AUDIODIR}record | ${DIR}adpcm_enc" >> $TMP
 	    fi
-	    echo "mhshow-show-audio/x-next: %p${DIR}adpcm_dec | ${AUDIODIR}play" >> $TMP
+	    echo "mhshow-show-audio/x-next: %l${DIR}adpcm_dec | ${AUDIODIR}play" >> $TMP
 	else
 	    if [ ! -z "$AUDIOTOOL" ]; then
 		echo "mhbuild-compose-audio/x-next: $AUDIOTOOL %f" >> $TMP
 	    else
 		echo "mhbuild-compose-audio/x-next: ${AUDIODIR}record" >> $TMP
 	    fi
-	    echo "mhshow-show-audio/x-next: %p${AUDIODIR}play" >> $TMP
+	    echo "mhshow-show-audio/x-next: %l${AUDIODIR}play" >> $TMP
 	fi
     else
 	echo "mhbuild-compose-audio/basic: cat < /dev/audio" >> $TMP
-        echo "mhshow-show-audio/basic: %pcat > /dev/audio" >> $TMP
+        echo "mhshow-show-audio/basic: %lcat > /dev/audio" >> $TMP
     fi
 fi
 
+####
+#### mhbuild-disposition-<type>[/<subtype>] entries are used by the
+#### WhatNow attach for deciding whether the Content-Disposition
+#### should be 'attachment' or 'inline'.  Only those values are
+#### supported.
+####
+cat <<EOF >> ${TMP}
+mhbuild-disposition-text/calendar: inline
+mhbuild-disposition-message/rfc822: inline
+EOF
+
 PGM="`$SEARCHPROG $SEARCHPATH mpeg_play`"
 if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-video/mpeg: %p$PGM %f" >> $TMP
+	echo "mhshow-show-video/mpeg: %l$PGM %f" >> $TMP
 fi
 
 PGM="`$SEARCHPROG $SEARCHPATH okular`"
 if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-application/PostScript: %pokular %F" >> $TMP
+    echo "mhshow-show-application/PostScript: %l$PGM %F" >> $TMP
 else
     PGM="`$SEARCHPROG $SEARCHPATH evince`"
     if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-application/PostScript: %pevince %F" >> $TMP
+	echo "mhshow-show-application/PostScript: %l$PGM %F" >> $TMP
     else
 	PGM="`$SEARCHPROG $SEARCHPATH gv`"
 	if [ ! -z "$PGM" ]; then
-	    echo "mhshow-show-application/PostScript: %pgv %F" >> $TMP
+	    echo "mhshow-show-application/PostScript: %l$PGM %F" >> $TMP
+	fi
+    fi
+fi
+
+PGM="`$SEARCHPROG $SEARCHPATH acroread`"
+if [ ! -z "$PGM" ]; then
+    echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP
+else
+    PGM="`$SEARCHPROG $SEARCHPATH okular`"
+    if [ ! -z "$PGM" ]; then
+	echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP
+    else
+	PGM="`$SEARCHPROG $SEARCHPATH evince`"
+	if [ ! -z "$PGM" ]; then
+	    echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP
+        else
+	    PGM="`$SEARCHPROG $SEARCHPATH xpdf`"
+	    if [ ! -z "$PGM" ]; then
+		echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP
+            else
+	        PGM="`$SEARCHPROG $SEARCHPATH gv`"
+	        if [ ! -z "$PGM" ]; then
+		    echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP
+	        fi
+	    fi
 	fi
     fi
 fi
 
 PGM="`$SEARCHPROG $SEARCHPATH ivs_replay`"
 if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-application/x-ivs: %p$PGM -o %F" >> $TMP
+	echo "mhshow-show-application/x-ivs: %l$PGM -o %F" >> $TMP
 fi
 
 # The application/vnd.openxmlformats-officedocument.wordprocessingml.document
@@ -244,37 +280,36 @@ EOF
 # that another netscape is already running and certain things can't be done).
 PGM="`$SEARCHPROG $SEARCHPATH w3m`"
 if [ ! -z "$PGM" ]; then
-	echo 'mhshow-show-text/html: charset=%{charset}; '"\
-%p$PGM"' "${charset:+-I $charset}" -T text/html %F' >> $TMP
+    echo 'mhshow-show-text/html: charset=%{charset}; '"\
+%l$PGM"' -dump ${charset:+-I "$charset"} -T text/html %F' >> $TMP
 else
-  PGM="`$SEARCHPROG $SEARCHPATH lynx`"
-  if [ ! -z "$PGM" ]; then
-	echo 'mhshow-show-text/html: charset=%{charset}; '"\
-%p$PGM"' -force-html "${charset:+--assume_charset $charset}" %F' >> $TMP
-  else
-    PGM="`$SEARCHPROG $SEARCHPATH elinks`"
+    PGM="`$SEARCHPROG $SEARCHPATH lynx`"
     if [ ! -z "$PGM" ]; then
-      echo "mhshow-show-text/html: $PGM -force-html \
+	echo 'mhshow-show-text/html: charset=%{charset}; '"\
+%l$PGM"' -child -dump -force-html ${charset:+--assume_charset "$charset"} %F' >> $TMP
+    else
+      PGM="`$SEARCHPROG $SEARCHPATH elinks`"
+      if [ ! -z "$PGM" ]; then
+          echo "mhshow-show-text/html: $PGM -dump -force-html \
 -eval 'set document.browse.margin_width = 0' %F" >> $TMP
+      fi
     fi
-  fi
 fi
 
 PGM="`$SEARCHPROG $SEARCHPATH richtext`"
 if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-text/richtext: %p$PGM -p %F" >> $TMP
+	echo "mhshow-show-text/richtext: %l$PGM -p %F" >> $TMP
 else
     PGM="`$SEARCHPROG $SEARCHPATH rt2raw`"
     if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-text/richtext: %p$PGM < %f | fmt -78 | more" >> $TMP
+	echo "mhshow-show-text/richtext: %l$PGM < %f | fmt -78 | more" >> $TMP
     fi
 fi
 
 # staroffice to read .doc files
 PGM="`$SEARCHPROG $SEARCHPATH soffice`"
 if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-application/msword: %psoffice %F" >> $TMP
-	echo "mhshow-suffix-application/msword: .doc" >> $TMP
+	echo "mhshow-show-application/msword: %l$PGM %F" >> $TMP
 fi
 
 # output a sorted version of the file
@@ -282,18 +317,14 @@ sort < $TMP
 
 exit 0
 
-: not until we get a "safe" postscript environment...
 
-PGM="`$SEARCHPROG $SEARCHPATH pageview`"
-if [ "$DISPLAY" = "unix:0.0" -a ! -z "$PGM" ]; then
-    echo "mhshow-show-application/PostScript: %p$PGM -" >> $TMP
-else
-    PGM="`$SEARCHPROG $SEARCHPATH gs`"
-    if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-application/PostScript: %p$PGM -- %F" >> $TMP
-	echo "mhshow-suffix-application/PostScript: .ps" >> $TMP
-    fi
-fi
+###############################################################################
+###############################################################################
+####
+#### Note the exit 0 above; everything below is unused.
+####
+###############################################################################
+###############################################################################
 
 : have to experiment more with this