From 364f49d04b6f9bf4fa47bac347a6f1579b5a45d0 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Tue, 31 Jul 2007 17:18:02 +0000
Subject: [PATCH] [2085] Get OpenDocument export working when htlatex is
 available but oolatex is not. Also check for oowriter as an ODT viewer.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19260 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/configure.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index f9ace18d39..093b286744 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -295,6 +295,9 @@ def checkFormatEntries(dtl_tools):
     checkViewer('Noteedit', ['noteedit'],
         rc_entry = [r'\Format noteedit   not     Noteedit               "" "%%"	"%%"	"vector"'])
     #
+    checkViewer('an OpenDocument viewer', ['oowriter'],
+        rc_entry = [r'\Format odt        odt     OpenDocument           "" "%%"	"%%"	"document,vector"'])
+    #
     # entried that do not need checkProg
     addToRC(r'''\Format date       ""     "date command"          "" ""	""	""
 \Format fax        ""      Fax                    "" ""	""	"document"
@@ -310,7 +313,6 @@ def checkFormatEntries(dtl_tools):
 \Format pstex      pstex_t PSTEX                  "" ""	""	""
 \Format rtf        rtf    "Rich Text Format"      "" ""	""	"document,vector"
 \Format sxw        sxw    "OpenOffice.Org (sxw)"  ""  ""	""	"document,vector"
-\Format odt        odt    "Open Document"         O   ""	""	"document,vector"
 \Format wmf        wmf    "Windows Metafile"      "" ""	""	"vector"
 \Format emf        emf    "Enhanced Metafile"     "" ""	""	"vector"
 \Format word       doc    "MS Word"               W  ""	""	"document,vector"
@@ -368,8 +370,8 @@ def checkConverterEntries():
     checkProg('an OpenDocument -> LaTeX converter', ['w2l -clean $$i'],
         rc_entry = [ r'\converter odt        latex      "%%"	""' ])
     #
-    checkProg('a LaTeX -> Open Document converter', ['oolatex $$i', 'oolatex.sh $$i'],
-        rc_entry = [ r'\converter latex      odt        "%%"	"latex"' ])
+    checkProg('a LaTeX -> Open Document converter', ['oolatex $$i', 'oolatex.sh $$i', 'htlatex $$i \'xhtml,ooffice\' \'ooffice/! -cmozhtf\' \'-coo\' \'-cvalidate\''],
+        rc_entry = [ r'\converter latex      odt        "%%"	"needaux"' ])
     # On windows it is called latex2rt.exe
     checkProg('a LaTeX -> RTF converter', ['latex2rtf -p -S -o $$o $$i', 'latex2rt -p -S -o $$o $$i'],
         rc_entry = [ r'\converter latex      rtf        "%%"	"needaux"' ])