From: Oleg Broytman Date: Wed, 12 Nov 2014 14:30:22 +0000 (+0300) Subject: Use iconv.py instead of iconv X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=6365557405ebe68d880b0d51f565416a2501aa07;p=dotfiles.git Use iconv.py instead of iconv --- diff --git a/.mailcap b/.mailcap index 1a2074a..b667ff8 100644 --- a/.mailcap +++ b/.mailcap @@ -31,7 +31,7 @@ application/msword; doc2html2 %s; copiousoutput; description="M$ Word Text"; tes application/msword; catdoc %s; copiousoutput; description="M$ Word Text"; test=test -n "`which catdoc 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 -f utf-8 | less; edit=libreoffice %s; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which iconv 2>/dev/null`" -a -n "`which less 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 iconv.py 2>/dev/null`" -a -n "`which less 2>/dev/null`" application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | more; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 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`" diff --git a/.mc/mc.ext b/.mc/mc.ext index 2f9d08b..ce6b166 100644 --- a/.mc/mc.ext +++ b/.mc/mc.ext @@ -716,7 +716,7 @@ regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$ regex/\.([Dd][oO][cC][Xx])$ Edit=libreoffice %f & Open=libreoffice %f & - View=%view{ascii} docx2txt %f - | iconv -f utf-8 + View=%view{ascii} docx2txt %f - | iconv.py -f utf-8 type/^Microsoft\ Word Include=msoffice diff --git a/.mc/menu b/.mc/menu index 7a303a7..c3b6786 100644 --- a/.mc/menu +++ b/.mc/menu @@ -79,7 +79,7 @@ e Edit doc with libreoffice += t r & f \.(docx|DOCX)$ d View docx with docx2txt - docx2txt %f - | iconv -f utf-8 | ${PAGER:-more} + docx2txt %f - | iconv.py -f utf-8 | ${PAGER:-more} + t r & f \.(docx|DOCX)$ e Edit docx with libreoffice