anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure.py:

Browse Source 
- use eLyXer not only for HTML but also for HTML (MS Word) if it is found; this is simply the same code as we are already using for HTML converter check
- fix a bug that the copier calling would be wrong if neither eLyXer nor tex4ht is found (this is already fixed in the HTML converter check

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35122 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-08-11 00:57:48 +00:00
parent 8b19571edc
commit 7f072cc5d7
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/configure.py
View File

@ -621,6 +621,7 @@ def checkConverterEntries():
# #
checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'], checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'],
rc_entry = [ r'\converter word latex "%%" ""' ]) rc_entry = [ r'\converter word latex "%%" ""' ])
# eLyXer: search as a Python module and then as an executable (elyxer.py, elyxer) # eLyXer: search as a Python module and then as an executable (elyxer.py, elyxer)
elyxerfound = checkModule('elyxer') elyxerfound = checkModule('elyxer')
if elyxerfound: if elyxerfound:
@ -653,13 +654,29 @@ def checkConverterEntries():
addToRC(r'\Format blog blog "LyxBlogger" "" "" "" "document"') addToRC(r'\Format blog blog "LyxBlogger" "" "" "" "document"')
addToRC(r'\converter xhtml blog "lyxblogger $$i" ""') addToRC(r'\converter xhtml blog "lyxblogger $$i" ""')
# On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/ if elyxerfound:
path, htmlconv = checkProg('a LaTeX -> MS Word converter', ["htlatex $$i 'html,word' 'symbol/!' '-cvalidate'", \ addToRC(r'''\converter lyx wordhtml "python -m elyxer --html --directory $$r $$i $$o" ""''')
"htlatex.sh $$i 'html,word' 'symbol/!' '-cvalidate'", \ else:
"/usr/share/tex4ht/htlatex $$i 'html,word' 'symbol/!' '-cvalidate'"], path, elyxer = checkProg('a LyX -> MS Word converter',
rc_entry = [ r'\converter latex wordhtml "%%" "needaux"' ]) ['elyxer.py --directory $$r $$i $$o', 'elyxer --html --directory $$r $$i $$o'],
if htmlconv.find('htlatex') >= 0: rc_entry = [ r'\converter lyx wordhtml "%%" ""' ])
addToRC(r'''\copier wordhtml "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''') if elyxer.find('elyxer') >= 0:
elyxerfound = True
if elyxerfound:
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
# On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/
path, htmlconv = checkProg('a LaTeX -> 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"' ])
if htmlconv.find('htlatex') >= 0:
addToRC(r'''\copier wordhtml "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''')
else:
addToRC(r'''\copier wordhtml "python -tt $$s/scripts/ext_copy.py $$i $$o"''')
# #
checkProg('an OpenOffice.org -> LaTeX converter', ['w2l -clean $$i'], checkProg('an OpenOffice.org -> LaTeX converter', ['w2l -clean $$i'],
rc_entry = [ r'\converter sxw latex "%%" ""' ]) rc_entry = [ r'\converter sxw latex "%%" ""' ])