--- mc/lib/mc.ext.in.orig	2008-06-11 23:37:55 +0600

+++ mc/lib/mc.ext.in	2008-08-10 02:01:08 +0600

@@ -111,6 +111,11 @@ regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk$

 	Open=%cd %p#utar

 	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -

+# .war

+regex/\.war$

+	Open=%cd %p#utar

+	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -

+

 regex/\.tar\.bz$

 	# Open=%cd %p#utar

 	View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -

@@ -152,7 +157,7 @@ regex/\.([Hh][Aa])$

 # rar

 regex/\.[rR]([aA][rR]|[0-9][0-9])$

 	Open=%cd %p#urar

-	View=%view{ascii} rar v -c- %f

+	View=%view{ascii} unrar l -v -c- %f

 # ALZip

 regex/\.(alz|ALZ)$

@@ -209,10 +214,10 @@ regex/\.iso$

 # 7zip archives (they are not man pages)

 shell/.7z

 	Open=%cd %p#u7z

-	View=%view{ascii} 7za l %f 2>/dev/null

+	View=%view{ascii} 7z l %f 2>/dev/null

 # Mailboxes

-type/^ASCII\ mail\ text

+type/mail\ text

 	Open=%cd %p#mailfs

@@ -220,15 +225,15 @@ type/^ASCII\ mail\ text

 # C

 shell/.c

-	Open=%var{EDITOR:vi} %f

+	Include=editor

 # Fortran

 shell/.f

-	Open=%var{EDITOR:vi} %f

+	Include=editor

 # Header

 regex/\.(h|hpp)$

-	Open=%var{EDITOR:vi} %f

+	Include=editor

 # Object

 type/^ELF

@@ -236,11 +241,14 @@ type/^ELF

 	View=%view{ascii} file %f && nm %f

 # Asm

-shell/.s

-	Open=%var{EDITOR:vi} %f

+regex/\.([Ss]|[Aa]sm|ASM)$

+	Include=editor

 # C++

 regex/\.(C|cc|cpp)$

+	Include=editor

+

+include/editor

 	Open=%var{EDITOR:vi} %f

@@ -260,6 +268,9 @@ shell/.info

 # Exception - .so libraries are not manual pages

 regex/\.(so|so\.[0-9\.]*)$

 	View=%view{ascii} file %f && nm %f

+# Exception - .3gp are video files

+regex/\.(3[gG][pP])$

+	Include=video

 regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$

 	Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac | %var{PAGER:more}

@@ -305,6 +316,7 @@ type/^GIF

 	Include=image

 type/^JPEG

+	View=%view{ascii} identify %f; test -x /usr/bin/exif && echo && exif %f 2>/dev/null

 	Include=image

 type/^PC\ bitmap

@@ -328,18 +340,24 @@ type/^PPM

 type/^Netpbm

 	Include=image

+type/^JNG

+	Include=image

+

+type/^MNG

+	Include=image

+

 shell/.xcf

 	Open=(gimp %f &)

 shell/.xbm

-	Open=bitmap %f

+	Include=image

 shell/.xpm

 	Include=image

 	View=sxpm %f

 include/image

-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi

+	Open=if [ "$DISPLAY" = "" ]; then fbv %f; else (qiv %f &); fi

 	View=%view{ascii} identify %f

 	#View=%view{ascii} asciiview %f

@@ -389,6 +407,9 @@ regex/\.([aA][sS][fFxX])$

 regex/\.([dD][iI][vV][xX])$

 	Include=video

+regex/\.([mM][kK][vV])$

+	Include=video

+

 regex/\.([mM][oO][vV]|[qQ][tT])$

 	Include=video

@@ -408,10 +429,11 @@ regex/\.([oO][gG][mM])$

 	Include=video

 regex/\.([rR][aA]?[mM])$

-	Open=(realplay %f >/dev/null 2>&1 &)

+	Include=video

 include/video

-	Open=(mplayer %f >/dev/null 2>&1 &)

+	Open=if which mplayer >/dev/null 2>&1; then (mplayer %f >/dev/null 2>&1 &); else (xine --no-splash -ph %f >/dev/null 2>&1 &); fi

+	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'

 	#Open=(gtv %f >/dev/null 2>&1 &)

 	#Open=(xanim %f >/dev/null 2>&1 &)

@@ -435,8 +457,8 @@ type/^PDF

 # html

 regex/\.([hH][tT][mM][lL]?)$

-	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null

-	View=%view{ascii} lynx -dump -force_html %f

+  	Open=if test -n "$BROWSER" && test -n "$DISPLAY"; then ($BROWSER file://%d/%p &) >/dev/null 2>&1; else links %f 2>/dev/null || lynx -force_html %f || ${PAGER:-more} %f; fi

+  	View=%view{ascii} links -dump %f

 # StarOffice 5.2

 shell/.sdw

@@ -453,28 +475,38 @@ shell/.abw

 # Microsoft Word Document

 regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$

-	Open=(abiword %f >/dev/null 2>&1 &)

+	Open=(ooffice %f &)

+	#Open=(abiword %f >/dev/null 2>&1 &)

 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f

 type/^Microsoft\ Word

-	Open=(abiword %f >/dev/null 2>&1 &)

+	Open=(ooffice %f &)

+	#Open=(abiword %f >/dev/null 2>&1 &)

 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f

 # RTF document

 regex/\.([rR][tT][fF])$

-	Open=(abiword %f >/dev/null 2>&1 &)

+	Open=(ooffice %f &)

+	#Open=(abiword %f >/dev/null 2>&1 &)

+	View=%view{ascii} catdoc -w %f

 # Microsoft Excel Worksheet

 regex/\.([xX][lL][sSwW])$

-	Open=(gnumeric %f >/dev/null 2>&1 &)

+	Open=(ooffice %f &)

+	#Open=(gnumeric %f >/dev/null 2>&1 &)

 	View=%view{ascii} xls2csv %f || strings %f

 type/^Microsoft\ Excel

-	Open=(gnumeric %f >/dev/null 2>&1 &)

+	Open=(ooffice %f &)

+	#Open=(gnumeric %f >/dev/null 2>&1 &)

 	View=%view{ascii} xls2csv %f || strings %f

 # Use OpenOffice.org to open any MS Office documents

 type/^Microsoft\ Office\ Document

 	Open=(ooffice %f &)

+# gnumeric

+regex/\.(gnumeric)$

+        Open=gnumeric %f

+

 # Framemaker

 type/^FrameMaker

 	Open=fmclient -f %f

@@ -545,6 +577,29 @@ type/^compress

 	Open=gzip -dc %f | %var{PAGER:more}

 	View=%view{ascii} gzip -dc %f 2>/dev/null

+### ALT additions ###

+

+# lyx

+regex/\.(lyx|LYX)$

+	Open=lyx %f

+	View=%view{ascii} lyxcat %f

+

+# svg

+regex/\.(svg|SVG)$

+	Open=sodipodi %f

+	View=display %f

+

+# Gettext Catalogs

+shell/.mo

+	View=%view{ascii} msgunfmt %f || cat %f

+

+# CHM

+regex/\.(chm|CHM)$

+	Open=which kchmviewer > /dev/null 2>&1 && (kchmviewer %f &) || (xchm %f &)

+

+# DjVu

+regex/\.(djvu|DJVU)$

+	Open=djview %f &

 ### Default ###