X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.mailcap;h=a178d7280ab3f76b059a4e4c3be767c95066210d;hb=bc4badca61dbae6dfb7446a9abcaf8ae86883dd0;hp=462200b594ca794af975627e51382a9d50cc2de3;hpb=2e9445458dc40f2b0e302d3d7e8db295ae7b7505;p=dotfiles.git

diff --git a/.mailcap b/.mailcap
index 462200b..a178d72 100644
--- a/.mailcap
+++ b/.mailcap
@@ -16,12 +16,13 @@ application/postscript; gv %s; description="Postscript files"; test=test -n "$DI
 application/postscript; ghostview %s; description="Postscript files"; test=test -n "$DISPLAY" -a -n "`which ghostview 2>/dev/null`"
 application/postscript; pstotext %s; copiousoutput; description="PostScript files"; test=test -n "`which pstotext 2>/dev/null`"
 application/vnd.oasis.opendocument.text; odt2txt %s | less; edit=libreoffice %s; needsterminal; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`" -a -n "`which less 2>/dev/null`"
-application/vnd.oasis.opendocument.text; odt2txt %s | more; edit=libreoffice %s; needsterminal; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`"
+application/vnd.oasis.opendocument.text; odt2txt %s | more; edit=libreoffice %s; needsterminal; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`" -a -n "`which more 2>/dev/null`"
 application/vnd.oasis.opendocument.text; odt2txt %s; copiousoutput; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`"
-application/x-bittorrent; bittorrent.py %s; test=test -n "$DISPLAY" -a -n "`which bittorrent.py 2>/dev/null`"
+application/x-bittorrent; bittorrent.py %s; test=test -n "$DISPLAY" -a -n "`which python 2>/dev/null`" -a -n "`which bittorrent.py 2>/dev/null`"
 application/x-chm; fbreader %s; description="Compiled HTML files"; test=test -n "$DISPLAY" -a -n "`which fbreader 2>/dev/null`"
 application/x-dvi; xdvi %s; description="DVI files"; test=test -n "$DISPLAY" -a -n "`which xdvi 2>/dev/null`"
 application/x-fb2; fbreader %s; description="FicionBook fb2 files"; test=test -n "$DISPLAY" -a -n "`which fbreader 2>/dev/null`"
+application/x-fictionbook+xml; fbreader %s; description="FicionBook fb2 files"; test=test -n "$DISPLAY" -a -n "`which fbreader 2>/dev/null`"
 application/x-fig; xfig %s; description="FIG files"; test=test -n "$DISPLAY" -a -n "`which xfig 2>/dev/null`"
 application/x-tar; tar tvf %s; description="TAR files"; copiousoutput
 
@@ -29,8 +30,10 @@ application/msword; doc2html_web %s; description="M$ Word Text"; test=test -n "`
 application/msword; doc2html1 %s; copiousoutput; description="M$ Word Text"; test=test -n "`which wvHtml 2>/dev/null`" -a -n "`which elinks 2>/dev/null`"
 application/msword; doc2html2 %s; copiousoutput; description="M$ Word Text"; test=test -n "`which wvHtml 2>/dev/null`" -a -n "`which links2 2>/dev/null`"
 application/msword; catdoc %s; copiousoutput; description="M$ Word Text"; test=test -n "`which catdoc 2>/dev/null`"
-application/msword; wordview %s; description="M$ Word Text"; test=test -n "$DISPLAY" -a -n "`which wordview 2>/dev/null`"
+application/msword; wordview %s; edit=libreoffice %s; description="M$ Word Text"; test=test -n "$DISPLAY" -a -n "`which wordview 2>/dev/null`"
 application/vnd.ms-excel; xls2csv %s; copiousoutput; description="M$ Excel files"; test=test -n "`which xls2csv 2>/dev/null`"
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv.py -f utf-8 | less; edit=libreoffice %s; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which python 2>/dev/null`" -a -n "`which iconv.py 2>/dev/null`" -a -n "`which less 2>/dev/null`"
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv.py -f utf-8 | more; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which python 2>/dev/null`" -a -n "`which iconv.py 2>/dev/null`" -a -n "`which more 2>/dev/null`"
 application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s -; copiousoutput; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`"
 
 audio/mpeg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
@@ -93,8 +96,8 @@ image/x-xpm3; display %s; description="XPM image files"; test=test -n "$DISPLAY"
 image/x-xpm3; sxpm %s; description="XPM image files"; test=test -n "$DISPLAY" -a -n "`which sxpm 2>/dev/null`"
 image/*; xli %s; description="Image files"; test=test -n "$DISPLAY" -a -n "`which xli 2>/dev/null`"
 
-text/html; webbrowserX -t "file://`abspath.py %s`"; description="HTML Text"; test=test -n "$DISPLAY"
-text/html; webbrowser -t "file://`abspath.py %s`"; needsterminal; description="HTML Text"
+text/html; webbrowserX -t "file://`abspath.py %s`"; description="HTML Text"; test=test -n "$DISPLAY" -a -n "`which python 2>/dev/null`" -a -n "`which abspath.py 2>/dev/null`"
+text/html; webbrowser -t "file://`abspath.py %s`"; needsterminal; description="HTML Text" -a -n "`which python 2>/dev/null`" -a -n "`which abspath.py 2>/dev/null`"
 text/html; webdump %s; copiousoutput; description="HTML Text"; test=test -n "`which elinks 2>/dev/null`"
 text/html; webdump2 %s; copiousoutput; description="HTML Text"; test=test -n "`which links2 2>/dev/null`"
 text/html; xlinks2 -force-html %s; description="HTML Text"; test=test -n "$DISPLAY" -a -n "`which links2 2>/dev/null`"
@@ -129,4 +132,5 @@ video/*; mplayer %s; description="Video files"; test=test -n "$DISPLAY" -a -n "`
 x-world/x-vrml; freewrl -url %s; test=test -n "$DISPLAY" -a -n "`which freewrl 2>/dev/null`"; description="VRML world"; nametemplate=%s.wrl
 
 */*; less %s; needsterminal; test=test -n "`which less 2>/dev/null`"
+*/*; more %s; needsterminal; test=test -n "`which more 2>/dev/null`"
 */*; cat -vT %s; copiousoutput