From 9657ffd77fa3cd0b9c57dd8d2e3d370566b3d08a Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Fri, 26 Aug 2011 23:46:52 +0000 Subject: [PATCH] revert part of the last commit that should not have been git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39534 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/configure.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index d810662e6d..e2cfab7f98 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -642,14 +642,9 @@ def checkConverterEntries(): checkProg('a Sweave -> R/S code converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxstangle.R $$i $$e $$r'], rc_entry = [ r'\converter sweave r "%%" ""' ]) # - path, htmltolatex = checkProg('an HTML -> LaTeX converter', ['html2latex $$i', - 'gnuhtml2latex $$i', 'htmltolatex -input $$i -output $$o', 'htmltolatex.jar'], - rc_entry = [ r'\converter html latex "%%" ""', - r'\converter html latex "%%" ""', - r'\converter html latex "%%" ""', '', ''] ) - if htmltolatex == 'htmltolatex.jar': - addToRC(r'\converter html latex "java -jar %s -input $$i -output $$o" ""' - % os.path.join(path, htmltolatex)) + checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \ + 'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'], + rc_entry = [ r'\converter html latex "%%" ""' ]) # checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'], rc_entry = [ r'\converter word latex "%%" ""' ]) -- 2.39.2