mc.ext: comment out old doc handlers, create new include/msoffice

diff --git a/.mc/mc.ext b/.mc/mc.ext
index 6a91d165067447bd2b240346e57d5d1374d96720..e5c6fb7748f095810b6dbfa2b0941ae2c00972ea 100644 (file)
--- a/.mc/mc.ext
+++ b/.mc/mc.ext
@@ -441,10 +441,10 @@ include/oldimage
 #regex/\.([wW][mM][aA])$
 #      Open=mplayer -vo null %f
 #      View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
-
-
-### Play lists ###
-
+#
+#
+#### Play lists ###
+#
 #regex/\.([mM]3[uU]|[pP][lL][sS])$
 #      Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
 
@@ -533,14 +533,14 @@ shell/.abw
        Open=(abiword %f &)
 
 # Microsoft Word Document
-regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
-       Open=(abiword %f >/dev/null 2>&1 &)
-       View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
-type/^Microsoft\ Word
-       Open=(abiword %f >/dev/null 2>&1 &)
-       View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
-
-# RTF document
+#regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+#      Open=(abiword %f >/dev/null 2>&1 &)
+#      View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+#type/^Microsoft\ Word
+#      Open=(abiword %f >/dev/null 2>&1 &)
+#      View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+#
+## RTF document
 #regex/\.([rR][tT][fF])$
 #      Open=(abiword %f >/dev/null 2>&1 &)
 
@@ -553,8 +553,8 @@ type/^Microsoft\ Excel
        View=%view{ascii} xls2csv %f || strings %f
 
 # Use OpenOffice.org to open any MS Office documents
-type/^Microsoft\ Office\ Document
-       Open=(libreoffice %f &)
+#type/^Microsoft\ Office\ Document
+#      Open=(libreoffice %f &)
 
 # Framemaker
 type/^FrameMaker
@@ -709,6 +709,18 @@ regex/\.([rR][tT][fF])$
    Open=fbreader %f &
    View=%view{ascii} catdoc %f
 
+regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+   Include=msoffice
+
+type/^Microsoft\ Word
+   Include=msoffice
+
+type/^Microsoft\ Office\ Document
+   Include=msoffice
+
+type/^Composite\ Document\ File
+   Include=msoffice
+
 # ftplist
 regex/\.ftplist$
    Open=%cd %p#ftplist
@@ -757,6 +769,10 @@ include/audio
    #Open=mediaplayer_open %f
    View=%view{ascii} %f
 
+include/msoffice
+   Open=libreoffice %f &
+   View=%view{ascii} catdoc %f
+
 include/video
    Open=smplay %f &
    #Open=mediaplayer_open %f