Author: sanda
Date: Tue Jan 25 11:26:29 2011
New Revision: 37321
URL: http://www.lyx.org/trac/changeset/37321

Log:
MS Word converter -> HTML (MS Word) converter
Patch from Alex Fernandez.

Modified:
   lyx-devel/trunk/lib/configure.py

Modified: lyx-devel/trunk/lib/configure.py
==============================================================================
--- lyx-devel/trunk/lib/configure.py    Tue Jan 25 00:58:58 2011        (r37320)
+++ lyx-devel/trunk/lib/configure.py    Tue Jan 25 11:26:29 2011        (r37321)
@@ -642,19 +642,14 @@
     path, elyxer = checkProg('a LyX -> HTML converter',
         ['elyxer.py --directory $$r $$i $$o', 'elyxer --directory $$r $$i 
$$o'],
         rc_entry = [ r'\converter lyx      html       "%%"     ""' ])
-    path, elyxer = checkProg('a LyX -> MS Word converter',
-        ['elyxer.py --directory $$r $$i $$o', 'elyxer --html --directory $$r 
$$i $$o'],
+    path, elyxer = checkProg('a LyX -> HTML (MS Word) converter',
+        ['elyxer.py --html --directory $$r $$i $$o', 'elyxer --html 
--directory $$r $$i $$o'],
         rc_entry = [ r'\converter lyx      wordhtml       "%%" ""' ])
     if elyxer.find('elyxer') >= 0:
-      elyxerfound = True
-    else:
-      elyxerfound = False
-
-    if elyxerfound:
       addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py -e 
html,png,jpg,jpeg,css $$i $$o"''')
       addToRC(r'''\copier    wordhtml       "python -tt 
$$s/scripts/ext_copy.py -e html,png,jpg,jpeg,css $$i $$o"''')
     else:
-      # search for other converters than eLyXer
+      # search for HTML converters other than eLyXer
       # On SuSE the scripts have a .sh suffix, and on debian they are in 
/usr/share/tex4ht/
       path, htmlconv = checkProg('a LaTeX -> HTML converter', ['htlatex $$i', 
'htlatex.sh $$i', \
           '/usr/share/tex4ht/htlatex $$i', 'tth  -t -e2 -L$$b < $$i > $$o', \
@@ -664,7 +659,7 @@
         addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py 
-e html,png,css $$i $$o"''')
       else:
         addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py 
$$i $$o"''')
-      path, htmlconv = checkProg('a LaTeX -> MS Word converter', ["htlatex $$i 
'html,word' 'symbol/!' '-cvalidate'", \
+      path, htmlconv = checkProg('a LaTeX -> HTML (MS Word) converter', 
["htlatex $$i 'html,word' 'symbol/!' '-cvalidate'", \
           "htlatex.sh $$i 'html,word' 'symbol/!' '-cvalidate'", \
           "/usr/share/tex4ht/htlatex $$i 'html,word' 'symbol/!' '-cvalidate'"],
           rc_entry = [ r'\converter latex      wordhtml   "%%" "needaux"' ])
@@ -680,7 +675,7 @@
       addToRC(r'\Format    blog       blog       "LyXBlogger"           "" "" 
""  "document"')
       addToRC(r'\converter xhtml      blog       "python -m lyxblogger $$i"    
   ""')
 
-#
+    #
     checkProg('an OpenOffice.org -> LaTeX converter', ['w2l -clean $$i'],
         rc_entry = [ r'\converter sxw        latex      "%%"   ""' ])
     #

Reply via email to