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

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 6bc01247..810b35c8 100755
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -33,7 +33,8 @@ elif [ ! -z "`$SEARCHPROG $SEARCHPATH lynx`" ]; then
   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 '%F'" >> $TMP
+  echo "mhfixmsg-format-text/html: elinks -dump -force-html -no-numbering \
+-eval 'set document.browse.margin_width = 0' '%F'" >> $TMP
 fi
 
 
@@ -121,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`"
+    PGM="`$SEARCHPROG $SEARCHPATH evince`"
     if [ ! -z "$PGM" ]; then
-	echo "mhshow-show-application/PostScript: %plp -dps" >> $TMP
+	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
 
@@ -136,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
@@ -149,13 +158,35 @@ 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/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
@@ -206,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`"