X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.py;h=97cd5e006cdffe0843ce9a0a3987c3b694f21f8a;hb=c5ca33dd61063933055b4970faef3b641d22e278;hp=5e8daba13b41cb8ba14d3307ccbe1a72e17dc402;hpb=119400e4b3fd29ffcd07f1c8648f24c4eec547dd;p=lyx.git

diff --git a/lib/configure.py b/lib/configure.py
index 5e8daba13b..97cd5e006c 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -309,7 +309,8 @@ def checkFormatEntries(dtl_tools):
 \Format program    ""      Program                "" ""	""	""
 \Format pstex      pstex_t PSTEX                  "" ""	""	""
 \Format rtf        rtf    "Rich Text Format"      "" ""	""	"document,vector"
-\Format sxw        sxw    "OpenOffice.Org Writer" O  ""	""	"document,vector"
+\Format sxw        sxw    "OpenOffice.Org (sxw)"  ""  ""	""	"document,vector"
+\Format odt        odt    "Open Document"         O   ""	""	"document,vector"
 \Format wmf        wmf    "Windows Meta File"     "" ""	""	"vector"
 \Format word       doc    "MS Word"               W  ""	""	"document,vector"
 \Format wordhtml   html   "HTML (MS Word)"        "" ""        ""	"document"
@@ -347,13 +348,20 @@ def checkConverterEntries():
         rc_entry = [ r'\converter word       latex      "%%"	""' ])
     #
     checkProg('a LaTeX -> MS Word converter', ["htlatex $$i 'html,word' 'symbol/!' '-cvalidate'"],
-        rc_entry = [ r'\converter latex      wordhtml   "%%"	"originaldir,needaux"' ])
+        rc_entry = [ r'\converter latex      wordhtml   "%%"	"needaux"' ])
     #
     checkProg('an OpenOffice.org -> LaTeX converter', ['w2l -clean $$i'],
         rc_entry = [ r'\converter sxw        latex      "%%"	""' ])
     #
-    checkProg('a LaTeX -> OpenOffice.org converter', ['oolatex $$i', 'oolatex.sh $$i'],
-        rc_entry = [ r'\converter latex      sxw        "%%"	"latex"' ])
+    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"' ])
+    #
+    #FIXME Looking for the commands needed to make oolatex output sxw instad of odt...
+    #checkProg('a LaTeX -> OpenOffice.org (sxw) converter', ['oolatex $$i', 'oolatex.sh $$i'],
+    #    rc_entry = [ r'\converter latex      odt        "%%"	"latex"' ])
     # 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"' ])
@@ -423,7 +431,7 @@ def checkConverterEntries():
     #
     checkProg('a LaTeX -> HTML converter', ['htlatex $$i', 'tth  -t -e2 -L$$b < $$i > $$o', \
         'latex2html -no_subdir -split 0 -show_section_numbers $$i', 'hevea -s $$i'],
-        rc_entry = [ r'\converter latex      html       "%%"	"originaldir,needaux"' ])
+        rc_entry = [ r'\converter latex      html       "%%"	"needaux"' ])
     #
     path, lilypond = checkProg('a LilyPond -> EPS/PDF/PNG converter', ['lilypond'])
     if (lilypond != ''):