X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.py;h=97cd5e006cdffe0843ce9a0a3987c3b694f21f8a;hb=c5ca33dd61063933055b4970faef3b641d22e278;hp=242b61f65f587a1ec38bbcbeebefb7bccd6f525d;hpb=933173db26d7eb8709cd8d0db33e3d09a82f5e70;p=lyx.git

diff --git a/lib/configure.py b/lib/configure.py
index 242b61f65f..97cd5e006c 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -238,8 +238,8 @@ def checkFormatEntries(dtl_tools):
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp'])
-    path, ie = checkViewer('a raster image editor', ['gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
 \Format jpg        jpg     JPEG                   "" "%s"	"%s"	""
@@ -289,7 +289,7 @@ def checkFormatEntries(dtl_tools):
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	"document,vector"')
     #
-    checkViewer('an HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],
@@ -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   "%%"	""' ])
+        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"' ])
@@ -409,15 +417,8 @@ def checkConverterEntries():
     checkProg('an EPS -> PDF converter', ['epstopdf'],
         rc_entry = [ r'\converter eps        pdf        "epstopdf --outfile=$$o $$i"	""', ''])
     #
-    path, convert = checkProg('a PDF -> PNG converter', ['convert'])
-    if convert != '':
-        # check whether convert supports the -define option
-        conv_opts = "-define pdf:use-cropbox=true -depth 8"
-        if not 'Unrecognized' in cmdOutput('convert ' + conv_opts + ' 2>&1'):
-            addToRC(r'\converter pdf        png        "convert %s pdf:$$i png:$$o"	""' % conv_opts)
-    #
     # no agr -> pdf converter, since the pdf library used by gracebat is not
-    # free software and therefore not compiled in many installations.
+    # free software and therefore not compiled in in many installations.
     # Fortunately, this is not a big problem, because we will use epstopdf to
     # convert from agr to pdf via eps without loss of quality.
     checkProg('a Grace -> Image converter', ['gracebat'],
@@ -430,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 != ''):