X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=etc%2Fmhn.defaults.sh;h=4142f4cbc6f920e1c5e0fc273321b4d52b4ca900;hb=25e812757fa325d017b47144923dcad62b66399d;hp=0db5d3ae1d133b18991e2e19f0532e98fef7f38b;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 0db5d3a..4142f4c 100755
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -37,26 +37,26 @@ else
     XWUD= X11DIR=
 fi
 
-PGM="`$SEARCHPROG $SEARCHPATH pbmtoxwd`"
+PGM="`$SEARCHPROG $SEARCHPATH pnmtoxwd`"
 if [ ! -z "$PGM" ]; then
-    PBM="$PGM" PBMDIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
+    NETPBM="$PGM" NETPBMDIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
 else
-    PBM= PBMDIR=
+    NETPBM= NETPBMDIR=
 fi
 
 PGM="`$SEARCHPROG $SEARCHPATH xv`"
 if [ ! -z "$PGM" ]; then
     echo "mhshow-show-image: %p$PGM -geometry =-0+0 '%f'" >> $TMP
-elif [ ! -z $"PBM" -a ! -z "$XWUD" ]; then
-    echo "mhshow-show-image/gif: %p${PBMDIR}giftoppm | ${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pbm: %p${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pgm: %p${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-ppm: %p${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $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
 
     PGM="`$SEARCHPROG $SEARCHPATH djpeg`"
     if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-image/jpeg: %p$PGM -Pg | ${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+	echo "mhshow-show-image/jpeg: %p$PGM -Pg | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
     fi
 fi
 
@@ -114,7 +114,7 @@ if [ ! -z "$PGM" ]; then
 	echo "mhshow-show-application/PostScript: %plpr -Pps" >> $TMP
 else
     PGM="`$SEARCHPROG $SEARCHPATH lp`"
-    if [ ! -z "$PGM" ]; then    
+    if [ ! -z "$PGM" ]; then
 	echo "mhshow-show-application/PostScript: %plp -dps" >> $TMP
     fi
 fi
@@ -124,7 +124,69 @@ if [ ! -z "$PGM" ]; then
 	echo "mhshow-show-application/x-ivs: %p$PGM -o '%F'" >> $TMP
 fi
 
-echo "mhshow-suffix-text/html: .html" >> $TMP
+cat <<EOF >> ${TMP}
+mhshow-suffix-application/msword: .doc
+mhshow-suffix-application/msword: .docx
+mhshow-suffix-application/ogg: .ogg
+mhshow-suffix-application/pdf: .pdf
+mhshow-suffix-application/postscript: .ps
+mhshow-suffix-application/rtf: .rtf
+mhshow-suffix-application/vnd.ms-excel: .xla
+mhshow-suffix-application/vnd.ms-excel: .xlc
+mhshow-suffix-application/vnd.ms-excel: .xld
+mhshow-suffix-application/vnd.ms-excel: .xll
+mhshow-suffix-application/vnd.ms-excel: .xlm
+mhshow-suffix-application/vnd.ms-excel: .xls
+mhshow-suffix-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: .xlsx
+mhshow-suffix-application/vnd.ms-excel: .xlt
+mhshow-suffix-application/vnd.ms-excel: .xlw
+mhshow-suffix-application/vnd.ms-powerpoint: .pot
+mhshow-suffix-application/vnd.ms-powerpoint: .pps
+mhshow-suffix-application/vnd.ms-powerpoint: .ppt
+mhshow-suffix-application/vnd.ms-powerpoint: .ppz
+mhshow-suffix-application/x-bzip2: .bz2
+mhshow-suffix-application/x-cpio: .cpio
+mhshow-suffix-application/x-dvi: .dvi
+mhshow-suffix-application/x-gzip: .gz
+mhshow-suffix-application/x-java-archive: .jar
+mhshow-suffix-application/x-javascript: .js
+mhshow-suffix-application/x-latex: .latex
+mhshow-suffix-application/x-sh: .sh
+mhshow-suffix-application/x-tar: .tar
+mhshow-suffix-application/x-texinfo: .texinfo
+mhshow-suffix-application/x-tex: .tex
+mhshow-suffix-application/x-troff-man: .man
+mhshow-suffix-application/x-troff-me: .me
+mhshow-suffix-application/x-troff-ms: .ms
+mhshow-suffix-application/x-troff: .t
+mhshow-suffix-application/zip: .zip
+mhshow-suffix-audio/basic: .au
+mhshow-suffix-audio/midi: .midi
+mhshow-suffix-audio/mpeg: .mp3
+mhshow-suffix-audio/mpeg: .mpg
+mhshow-suffix-audio/x-ms-wma: .wma
+mhshow-suffix-audio/x-wav: .wav
+mhshow-suffix-image/gif: .gif
+mhshow-suffix-image/jpeg: .jpeg
+mhshow-suffix-image/jpeg: .jpg
+mhshow-suffix-image/png: .png
+mhshow-suffix-image/tiff: .tif
+mhshow-suffix-image/tiff: .tiff
+mhshow-suffix-text/calendar: .ics
+mhshow-suffix-text/css: .css
+mhshow-suffix-text/html: .html
+mhshow-suffix-text/rtf: .rtf
+mhshow-suffix-text/sgml: .sgml
+mhshow-suffix-text/xml: .xml
+mhshow-suffix-video/mpeg: .mpeg
+mhshow-suffix-video/mpeg: .mpg
+mhshow-suffix-video/quicktime: .moov
+mhshow-suffix-video/quicktime: .mov
+mhshow-suffix-video/quicktime: .qt
+mhshow-suffix-video/quicktime: .qtvr
+mhshow-suffix-video/x-msvideo: .avi
+mhshow-suffix-video/x-ms-wmv: .wmv
+EOF
 
 # I'd like to check if netscape is available and use it preferentially to lynx,
 # but only once I've added a new %-escape that makes more permanent temp files,