X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f5d8200783f132f760b2ecda6358cdc0180f677b..dcc9cd2b4c50e00722ee5b331e2d37c4567dd670:/etc/mhn.defaults.sh

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 97774a7f..810b35c8 100755
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -25,6 +25,19 @@ fi
 TMP=/tmp/nmh_temp.$$
 trap "rm -f $TMP" 0 1 2 3 13 15
 
+
+if [ ! -z "`$SEARCHPROG $SEARCHPATH w3m`" ]; then
+  echo "mhfixmsg-format-text/html: w3m -dump -T text/html -O utf-8 '%F'" >> $TMP
+elif [ ! -z "`$SEARCHPROG $SEARCHPATH lynx`" ]; then
+  #### lynx indents with 3 spaces, remove them and any trailing spaces.
+  echo "mhfixmsg-format-text/html: lynx -child -dump -force_html '%F' | \
+expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
+elif [ ! -z "`$SEARCHPROG $SEARCHPATH elinks`" ]; then
+  echo "mhfixmsg-format-text/html: elinks -dump -force-html -no-numbering \
+-eval 'set document.browse.margin_width = 0' '%F'" >> $TMP
+fi
+
+
 echo "mhstore-store-text: %m%P.txt" >> $TMP
 echo "mhstore-store-text/richtext: %m%P.rt" >> $TMP
 echo "mhstore-store-video/mpeg: %m%P.mpg" >> $TMP
@@ -37,26 +50,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
 
@@ -109,13 +122,18 @@ if [ ! -z "$PGM" ]; then
 	echo "mhshow-show-video/mpeg: %p$PGM '%f'" >> $TMP
 fi
 
-PGM="`$SEARCHPROG $SEARCHPATH lpr`"
+PGM="`$SEARCHPROG $SEARCHPATH okular`"
 if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-application/PostScript: %plpr -Pps" >> $TMP
+	echo "mhshow-show-application/PostScript: %pokular '%F'" >> $TMP
 else
-    PGM="`$SEARCHPROG $SEARCHPATH lp`"
-    if [ ! -z "$PGM" ]; then    
-	echo "mhshow-show-application/PostScript: %plp -dps" >> $TMP
+    PGM="`$SEARCHPROG $SEARCHPATH evince`"
+    if [ ! -z "$PGM" ]; then
+	echo "mhshow-show-application/PostScript: %pevince '%F'" >> $TMP
+    else
+	PGM="`$SEARCHPROG $SEARCHPATH gv`"
+	if [ ! -z "$PGM" ]; then
+	    echo "mhshow-show-application/PostScript: %pgv '%F'" >> $TMP
+	fi
     fi
 fi
 
@@ -124,9 +142,12 @@ if [ ! -z "$PGM" ]; then
 	echo "mhshow-show-application/x-ivs: %p$PGM -o '%F'" >> $TMP
 fi
 
+# The application/vnd.openxmlformats-officedocument.wordprocessingml.document
+# through application/onenote associations are from
+# http://technet.microsoft.com/en-us/library/cc179224.aspx
+
 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
@@ -143,6 +164,29 @@ 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/vnd.openxmlformats-officedocument.wordprocessingml.document: .docx
+mhshow-suffix-application/vnd.ms-word.document.macroEnabled.12: .docm
+mhshow-suffix-application/vnd.openxmlformats-officedocument.wordprocessingml.template: .dotx
+mhshow-suffix-application/vnd.ms-word.template.macroEnabled.12: .dotm
+mhshow-suffix-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: .xlsx
+mhshow-suffix-application/vnd.ms-excel.sheet.macroEnabled.12: .xlsm
+mhshow-suffix-application/vnd.openxmlformats-officedocument.spreadsheetml.template: .xltx
+mhshow-suffix-application/vnd.ms-excel.template.macroEnabled.12: .xltm
+mhshow-suffix-application/vnd.ms-excel.sheet.binary.macroEnabled.12: .xlsb
+mhshow-suffix-application/vnd.ms-excel.addin.macroEnabled.12: .xlam
+mhshow-suffix-application/vnd.openxmlformats-officedocument.presentationml.presentation: .pptx
+mhshow-suffix-application/vnd.ms-powerpoint.presentation.macroEnabled.12: .pptm
+mhshow-suffix-application/vnd.openxmlformats-officedocument.presentationml.slideshow: .ppsx
+mhshow-suffix-application/vnd.ms-powerpoint.slideshow.macroEnabled.12: .ppsm
+mhshow-suffix-application/vnd.openxmlformats-officedocument.presentationml.template: .potx
+mhshow-suffix-application/vnd.ms-powerpoint.template.macroEnabled.12: .potm
+mhshow-suffix-application/vnd.ms-powerpoint.addin.macroEnabled.12: .ppam
+mhshow-suffix-application/vnd.openxmlformats-officedocument.presentationml.slide: .sldx
+mhshow-suffix-application/vnd.ms-powerpoint.slide.macroEnabled.12: .sldm
+mhshow-suffix-application/onenote: .onetoc
+mhshow-suffix-application/onenote: .onetoc2
+mhshow-suffix-application/onenote: .onetmp
+mhshow-suffix-application/onenote: .onepkg
 mhshow-suffix-application/x-bzip2: .bz2
 mhshow-suffix-application/x-cpio: .cpio
 mhshow-suffix-application/x-dvi: .dvi
@@ -193,7 +237,12 @@ EOF
 # that another netscape is already running and certain things can't be done).
 PGM="`$SEARCHPROG $SEARCHPATH lynx`"
 if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-text/html: %p$PGM '%F'" >> $TMP
+	echo "mhshow-show-text/html: %p$PGM -force-html '%F'" >> $TMP
+else
+  PGM="`$SEARCHPROG $SEARCHPATH w3m`"
+  if [ ! -z "$PGM" ]; then
+	echo "mhshow-show-text/html: %p$PGM -T text/html '%F'" >> $TMP
+  fi
 fi
 
 PGM="`$SEARCHPROG $SEARCHPATH richtext`"