X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/63764e68d4fce20854dc2ba18a7244cb6a6769ca..a12d28cdfd69f447a8cf5815ce5a84284788b86e:/etc/mhn.defaults.sh diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh index 6bc01247..7e9ca564 100755 --- a/etc/mhn.defaults.sh +++ b/etc/mhn.defaults.sh @@ -27,13 +27,16 @@ 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 + echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\ +"'w3m -dump -T text/html "${charset:+-I $charset}" -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' | \ + echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\ +"'lynx -child -dump -force_html "${charset:+--assume_charset $charset}" %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 @@ -58,7 +61,7 @@ fi PGM="`$SEARCHPROG $SEARCHPATH xv`" if [ ! -z "$PGM" ]; then - echo "mhshow-show-image: %p$PGM -geometry =-0+0 '%f'" >> $TMP + echo "mhshow-show-image: %p$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 @@ -76,7 +79,7 @@ if [ -f "/dev/audioIU" ]; then PGM="`$SEARCHPROG $SEARCHPATH recorder`" 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 "mhbuild-compose-audio/basic: ${AUDIODIR}recorder %f -au -pause > /dev/tty" >> $TMP echo "mhshow-show-audio/basic: %p${AUDIODIR}splayer -au" >> $TMP fi elif [ -f "/dev/audio" ]; then @@ -87,7 +90,7 @@ elif [ -f "/dev/audio" ]; then echo "mhstore-store-audio/x-next: %m%P.au" >> $TMP AUDIOTOOL="`$SEARCHPROG $SEARCHPATH audiotool`" if [ ! -z "$AUDIOTOOL" ]; then - echo "mhbuild-compose-audio/basic: $AUDIOTOOL '%f' && ${AUDIODIR}raw2audio -F < '%f'" >> $TMP + echo "mhbuild-compose-audio/basic: $AUDIOTOOL %f && ${AUDIODIR}raw2audio -F < %f" >> $TMP else echo "mhbuild-compose-audio/basic: trap \"exit 0\" 2 && ${AUDIODIR}record | ${AUDIODIR}raw2audio -F" >> $TMP fi @@ -97,14 +100,14 @@ elif [ -f "/dev/audio" ]; then if [ ! -z "$PGM" ]; then DIR="`echo $PGM | awk -F/ '{ for(i=2;i> $TMP + echo "mhbuild-compose-audio/x-next: $AUDIOTOOL %f && ${DIR}adpcm_enc < %f" >> $TMP 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 else if [ ! -z "$AUDIOTOOL" ]; then - echo "mhbuild-compose-audio/x-next: $AUDIOTOOL '%f'" >> $TMP + echo "mhbuild-compose-audio/x-next: $AUDIOTOOL %f" >> $TMP else echo "mhbuild-compose-audio/x-next: ${AUDIODIR}record" >> $TMP fi @@ -118,27 +121,35 @@ fi PGM="`$SEARCHPROG $SEARCHPATH mpeg_play`" if [ ! -z "$PGM" ]; then - echo "mhshow-show-video/mpeg: %p$PGM '%f'" >> $TMP + 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 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: %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 <> ${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 +160,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,23 +239,30 @@ 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: charset=%{charset}; '"\ +%p$PGM"' -force-html "${charset:+--assume_charset $charset}" %F' >> $TMP +else + 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 + 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: %p$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: %p$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-show-application/msword: %psoffice %F" >> $TMP echo "mhshow-suffix-application/msword: .doc" >> $TMP fi @@ -239,7 +279,7 @@ if [ "$DISPLAY" = "unix:0.0" -a ! -z "$PGM" ]; then else PGM="`$SEARCHPROG $SEARCHPATH gs`" if [ ! -z "$PGM" ]; then - echo "mhshow-show-application/PostScript: %p$PGM -- '%F'" >> $TMP + echo "mhshow-show-application/PostScript: %p$PGM -- %F" >> $TMP echo "mhshow-suffix-application/PostScript: .ps" >> $TMP fi fi @@ -248,5 +288,5 @@ fi PGM="`$SEARCHPROG $SEARCHPATH ivs_record`" if [ ! -z "$PGM" ]; then - echo "mhbuild-compose-application/x-ivs: $PGM -u localhost '%F'" >> $TMP + echo "mhbuild-compose-application/x-ivs: $PGM -u localhost %F" >> $TMP fi